Merge lp:~bladernr/maas-cert-server/mcs-add-ocp-curtin-userdata into lp:~hardware-certification/maas-cert-server/trunk

[Jeff Lane ]

Added OCP Curtin Userdata file and modified maniacs_setup to install cert curtin_userdata by default

[Jeff Lane  (bladernr)]

self approve

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-30 23:08:57 +0000
+++ debian/changelog	2015-08-04 20:34:43 +0000
@@ -1,3 +1,10 @@
+maas-cert-server (0.2.4-1ppa1) trusty; urgency=medium
+
+  * Added curtin_userdata_ocp to deploy OCP test suite to SUTs
+  * modified maniacs_setup accordingly to still install the cert curtin file
+
+ -- Jeff Lane <[e-mail]>  Tue, 04 Aug 2015 16:21:12 -0400
+
 maas-cert-server (0.2.4-0ppa1) trusty; urgency=medium
 
   * This time I think I've got it; fix to make PDFs build.
 
=== renamed file 'preseed/curtin_userdata' => 'preseed/curtin_userdata_cert'
=== added file 'preseed/curtin_userdata_ocp'
--- preseed/curtin_userdata_ocp	1970-01-01 00:00:00 +0000
+++ preseed/curtin_userdata_ocp	2015-08-04 20:34:43 +0000
@@ -0,0 +1,119 @@
+# Get maas version
+{{py:
+from subprocess import check_output
+maas_version = ""
+cache_output = check_output(['apt-cache', 'policy', 'maas'])
+for line in cache_output.splitlines():
+    line = line.strip()
+    if ':' in line and line.split(':')[0] == 'Installed':
+        maas_version = line.split(':')[1].strip()
+        break
+}}
+#cloud-config
+debconf_selections:
+ maas: |
+  {{for line in str(curtin_preseed).splitlines()}}
+  {{line}}
+  {{endfor}}
+{{if third_party_drivers and driver}}
+early_commands:
+  {{py: key_string = ''.join(['\\x%x' % x for x in map(ord, driver['key_binary'])])}}
+  driver_00_get_key: /bin/echo -en '{{key_string}}' > /tmp/maas-{{driver['package']}}.gpg
+  driver_01_add_key: ["apt-key", "add", "/tmp/maas-{{driver['package']}}.gpg"]
+  driver_02_add: ["add-apt-repository", "-y", "deb {{driver['repository']}} {{node.get_distro_series()}} main"]
+  driver_03_update_install: ["sh", "-c", "apt-get update --quiet && apt-get --assume-yes install {{driver['package']}}"]
+  driver_04_load: ["sh", "-c", "depmod && modprobe {{driver['module']}}"]
+{{endif}}
+
+anchor_bucket:
+  - &sudoers |
+      #!/bin/sh
+      echo "Setting up sudoers...";
+      echo "ubuntu ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/maas ;  chmod 0440 /etc/sudoers.d/maas;
+      echo "Done.";
+
+  - &installcert
+      #!/bin/sh
+      echo "Installing OCP certfication tools...";
+      echo " Add cert source list...";
+      echo deb http://ppa.launchpad.net/hardware-certification/public/ubuntu trusty main >> /etc/apt/sources.list.d/certification.list;
+      echo deb http://ppa.launchpad.net/firmware-testing-team/ppa-fwts-stable/ubuntu trusty main >> /etc/apt/sources.list.d/certification.list;
+      echo deb http://ppa.launchpad.net/opencompute-developers/ocp-certification-tools-ppa/ubuntu trusty main >> /etc/apt/sources.list.d/certification.list;
+      echo " Getting GPG Keys...";
+      apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 1FEADE10;
+      apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 DA685A11;
+      echo " Running apt-get update...";
+      apt-get update;
+      echo " Installing pre-dependencies...";
+      apt-get install -y debconf-utils git;
+      echo " Setting up and install mysql-server...";
+      echo mysql-server mysql-server/root_password password insecure | debconf-set-selections;
+      echo mysql-server mysql-server/root_password_again password insecure | debconf-set-selections;
+      apt-get install -y mysql-server;
+      echo " Installing OCP Checkbox...";
+      git clone https://github.com/opencomputeproject/ocp_ci_server_certification_test_cases.git /opt/ocp-certification;
+      cd /opt/ocp-certification;
+      ./install.sh;
+      sleep 60;
+      echo "Done.";
+
+  - &iperf
+      #!/bin/sh
+      echo "Setting up iperf...";
+      maas_ip=$(/sbin/ip route | awk '/default/ { print $3 }');
+      sed -i 's/ your-iperf-server.example.com/'"$maas_ip"'/g' /etc/checkbox.d/network.cfg;
+      echo "Done.";
+
+  - &networkinterfaces |
+      #!/bin/sh
+      echo "Setting all network interfaces to auto...";
+      echo $(ls -l /etc/network/interfaces);
+      /bin/sed -i '/^[ \t]*auto lo.*/! { s/auto.*/auto/ }' /etc/network/interfaces;
+      for i in `ls /sys/class/net|sort |grep -v lo`;do /bin/sed -i "/^[ \t]*auto lo.*/! { /^auto/ s/$/ $i/ }" /etc/network/interfaces ;done;
+      echo "Done.";
+
+  - &setubuntupass |
+      #!/bin/sh
+      echo "Setting ubuntu password..."
+      echo "#cloud-config\nsystem_info:\n default_user:\n  lock_passwd: False\n  plain_text_passwd: 'ubuntu'" > /etc/cloud/cloud.cfg.d/ubuntu-user-defaults.cfg
+      echo "Done.";
+
+late_commands:
+  maas: [wget, '--no-proxy', '{{node_disable_pxe_url|escape.shell}}', '--post-data', '{{node_disable_pxe_data|escape.shell}}', '-O', '/dev/null']
+{{if third_party_drivers and driver}}
+  driver_00_key_get: curtin in-target -- sh -c "/bin/echo -en '{{key_string}}' > /tmp/maas-{{driver['package']}}.gpg"
+  driver_02_key_add: ["curtin", "in-target", "--", "apt-key", "add", "/tmp/maas-{{driver['package']}}.gpg"]
+  driver_03_add: ["curtin", "in-target", "--", "add-apt-repository", "-y", "deb {{driver['repository']}} {{node.get_distro_series()}} main"]
+  driver_04_update_install: ["curtin", "in-target", "--", "apt-get", "update", "--quiet"]
+  driver_05_install: ["curtin", "in-target", "--", "apt-get", "-y", "install", "{{driver['package']}}"]
+  driver_06_depmod: ["curtin", "in-target", "--", "depmod"]
+  driver_07_update_initramfs: ["curtin", "in-target", "--", "update-initramfs", "-u"]
+{{endif}}
+  # inject maas version into /etc/installed-with-maas and install cert tools
+  set_maas_version: ["curtin", "in-target", "--", "sh", "-c", "/bin/echo {{maas_version}} > /etc/installed-by-maas"]
+  # Install certification suite
+  zv_cert_install:  ['curtin', 'in-target', '--', 'sh', '-c', *sudoers ]
+  zw_cert_install:  ['curtin', 'in-target', '--', 'sh', '-c', *installcert ]
+  zx_cert_install:  ['curtin', 'in-target', '--', 'sh', '-c', *iperf ]
+  zy_cert_install:  ['curtin', 'in-target', '--', 'sh', '-c', *networkinterfaces]
+  zz_cert_install:  ['curtin', 'in-target', '--', 'sh', '-c', *setubuntupass]
+
+
+power_state:
+  mode: reboot
+
+{{if node.split_arch()[0] in {'i386', 'amd64'} }}
+apt_mirrors:
+  ubuntu_archive: http://{{main_archive_hostname}}/{{main_archive_directory}}
+  ubuntu_security: http://{{main_archive_hostname}}/{{main_archive_directory}}
+{{else}}
+apt_mirrors:
+  ubuntu_archive: http://{{ports_archive_hostname}}/{{ports_archive_directory}}
+  ubuntu_security: http://{{ports_archive_hostname}}/{{ports_archive_directory}}
+{{endif}}
+
+{{if http_proxy }}
+apt_proxy: {{http_proxy}}
+{{else}}
+apt_proxy: http://{{server_host}}:8000/
+{{endif}}
 
