More IPv6 updates to the dhcp and provisner barclamps

matthewoliver · matthewoliver · commit 718a948940c1 · 2018-12-06T16:40:39.000+11:00
diff --git a/chef/cookbooks/provisioner/recipes/base.rb b/chef/cookbooks/provisioner/recipes/base.rb
@@ -351,9 +351,9 @@
 address = crowbar_node["crowbar"]["network"]["admin"]["address"]
 protocol = crowbar_node["crowbar"]["apache"]["ssl"] ? "https" : "http"
 if IPAddr.new(address).ipv6?
-  server = "#{protocol}://#{address}"
-else
   server = "#{protocol}://[#{address}]"
+else
+  server = "#{protocol}://#{address}"
 end
 password = crowbar_node["crowbar"]["users"]["crowbar"]["password"]
 verify_ssl = !crowbar_node["crowbar"]["apache"]["insecure"]
diff --git a/chef/cookbooks/provisioner/recipes/setup_base_images.rb b/chef/cookbooks/provisioner/recipes/setup_base_images.rb
@@ -14,15 +14,18 @@
 # limitations under the License
 #
 
+require "ipaddr"
+
 dirty = false
 
 # Set up the OS images as well
 # Common to all OSes
 admin_net = Barclamp::Inventory.get_network_by_type(node, "admin")
-admin_ip = admin_net.address
+admin_ip = IPAddr.new(admin_net.address)
 domain_name = node[:dns].nil? ? node[:domain] : (node[:dns][:domain] || node[:domain])
 web_port = node[:provisioner][:web_port]
-provisioner_web="http://#{admin_ip}:#{web_port}"
+provisioner_web="http://#{admin_ip.to_s}:#{web_port}" if admin_ip.ipv4?
+provisioner_web="http://[#{admin_ip.to_s}]:#{web_port}" if admin_ip.ipv6?
 append_line = node[:provisioner][:discovery][:append].dup # We'll modify it inline
 
 crowbar_node = node_search_with_cache("roles:crowbar").first
@@ -157,7 +160,7 @@
     source "grub.conf.erb"
     variables(append_line: "#{append_line} crowbar.state=discovery",
               install_name: "Crowbar Discovery Image",
-              admin_ip: admin_ip,
+              admin_ip: admin_ip.to_s,
               efi_suffix: arch == "x86_64",
               initrd: "discovery/#{arch}/initrd0.img",
               kernel: "discovery/#{arch}/vmlinuz0")
@@ -182,7 +185,7 @@
     mode 0o644
     variables(docroot: tftproot,
               port: web_port,
-              admin_ip: admin_ip,
+              admin_ip: admin_ip.to_s,
               admin_subnet: admin_net.subnet,
               admin_netmask: admin_net.netmask,
               logfile: "/var/log/apache2/provisioner-access_log",
@@ -298,12 +301,13 @@
       notifies :reload, resources(service: "xinetd")
     end
   else
+    ip_addr = admin_ip.ipv6? ? "[#{admin_ip.to_s}]" : admin_ip.to_s
     template "/etc/systemd/system/tftp.service" do
       source "tftp.service.erb"
       owner "root"
       group "root"
       mode "0644"
-      variables(tftproot: tftproot, admin_ip: admin_ip)
+      variables(tftproot: tftproot, admin_ip: ip_addr)
     end
 
     service "tftp.service" do
@@ -388,7 +392,7 @@
     mode "0644"
     source "set_state.ps1.erb"
     variables(crowbar_key: crowbar_key,
-              admin_ip: admin_ip)
+              admin_ip: admin_ip.to_s)
   end
 
   # Also copy the required files to install chef-client and communicate with Crowbar
@@ -507,11 +511,12 @@
         owner "root"
         group "root"
         source "crowbar_join.suse.sh.erb"
