Merge pull request #491 from puppetlabs/IMAGES-1217

  (IMAGES-1217) Fix double interface ip on ubuntu-1804+

Author: jcoconnor

manifests/modules/packer/manifests/vsphere/networking.pp

@@ -23,16 +23,18 @@
           enable_dhcp   => true,
         }
       }
-      if ($facts['operatingsystemmajrelease'] in ['9', '16.04', '18.04', '18.10']) {
+      if ($facts['operatingsystemmajrelease'] in ['9', '16.04']) {
         network::interface { 'ens160':
           enable_dhcp   => true,
         }
       }
-      if $facts['operatingsystemmajrelease'] in ['10', '20.04'] {
+      if $facts['operatingsystemmajrelease'] in ['10'] {
         network::interface { 'ens192':
           enable_dhcp   => true,
         }
       }
+      # ubuntu '18.04', '18.10', '20.04' includes a /etc/netplan that already configures the network with dhcp. Adding a network::interface
+      # here sets up two interfaces each with an IP. https://tickets.puppetlabs.com/browse/IMAGES-1217
     }
 
     redhat: {

manifests/modules/packer/manifests/vsphere/repos.pp

@@ -85,6 +85,19 @@
           priority => 1001,
         }
       }
+
+      # IMAGES-1217, for some reason the rebuild of ubuntu 18.04 was missing bionic-updates
+      if $facts['operatingsystem'] == 'Ubuntu' and $facts['operatingsystemrelease'] == '18.04' {
+        apt::source { "${facts['lsbdistcodename']}-updates":
+          release  => $updates_release,
+          location => "${repo_mirror}/${repo_name}",
+          repos    => $repo_list,
+          include  => {
+            'src' => true,
+            'deb' => true,
+          },
+        }
+      }
     }
 
     redhat: {

manifests/modules/packer/templates/vsphere/ubuntu.rb.erb

@@ -25,7 +25,7 @@ File.open('/etc/dhcp/dhclient.conf', 'w') do |f|
   <% if ['15.10', '16.04', '16.10'].include? @operatingsystemrelease -%>
   dhc.gsub!(/^(send host-name.*)/, "send host-name \"#{hostname}\";")
   <% else -%>
-  dhc.gsub!(/^(#send host-name.*)/, "send host-name \"#{hostname}\";")
+  dhc.gsub!(/^(#?send host-name.*)/, "send host-name \"#{hostname}\";")
   <% end -%>
   f.write(dhc)
 end
@@ -42,15 +42,16 @@ puts '- Re-obtaining DHCP lease...'
 # NetworkManager
 Kernel.system('/usr/sbin/service networking restart')
 <% elsif ['18.04', '18.10', '20.04'].include? @operatingsystemrelease -%>
-# systemd-networkd's DHCP client uses /etc/machine-id instead of the link layer address (as dhclient does) to generate a client ID
-# /etc/machine-id will be the same on VMs cloned from the same template, so regenerate it:
-File.delete('/etc/machine-id')
-Kernel.system('/bin/systemd-machine-id-setup')
-Kernel.system('/bin/systemctl daemon-reload')
+# netplan uses machine-id or client-it as identifier by default, but we need a different value for
+# each VM, so configure netplan's dhcp to use mac addresses
+#open('/etc/netplan/01-netcfg.yaml', 'a') { |f|
+#  f.puts "      dhcp-identifier: mac"
+#}
 
-# disable systemd-resolved - more info here: https://tickets.puppetlabs.com/browse/QENG-6928
-Kernel.system('rm /etc/resolv.conf')
-Kernel.system('ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf')
+# NOTE: not needed anymore, disable systemd-resolved - more info here: https://tickets.puppetlabs.com/browse/QENG-6928
+# see superseding ticket IMAGES-1217
+# Kernel.system('rm /etc/resolv.conf')
+# Kernel.system('ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf')
 
 Kernel.system('/bin/systemctl restart systemd-networkd')
 <% else -%>

templates/ubuntu/18.04/common/files/preseed.cfg

@@ -32,4 +32,7 @@ d-i preseed/late_command string \
 sed -i 's/\(GRUB_CMDLINE_LINUX_DEFAULT=\).*/\1\"\"/g' /target/etc/default/grub; \
 in-target bash -c 'update-grub2'; \
 in-target sed -i 's/.*PermitRootLogin.*/PermitRootLogin yes/g' /etc/ssh/sshd_config ; \
+in-target bash -c 'echo "      dhcp-identifier: mac" >> /etc/netplan/01-netcfg.yaml' ; \
+in-target bash -c 'echo "      nameservers:" >> /etc/netplan/01-netcfg.yaml' ; \
+in-target bash -c 'echo "        search: [delivery.puppetlabs.net, local]" >> /etc/netplan/01-netcfg.yaml' ; \
 in-target apt-get -y upgrade

templates/ubuntu/18.04/common/vars.json

@@ -1,4 +1,4 @@
 {
-    "boot_command" : "<esc><wait><esc><wait><enter><wait>/install/vmlinuz console-setup/ask_detect=false console-setup/layoutcode=us console-setup/modelcode=pc105 debconf/frontend=noninteractive debian-installer=en_US fb=false initrd=/install/initrd.gz kbd-chooser/method=us keyboard-configuration/layout=USA keyboard-configuration/variant=USA locale=en_US.UTF-8 netcfg/get_domain=vm netcfg/get_hostname=localhost grub-installer/bootdev=/dev/sda noapic preseed/file=/floppy/preseed.cfg -- <wait><enter>",
+    "boot_command" : "<esc><wait><esc><wait><enter><wait>/install/vmlinuz console-setup/ask_detect=false console-setup/layoutcode=us console-setup/modelcode=pc105 debconf/frontend=noninteractive debian-installer=en_US fb=false initrd=/install/initrd.gz kbd-chooser/method=us keyboard-configuration/layout=USA keyboard-configuration/variant=USA locale=en_US.UTF-8 netcfg/get_domain=vm netcfg/get_hostname=localhost grub-installer/bootdev=/dev/sda preseed/file=/floppy/preseed.cfg -- <wait><enter>",
     "vmware_base_boot_wait" : "15s"
 }

templates/ubuntu/18.04/x86_64/vars.json

@@ -2,11 +2,11 @@
     "template_name"                         : "ubuntu-1804-x86_64",
     "template_os"                           : "ubuntu64Guest",
     "beakerhost"                            : "ubuntu1804-64",
-    "version"                               : "0.0.4",
+    "version"                               : "0.0.12",
     "iso_checksum"                          : "a7f5c7b0cdd0e9560d78f1e47660e066353bb8a79eb78d1fc3f4ea62a07e6cbc",
     "iso_checksum_type"                     : "sha256",
-    "vmware_vsphere_base_vmx_data_memsize"  : "8168",
-    "vmware_vsphere_base_vmx_data_numvcpus" : "2",
+    "vmware_base_vmx_data_memsize"          : "8168",
+    "vmware_base_vmx_data_numvcpus"         : "2",
     "puppet_aio"                            : "http://apt.puppetlabs.com/pool/stretch/puppet5/p/puppet-agent/puppet-agent_5.3.2-1stretch_amd64.deb",
     "iso_name"                              : "ubuntu-18.04-server-amd64.iso"
 }

templates/ubuntu/18.10/common/files/preseed.cfg

@@ -32,4 +32,7 @@ d-i preseed/late_command string \
 sed -i 's/\(GRUB_CMDLINE_LINUX_DEFAULT=\).*/\1\"\"/g' /target/etc/default/grub; \
 in-target bash -c 'update-grub2'; \
 in-target sed -i 's/.*PermitRootLogin.*/PermitRootLogin yes/g' /etc/ssh/sshd_config ; \
+in-target bash -c 'echo "      dhcp-identifier: mac" >> /etc/netplan/01-netcfg.yaml' ; \
+in-target bash -c 'echo "      nameservers:" >> /etc/netplan/01-netcfg.yaml' ; \
+in-target bash -c 'echo "        search: [delivery.puppetlabs.net, local]" >> /etc/netplan/01-netcfg.yaml' ; \
 in-target apt-get -y upgrade

templates/ubuntu/18.10/common/vars.json

@@ -1,6 +1,6 @@
 {
     "http_directory"                   : "../common/files",
     "inject_http_seed_in_boot_command" : "true",
-    "boot_command"                     : "<esc><wait><esc><wait><enter><wait>/install/vmlinuz console-setup/ask_detect=false console-setup/layoutcode=us console-setup/modelcode=pc105 debconf/frontend=noninteractive debian-installer=en_US fb=false initrd=/install/initrd.gz kbd-chooser/method=us keyboard-configuration/layout=USA keyboard-configuration/variant=USA locale=en_US.UTF-8 netcfg/get_domain=vm netcfg/get_hostname=localhost grub-installer/bootdev=/dev/sda noapic preseed/url=http://%s/preseed.cfg -- <wait><enter>",
+    "boot_command"                     : "<esc><wait><esc><wait><enter><wait>/install/vmlinuz console-setup/ask_detect=false console-setup/layoutcode=us console-setup/modelcode=pc105 debconf/frontend=noninteractive debian-installer=en_US fb=false initrd=/install/initrd.gz kbd-chooser/method=us keyboard-configuration/layout=USA keyboard-configuration/variant=USA locale=en_US.UTF-8 netcfg/get_domain=vm netcfg/get_hostname=localhost grub-installer/bootdev=/dev/sda preseed/url=http://%s/preseed.cfg -- <wait><enter>",
     "vmware_base_boot_wait"            : "15s"
 }

templates/ubuntu/18.10/x86_64/vars.json

@@ -2,12 +2,12 @@
     "template_name"                         : "ubuntu-2004-x86_64",
     "template_os"                           : "ubuntu64Guest",
     "beakerhost"                            : "ubuntu2004-64",
-    "version"                               : "0.0.2",
+    "version"                               : "0.0.8",
     "iso_url"                               : "https://artifactory.delivery.puppetlabs.net/artifactory/generic__iso/iso/ubuntu-20.04-live-server-amd64.iso",
     "iso_checksum"                          : "caf3fd69c77c439f162e2ba6040e9c320c4ff0d69aad1340a514319a9264df9f",
     "iso_checksum_type"                     : "sha256",
-    "vmware_vsphere_base_vmx_data_memsize"  : "8168",
-    "vmware_vsphere_base_vmx_data_numvcpus" : "2",
+    "vmware_base_vmx_data_memsize"          : "8168",
+    "vmware_base_vmx_data_numvcpus"         : "2",
     "puppet_aio"                            : "http://apt.puppetlabs.com/pool/bionic/puppet5/p/puppet-agent/puppet-agent_5.5.18-1bionic_amd64.deb",
     "iso_name"                              : "focal-server-amd64.iso"
 }