diff --git a/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py b/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py index b92a8a82674..ce9493c5e69 100755 --- a/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py +++ b/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py @@ -113,9 +113,7 @@ class CsDhcp(CsDataBag): if (self.config.is_vpc() or self.config.is_router()) and ('is_vr_guest_gateway' in gn.data and gn.data['is_vr_guest_gateway']): if gateway in dns_list: dns_list.remove(gateway) - if gn.data['router_guest_ip'] != gn.data['router_guest_gateway']: - dns_list.insert(0, gn.data['router_guest_ip']) - else: + if gn.data['router_guest_ip'] != ip: dns_list.insert(0, ip) elif self.config.is_dhcp() and not self.config.use_extdns(): guest_ip = self.config.address().get_guest_ip() diff --git a/tools/appliance/cks/ubuntu/22.04/scripts/configure-cloud-init.sh b/tools/appliance/cks/ubuntu/22.04/scripts/configure-cloud-init.sh index ca58d43f447..ccb4b455a86 100644 --- a/tools/appliance/cks/ubuntu/22.04/scripts/configure-cloud-init.sh +++ b/tools/appliance/cks/ubuntu/22.04/scripts/configure-cloud-init.sh @@ -19,7 +19,7 @@ function install_packages() { apt-get install -y rsyslog logrotate cron net-tools ifupdown cloud-guest-utils conntrack apt-transport-https ca-certificates curl \ gnupg gnupg-agent software-properties-common gnupg lsb-release - apt-get install -y python3-json-pointer python3-jsonschema cloud-init + apt-get install -y python3-json-pointer python3-jsonschema cloud-init resolvconf sudo mkdir -p /etc/apt/keyrings curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg diff --git a/tools/appliance/cks/ubuntu/build.sh b/tools/appliance/cks/ubuntu/build.sh index 8ac0e6f84cc..0d9d8ea4e49 100755 --- a/tools/appliance/cks/ubuntu/build.sh +++ b/tools/appliance/cks/ubuntu/build.sh @@ -16,15 +16,15 @@ # specific language governing permissions and limitations # under the License. -# build script which wraps around packer and virtualbox to create the systemvm template +# build script which wraps around packer and virtualbox to create the CKS template function usage() { cat <