-        variables(admin_ip: admin_ip,
+        variables(admin_ip: admin_ip.to_s,
                   web_port: web_port,
                   ntp_servers_ips: ntp_servers,
                   platform: target_platform_distro,
-                  target_platform_version: target_platform_version)
+                  target_platform_version: target_platform_version,
+                  is_ipv6: admin_ip.ipv6?)
       end
 
       repos = Provisioner::Repositories.get_repos(target_platform_distro,
@@ -525,7 +530,7 @@
         owner "root"
         group "root"
         source "crowbar_register.erb"
-        variables(admin_ip: admin_ip,
+        variables(admin_ip: admin_ip.to_s,
                   admin_broadcast: admin_net.broadcast,
                   crowbar_protocol: crowbar_protocol,
                   crowbar_verify_ssl: crowbar_verify_ssl,
@@ -538,7 +543,8 @@
                   repos: repos,
                   packages: packages,
                   platform: target_platform_distro,
-                  target_platform_version: target_platform_version)
+                  target_platform_version: target_platform_version,
+                  is_ipv6: admin_ip.ipv6?)
       end
 
       missing_files = !File.exist?("#{os_dir}/install/boot/#{arch}/common")
diff --git a/chef/cookbooks/provisioner/templates/default/crowbar_join.suse.sh.erb b/chef/cookbooks/provisioner/templates/default/crowbar_join.suse.sh.erb
@@ -114,7 +114,11 @@ wait_for_hostname() {
 wait_for_admin_server() {
     # wait for admin server to become pingable
     tries_left=120
-    while ! ping -q -c1 $IP > /dev/null; do
+    local ping="ping"
+    if (( $IPV6 > 0 )); then
+      ping="ping6"
+    fi
+    while ! $ping -q -c1 $IP > /dev/null; do
       tries_left=$(($tries_left-1))
       if [ $tries_left -eq 0 ]; then
         return 1
@@ -163,9 +167,9 @@ do_setup() {
     # Make sure that the client knows how to talk to the server.
     local cfg=/etc/chef/client.rb
     if ! [ -f $cfg ] || \
-       ! grep -q "^\s*chef_server_url\s*[\"\']http://$IP:4000[\"\']" $cfg; then
+       ! grep -q "^\s*chef_server_url\s*[\"\']http://$IP_WRAPPED:4000[\"\']" $cfg; then
         test -f $cfg && mv $cfg $cfg.bak
-        echo "chef_server_url \"http://$IP:4000\"" >$cfg
+        echo "chef_server_url \"http://$IP_WRAPPED:4000\"" >$cfg
         echo "zypper_check_gpg true" >> $cfg
     fi
 
@@ -398,7 +402,17 @@ EXVAL=0
 export HOME=/root
 
 IP="<%= @admin_ip %>"
-HTTP_SERVER="<%= @admin_ip %>:<%= @web_port %>"
+<% if @is_ipv6 -%>
+IPV6=1
+<% else  -%>
+IPV6=0
+<% end -%>
+if (( $IPV6 > 0 )); then
+  IP_WRAPPED="[$IP]"
+else
+  IP_WRAPPED="$IP"
+fi
+HTTP_SERVER="$IP_WRAPPED:<%= @web_port %>"
 NTP_SERVERS="<%= @ntp_servers_ips.join(" ") %>"
 VALID_NTP_SERVERS=""
 
diff --git a/chef/cookbooks/provisioner/templates/suse/crowbar_register.erb b/chef/cookbooks/provisioner/templates/suse/crowbar_register.erb
@@ -122,7 +122,17 @@ add_user() {
 ADMIN_IP="<%= @admin_ip %>"
 ADMIN_BROADCAST="<%= @admin_broadcast %>"
 WEB_PORT="<%= @web_port %>"
-HTTP_SERVER="http://${ADMIN_IP}:${WEB_PORT}"
+<% if @is_ipv6 -%>
+IPV6=1
+<% else -%>
+IPV6=0
+<% end -%>
+if (( $IPV6 > 0 )); then
+  ADMIN_IP_WRAPPED="[ADMIN_IP]"
+else
+  ADMIN_IP_WRAPPED="ADMIN_IP"
+fi
+HTTP_SERVER="http://${ADMIN_IP_WRAPPED}:${WEB_PORT}"
 CROWBAR_OS="<%= @os %>"
 CROWBAR_ARCH="<%= @arch %>"
 CROWBAR_KEY="<%= @crowbar_key %>"
@@ -381,7 +391,7 @@ TMP_ATTRIBUTES=$(mktemp --suffix .json)
 echo "{ \"target_platform\": \"$CROWBAR_OS\", \"crowbar_wall\": { \"registering\": true } }" > "$TMP_ATTRIBUTES"
 
 crowbarctl node transition $HOSTNAME "discovering"
-chef-client -S http://$ADMIN_IP:4000/ -N "$HOSTNAME" --json-attributes "$TMP_ATTRIBUTES"
+chef-client -S http://$ADMIN_IP_WRAPPED:4000/ -N "$HOSTNAME" --json-attributes "$TMP_ATTRIBUTES"
 crowbarctl node transition $HOSTNAME "discovered"
 # TODO need to find way of knowing that chef run is over on server side
 sleep 30
@@ -393,7 +403,7 @@ echo '{ "crowbar_wall": { "registering": true } }' > "$TMP_ATTRIBUTES"
 
 rm -f /etc/chef/client.pem
 crowbarctl node transition $HOSTNAME "hardware-installing"
-chef-client -S http://$ADMIN_IP:4000/ -N "$HOSTNAME" --json-attributes "$TMP_ATTRIBUTES"
+chef-client -S http://$ADMIN_IP_WRAPPED:4000/ -N "$HOSTNAME" --json-attributes "$TMP_ATTRIBUTES"
 crowbarctl node transition $HOSTNAME "hardware-installed"
 #TODO
 #wait_for_pxe_state ".*_install"