=== modified file 'usr/sbin/maniacs-setup'
--- usr/sbin/maniacs-setup	2015-07-17 19:42:06 +0000
+++ usr/sbin/maniacs-setup	2015-08-04 20:34:43 +0000
@@ -534,11 +534,11 @@
     if [ ! -f /etc/maas/preseeds/curtin_userdata-orig ] ; then
         cp /etc/maas/preseeds/curtin_userdata /etc/maas/preseeds/curtin_userdata-orig
     fi
-    cp /usr/share/maas-cert-server/preseed/curtin_userdata /etc/maas/preseeds/curtin_userdata
+    cp /usr/share/maas-cert-server/preseed/curtin_userdata_cert /etc/maas/preseeds/curtin_userdata
     if [ ! -f /etc/maas/preseeds/curtin_userdata_custom-orig ] ; then
         cp /etc/maas/preseeds/curtin_userdata_custom /etc/maas/preseeds/curtin_userdata_custom-orig
     fi
-    cp /usr/share/maas-cert-server/preseed/curtin_userdata /etc/maas/preseeds/curtin_userdata_custom
+    cp /usr/share/maas-cert-server/preseed/curtin_userdata_cert /etc/maas/preseeds/curtin_userdata_custom
     if [ $MIRRORED -eq 1 ] ; then
         sed -i s/ppa.launchpad.net/$INTERNAL_IP/g /etc/maas/preseeds/generic
         sed -i s/ppa.launchpad.net/$INTERNAL_IP/g /etc/maas/preseeds/curtin_userdata