Update packer config to work in Vexxhost

Improved the templates to support SOCKS 5 proxy configuration
via the `ssh_proxy_host` configuration that is optional. This
can be configured in the vars file.

Additionally we are now prefixing image names with "ZZCI - " so that
you can immediately tell from the name that the image is managed by
our automated systems as well as having them sorted last. This should
make it easier to manage images in the WebUI.

Update packer version from 0.12.2 to 1.1.3 so that we can use the
ssh_proxy_host parameter.

Issue: RELENG-706
Change-Id: I3b7200c6a917a961f9da38e5eeea95347ceed4a7
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/packer/provision/java-builder.sh b/packer/provision/java-builder.sh
index 089c915057fe801eeea19c508ed294ed3ebd683d..c65db9c61a1caedf23137ef4861f3f97237cb1bc 100644 (file)
--- a/packer/provision/java-builder.sh
+++ b/packer/provision/java-builder.sh
@@ -59,8 +59,8 @@ tar -xvzf elasticsearch-1.7.5.tar.gz
 # Installs Hashicorp's Packer binary, required for {verify,merge}-packer jobs
 mkdir /tmp/packer
 cd /tmp/packer
-wget -nv https://releases.hashicorp.com/packer/0.12.2/packer_0.12.2_linux_amd64.zip
-unzip packer_0.12.2_linux_amd64.zip -d /usr/local/bin/
+wget -nv https://releases.hashicorp.com/packer/1.1.3/packer_1.1.3_linux_amd64.zip
+unzip packer_1.1.3_linux_amd64.zip -d /usr/local/bin/
 # rename packer to avoid conflict with binary in cracklib
 mv /usr/local/bin/packer /usr/local/bin/packer.io
 

diff --git a/packer/templates/autorelease.json b/packer/templates/autorelease.json
new file mode 100644 (file)
index 0000000..76aef74
--- /dev/null
+++ b/packer/templates/autorelease.json
@@ -0,0 +1,50 @@
+{
+  "variables": {
+    "public_base_image": null,
+    "public_network": null,
+    "public_cloud_user": null,
+    "public_auth_url": null,
+    "public_tenant": null,
+    "public_user": null,
+    "public_pass": null,
+    "distro": null,
+    "cloud_user_data": null,
+    "ssh_proxy_host": ""
+  },
+  "builders": [
+    {
+      "type": "openstack",
+      "identity_endpoint": "{{user `public_auth_url`}}",
+      "domain_name": "Default",
+      "tenant_name": "{{user `public_tenant`}}",
+      "username": "{{user `public_user`}}",
+      "password": "{{user `public_pass`}}",
+      "region": "ca-ymq-1",
+      "availability_zone": "ca-ymq-2",
+      "ssh_username": "{{user `public_cloud_user`}}",
+      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+      "image_name": "ZZCI - {{user `distro`}} - autorelease - {{isotime \"20060102-1504\"}}",
+      "source_image_name": "{{user `public_base_image`}}",
+      "flavor": "v1-standard-4",
+      "networks": [
+        "{{user `public_network`}}"
+      ],
+      "user_data_file": "{{user `cloud_user_data`}}",
+      "metadata": {
+        "ci_managed": "yes"
+      }
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "scripts": [
+        "provision/baseline.sh",
+        "provision/java-builder.sh",
+        "provision/system_reseal_local_env.sh",
+        "provision/system_reseal.sh"
+      ],
+      "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
+    }
+  ]
+}

diff --git a/packer/templates/baseline.json b/packer/templates/baseline.json
index e3e0d0fc170b7a8f67c34299a9dcda3b6d479976..4da796dca46a60902e5d33494781a29a5612bb16 100644 (file)
--- a/packer/templates/baseline.json
+++ b/packer/templates/baseline.json
@@ -7,49 +7,32 @@
     "public_tenant": null,
     "public_user": null,
     "public_pass": null,
-    "private_base_image": null,
-    "private_network": null,
-    "private_cloud_user": null,
-    "private_auth_url": null,
-    "private_tenant": null,
-    "private_user": null,
-    "private_pass": null,
     "distro": null,
-    "cloud_user_data": null
+    "cloud_user_data": null,
+    "ssh_proxy_host": ""
   },
   "builders": [
     {
       "type": "openstack",
-      "name": "public_cloud",
       "identity_endpoint": "{{user `public_auth_url`}}",
+      "domain_name": "Default",
       "tenant_name": "{{user `public_tenant`}}",
       "username": "{{user `public_user`}}",
       "password": "{{user `public_pass`}}",
-      "region": "DFW",
+      "region": "ca-ymq-1",
+      "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `public_cloud_user`}}",
-      "image_name": "{{user `distro`}} - baseline - {{isotime \"20060102-1504\"}}",
+      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+      "image_name": "ZZCI - {{user `distro`}} - baseline - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `public_base_image`}}",
-      "flavor": "general1-1",
+      "flavor": "v1-standard-1",
       "networks": [
         "{{user `public_network`}}"
       ],
-      "user_data_file": "{{user `cloud_user_data`}}"
-    },
-    {
-      "type": "openstack",
-      "name": "private_cloud",
-      "identity_endpoint": "{{user `private_auth_url`}}",
-      "tenant_name": "{{user `private_tenant`}}",
-      "username": "{{user `private_user`}}",
-      "password": "{{user `private_pass`}}",
-      "ssh_username": "{{user `private_cloud_user`}}",
-      "image_name": "{{user `distro`}} - baseline - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `private_base_image`}}",
-      "flavor": "general1-1",
-      "networks": [
-        "{{user `private_network`}}"
-      ],
-      "user_data_file": "{{user `cloud_user_data`}}"
+      "user_data_file": "{{user `cloud_user_data`}}",
+      "metadata": {
+        "ci_managed": "yes"
+      }
     }
   ],
   "provisioners": [

diff --git a/packer/templates/devstack-pre-pip-newton.json b/packer/templates/devstack-pre-pip-newton.json
index 74f89faa9e105d5869d13323a91d568b0bec9fa1..fc6a6662ef56980f267df1c4349e11d205fef6c5 100644 (file)
--- a/packer/templates/devstack-pre-pip-newton.json
+++ b/packer/templates/devstack-pre-pip-newton.json
@@ -7,49 +7,32 @@
     "public_tenant": null,
     "public_user": null,
     "public_pass": null,
-    "private_base_image": null,
-    "private_network": null,
-    "private_cloud_user": null,
-    "private_auth_url": null,
-    "private_tenant": null,
-    "private_user": null,
-    "private_pass": null,
     "distro": null,
-    "cloud_user_data": null
+    "cloud_user_data": null,
+    "ssh_proxy_host": ""
   },
   "builders": [
     {
       "type": "openstack",
-      "name": "public_cloud",
       "identity_endpoint": "{{user `public_auth_url`}}",
+      "domain_name": "Default",
       "tenant_name": "{{user `public_tenant`}}",
       "username": "{{user `public_user`}}",
       "password": "{{user `public_pass`}}",
-      "region": "DFW",
+      "region": "ca-ymq-1",
+      "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `public_cloud_user`}}",
-      "image_name": "{{user `distro`}} - devstack-newton - {{isotime \"20060102-1504\"}}",
+      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+      "image_name": "ZZCI - {{user `distro`}} - devstack-newton - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `public_base_image`}}",
-      "flavor": "general1-1",
+      "flavor": "v1-standard-1",
       "networks": [
         "{{user `public_network`}}"
       ],
-      "user_data_file": "{{user `cloud_user_data`}}"
-    },
-    {
-      "type": "openstack",
-      "name": "private_cloud",
-      "identity_endpoint": "{{user `private_auth_url`}}",
-      "tenant_name": "{{user `private_tenant`}}",
-      "username": "{{user `private_user`}}",
-      "password": "{{user `private_pass`}}",
-      "ssh_username": "{{user `private_cloud_user`}}",
-      "image_name": "{{user `distro`}} - devstack-newton - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `private_base_image`}}",
-      "flavor": "general1-1",
-      "networks": [
-        "{{user `private_network`}}"
-      ],
-      "user_data_file": "{{user `cloud_user_data`}}"
+      "user_data_file": "{{user `cloud_user_data`}}",
+      "metadata": {
+        "ci_managed": "yes"
+      }
     }
   ],
   "provisioners": [

diff --git a/packer/templates/devstack-pre-pip-ocata.json b/packer/templates/devstack-pre-pip-ocata.json
index cc9f5d5ee48d5ef7d1c4ba96b21c2413f2e9f777..68c64314a8bed435d6e220d5725de302a96e8996 100644 (file)
--- a/packer/templates/devstack-pre-pip-ocata.json
+++ b/packer/templates/devstack-pre-pip-ocata.json
@@ -7,49 +7,32 @@
     "public_tenant": null,
     "public_user": null,
     "public_pass": null,
-    "private_base_image": null,
-    "private_network": null,
-    "private_cloud_user": null,
-    "private_auth_url": null,
-    "private_tenant": null,
-    "private_user": null,
-    "private_pass": null,
     "distro": null,
-    "cloud_user_data": null
+    "cloud_user_data": null,
+    "ssh_proxy_host": ""
   },
   "builders": [
     {
       "type": "openstack",
-      "name": "public_cloud",
       "identity_endpoint": "{{user `public_auth_url`}}",
+      "domain_name": "Default",
       "tenant_name": "{{user `public_tenant`}}",
       "username": "{{user `public_user`}}",
       "password": "{{user `public_pass`}}",
-      "region": "DFW",
+      "region": "ca-ymq-1",
+      "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `public_cloud_user`}}",
-      "image_name": "{{user `distro`}} - devstack-ocata - {{isotime \"20060102-1504\"}}",
+      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+      "image_name": "ZZCI - {{user `distro`}} - devstack-ocata - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `public_base_image`}}",
-      "flavor": "general1-1",
+      "flavor": "v1-standard-1",
       "networks": [
         "{{user `public_network`}}"
       ],
-      "user_data_file": "{{user `cloud_user_data`}}"
-    },
-    {
-      "type": "openstack",
-      "name": "private_cloud",
-      "identity_endpoint": "{{user `private_auth_url`}}",
-      "tenant_name": "{{user `private_tenant`}}",
-      "username": "{{user `private_user`}}",
-      "password": "{{user `private_pass`}}",
-      "ssh_username": "{{user `private_cloud_user`}}",
-      "image_name": "{{user `distro`}} - devstack-ocata - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `private_base_image`}}",
-      "flavor": "general1-1",
-      "networks": [
-        "{{user `private_network`}}"
-      ],
-      "user_data_file": "{{user `cloud_user_data`}}"
+      "user_data_file": "{{user `cloud_user_data`}}",
+      "metadata": {
+        "ci_managed": "yes"
+      }
     }
   ],
   "provisioners": [

diff --git a/packer/templates/devstack-pre-pip-pike.json b/packer/templates/devstack-pre-pip-pike.json
index 177eb4464616f32cff9d534c2afb38e72c04605d..2c42e2a50f8b877d7cc178d60304f214ed18d2ad 100644 (file)
--- a/packer/templates/devstack-pre-pip-pike.json
+++ b/packer/templates/devstack-pre-pip-pike.json
@@ -7,49 +7,32 @@
     "public_tenant": null,
     "public_user": null,
     "public_pass": null,
-    "private_base_image": null,
-    "private_network": null,
-    "private_cloud_user": null,
-    "private_auth_url": null,
-    "private_tenant": null,
-    "private_user": null,
-    "private_pass": null,
     "distro": null,
-    "cloud_user_data": null
+    "cloud_user_data": null,
+    "ssh_proxy_host": ""
   },
   "builders": [
     {
       "type": "openstack",
-      "name": "public_cloud",
       "identity_endpoint": "{{user `public_auth_url`}}",
+      "domain_name": "Default",
       "tenant_name": "{{user `public_tenant`}}",
       "username": "{{user `public_user`}}",
       "password": "{{user `public_pass`}}",
-      "region": "DFW",
+      "region": "ca-ymq-1",
+      "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `public_cloud_user`}}",
-      "image_name": "{{user `distro`}} - devstack-pike - {{isotime \"20060102-1504\"}}",
+      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+      "image_name": "ZZCI - {{user `distro`}} - devstack-pike - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `public_base_image`}}",
-      "flavor": "general1-1",
+      "flavor": "v1-standard-1",
       "networks": [
         "{{user `public_network`}}"
       ],
-      "user_data_file": "{{user `cloud_user_data`}}"
-    },
-    {
-      "type": "openstack",
-      "name": "private_cloud",
-      "identity_endpoint": "{{user `private_auth_url`}}",
-      "tenant_name": "{{user `private_tenant`}}",
-      "username": "{{user `private_user`}}",
-      "password": "{{user `private_pass`}}",
-      "ssh_username": "{{user `private_cloud_user`}}",
-      "image_name": "{{user `distro`}} - devstack-pike - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `private_base_image`}}",
-      "flavor": "general1-1",
-      "networks": [
-        "{{user `private_network`}}"
-      ],
-      "user_data_file": "{{user `cloud_user_data`}}"
+      "user_data_file": "{{user `cloud_user_data`}}",
+      "metadata": {
+        "ci_managed": "yes"
+      }
     }
   ],
   "provisioners": [

diff --git a/packer/templates/devstack.json b/packer/templates/devstack.json
index dc38a548161e94a697b0782e89b644d30d303538..b912e87d515b8fd27c3134c6ba4a78f52eae9626 100644 (file)
--- a/packer/templates/devstack.json
+++ b/packer/templates/devstack.json
@@ -7,49 +7,32 @@
     "public_tenant": null,
     "public_user": null,
     "public_pass": null,
-    "private_base_image": null,
-    "private_network": null,
-    "private_cloud_user": null,
-    "private_auth_url": null,
-    "private_tenant": null,
-    "private_user": null,
-    "private_pass": null,
     "distro": null,
-    "cloud_user_data": null
+    "cloud_user_data": null,
+    "ssh_proxy_host": ""
   },
   "builders": [
     {
       "type": "openstack",
-      "name": "public_cloud",
       "identity_endpoint": "{{user `public_auth_url`}}",
+      "domain_name": "Default",
       "tenant_name": "{{user `public_tenant`}}",
       "username": "{{user `public_user`}}",
       "password": "{{user `public_pass`}}",
-      "region": "DFW",
+      "region": "ca-ymq-1",
+      "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `public_cloud_user`}}",
-      "image_name": "{{user `distro`}} - devstack - {{isotime \"20060102-1504\"}}",
+      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+      "image_name": "ZZCI - {{user `distro`}} - devstack - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `public_base_image`}}",
-      "flavor": "general1-1",
+      "flavor": "v1-standard-1",
       "networks": [
         "{{user `public_network`}}"
       ],
-      "user_data_file": "{{user `cloud_user_data`}}"
-    },
-    {
-      "type": "openstack",
-      "name": "private_cloud",
-      "identity_endpoint": "{{user `private_auth_url`}}",
-      "tenant_name": "{{user `private_tenant`}}",
-      "username": "{{user `private_user`}}",
-      "password": "{{user `private_pass`}}",
-      "ssh_username": "{{user `private_cloud_user`}}",
-      "image_name": "{{user `distro`}} - devstack - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `private_base_image`}}",
-      "flavor": "general1-1",
-      "networks": [
-        "{{user `private_network`}}"
-      ],
-      "user_data_file": "{{user `cloud_user_data`}}"
+      "user_data_file": "{{user `cloud_user_data`}}",
+      "metadata": {
+        "ci_managed": "yes"
+      }
     }
   ],
   "provisioners": [

diff --git a/packer/templates/docker.json b/packer/templates/docker.json
index 5fccb455aa46d95c0c5f1b2a37c32aca63d380ae..e4575f372eaa3eb7e8b0c379c1f29e90bf09b660 100644 (file)
--- a/packer/templates/docker.json
+++ b/packer/templates/docker.json
@@ -7,49 +7,32 @@
     "public_tenant": null,
     "public_user": null,
     "public_pass": null,
-    "private_base_image": null,
-    "private_network": null,
-    "private_cloud_user": null,
-    "private_auth_url": null,
-    "private_tenant": null,
-    "private_user": null,
-    "private_pass": null,
     "distro": null,
-    "cloud_user_data": null
+    "cloud_user_data": null,
+    "ssh_proxy_host": ""
   },
   "builders": [
     {
       "type": "openstack",
-      "name": "public_cloud",
       "identity_endpoint": "{{user `public_auth_url`}}",
+      "domain_name": "Default",
       "tenant_name": "{{user `public_tenant`}}",
       "username": "{{user `public_user`}}",
       "password": "{{user `public_pass`}}",
-      "region": "DFW",
+      "region": "ca-ymq-1",
+      "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `public_cloud_user`}}",
-      "image_name": "{{user `distro`}} - docker - {{isotime \"20060102-1504\"}}",
+      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+      "image_name": "ZZCI - {{user `distro`}} - docker - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `public_base_image`}}",
-      "flavor": "general1-1",
+      "flavor": "v1-standard-1",
       "networks": [
         "{{user `public_network`}}"
       ],
-      "user_data_file": "{{user `cloud_user_data`}}"
-    },
-    {
-      "type": "openstack",
-      "name": "private_cloud",
-      "identity_endpoint": "{{user `private_auth_url`}}",
-      "tenant_name": "{{user `private_tenant`}}",
-      "username": "{{user `private_user`}}",
-      "password": "{{user `private_pass`}}",
-      "ssh_username": "{{user `private_cloud_user`}}",
-      "image_name": "{{user `distro`}} - docker - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `private_base_image`}}",
-      "flavor": "general1-1",
-      "networks": [
-        "{{user `private_network`}}"
-      ],
-      "user_data_file": "{{user `cloud_user_data`}}"
+      "user_data_file": "{{user `cloud_user_data`}}",
+      "metadata": {
+        "ci_managed": "yes"
+      }
     }
   ],
   "provisioners": [

diff --git a/packer/templates/gbp.json b/packer/templates/gbp.json
index b82f468dafdbbcc90df6776e05a00ab90176ab2b..0e3eb0f2b25bcf707157383658cb5e61020cbad2 100644 (file)
--- a/packer/templates/gbp.json
+++ b/packer/templates/gbp.json
@@ -7,49 +7,32 @@
     "public_tenant": null,
     "public_user": null,
     "public_pass": null,
-    "private_base_image": null,
-    "private_network": null,
-    "private_cloud_user": null,
-    "private_auth_url": null,
-    "private_tenant": null,
-    "private_user": null,
-    "private_pass": null,
     "distro": null,
-    "cloud_user_data": null
+    "cloud_user_data": null,
+    "ssh_proxy_host": ""
   },
   "builders": [
     {
       "type": "openstack",
-      "name": "public_cloud",
       "identity_endpoint": "{{user `public_auth_url`}}",
+      "domain_name": "Default",
       "tenant_name": "{{user `public_tenant`}}",
       "username": "{{user `public_user`}}",
       "password": "{{user `public_pass`}}",
-      "region": "DFW",
+      "region": "ca-ymq-1",
+      "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `public_cloud_user`}}",
-      "image_name": "{{user `distro`}} - gbp - {{isotime \"20060102-1504\"}}",
+      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+      "image_name": "ZZCI - {{user `distro`}} - gbp - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `public_base_image`}}",
-      "flavor": "general1-1",
+      "flavor": "v1-standard-1",
       "networks": [
         "{{user `public_network`}}"
       ],
-      "user_data_file": "{{user `cloud_user_data`}}"
-    },
-    {
-      "type": "openstack",
-      "name": "private_cloud",
-      "identity_endpoint": "{{user `private_auth_url`}}",
-      "tenant_name": "{{user `private_tenant`}}",
-      "username": "{{user `private_user`}}",
-      "password": "{{user `private_pass`}}",
-      "ssh_username": "{{user `private_cloud_user`}}",
-      "image_name": "{{user `distro`}} - gbp - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `private_base_image`}}",
-      "flavor": "general1-1",
-      "networks": [
-        "{{user `private_network`}}"
-      ],
-      "user_data_file": "{{user `cloud_user_data`}}"
+      "user_data_file": "{{user `cloud_user_data`}}",
+      "metadata": {
+        "ci_managed": "yes"
+      }
     }
   ],
   "provisioners": [

diff --git a/packer/templates/java-builder.json b/packer/templates/java-builder.json
index ef5f42e0453e3340c13f34d243b58b8d76583eca..0e0d2178db42332b9ff1638580ce8fae82584f7c 100644 (file)
--- a/packer/templates/java-builder.json
+++ b/packer/templates/java-builder.json
@@ -7,49 +7,32 @@
     "public_tenant": null,
     "public_user": null,
     "public_pass": null,
-    "private_base_image": null,
-    "private_network": null,
-    "private_cloud_user": null,
-    "private_auth_url": null,
-    "private_tenant": null,
-    "private_user": null,
-    "private_pass": null,
     "distro": null,
-    "cloud_user_data": null
+    "cloud_user_data": null,
+    "ssh_proxy_host": ""
   },
   "builders": [
     {
       "type": "openstack",
-      "name": "public_cloud",
       "identity_endpoint": "{{user `public_auth_url`}}",
+      "domain_name": "Default",
       "tenant_name": "{{user `public_tenant`}}",
       "username": "{{user `public_user`}}",
       "password": "{{user `public_pass`}}",
-      "region": "DFW",
+      "region": "ca-ymq-1",
+      "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `public_cloud_user`}}",
-      "image_name": "{{user `distro`}} - java-builder - {{isotime \"20060102-1504\"}}",
+      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+      "image_name": "ZZCI - {{user `distro`}} - java-builder - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `public_base_image`}}",
-      "flavor": "general1-1",
+      "flavor": "v1-standard-1",
       "networks": [
         "{{user `public_network`}}"
       ],
-      "user_data_file": "{{user `cloud_user_data`}}"
-    },
-    {
-      "type": "openstack",
-      "name": "private_cloud",
-      "identity_endpoint": "{{user `private_auth_url`}}",
-      "tenant_name": "{{user `private_tenant`}}",
-      "username": "{{user `private_user`}}",
-      "password": "{{user `private_pass`}}",
-      "ssh_username": "{{user `private_cloud_user`}}",
-      "image_name": "{{user `distro`}} - java-builder - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `private_base_image`}}",
-      "flavor": "general1-1",
-      "networks": [
-        "{{user `private_network`}}"
-      ],
-      "user_data_file": "{{user `cloud_user_data`}}"
+      "user_data_file": "{{user `cloud_user_data`}}",
+      "metadata": {
+        "ci_managed": "yes"
+      }
     }
   ],
   "provisioners": [

diff --git a/packer/templates/mininet-ovs-2.5.json b/packer/templates/mininet-ovs-2.5.json
index 204ec4773d422e9628d4241ce560126dacbca60c..a3d02156923831aa726ab50b679512cba2a9264b 100644 (file)
--- a/packer/templates/mininet-ovs-2.5.json
+++ b/packer/templates/mininet-ovs-2.5.json
@@ -7,49 +7,32 @@
     "public_tenant": null,
     "public_user": null,
     "public_pass": null,
-    "private_base_image": null,
-    "private_network": null,
-    "private_cloud_user": null,
-    "private_auth_url": null,
-    "private_tenant": null,
-    "private_user": null,
-    "private_pass": null,
     "distro": null,
-    "cloud_user_data": null
+    "cloud_user_data": null,
+    "ssh_proxy_host": ""
   },
   "builders": [
     {
       "type": "openstack",
-      "name": "public_cloud",
       "identity_endpoint": "{{user `public_auth_url`}}",
+      "domain_name": "Default",
       "tenant_name": "{{user `public_tenant`}}",
       "username": "{{user `public_user`}}",
       "password": "{{user `public_pass`}}",
-      "region": "DFW",
+      "region": "ca-ymq-1",
+      "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `public_cloud_user`}}",
-      "image_name": "{{user `distro`}} - mininet-ovs-25 - {{isotime \"20060102-1504\"}}",
+      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+      "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-25 - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `public_base_image`}}",
-      "flavor": "general1-1",
+      "flavor": "v1-standard-1",
       "networks": [
         "{{user `public_network`}}"
       ],
-      "user_data_file": "{{user `cloud_user_data`}}"
-    },
-    {
-      "type": "openstack",
-      "name": "private_cloud",
-      "identity_endpoint": "{{user `private_auth_url`}}",
-      "tenant_name": "{{user `private_tenant`}}",
-      "username": "{{user `private_user`}}",
-      "password": "{{user `private_pass`}}",
-      "ssh_username": "{{user `private_cloud_user`}}",
-      "image_name": "{{user `distro`}} - mininet-ovs-25 - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `private_base_image`}}",
-      "flavor": "general1-1",
-      "networks": [
-        "{{user `private_network`}}"
-      ],
-      "user_data_file": "{{user `cloud_user_data`}}"
+      "user_data_file": "{{user `cloud_user_data`}}",
+      "metadata": {
+        "ci_managed": "yes"
+      }
     }
   ],
   "provisioners": [

diff --git a/packer/templates/mininet-ovs-2.6.json b/packer/templates/mininet-ovs-2.6.json
index 5bb8ba5243a9ca715e7182bb6603abde2936ae79..dc2eed198ce52bbe4d98e741c2f2a54e852aca6f 100644 (file)
--- a/packer/templates/mininet-ovs-2.6.json
+++ b/packer/templates/mininet-ovs-2.6.json
@@ -7,49 +7,32 @@
     "public_tenant": null,
     "public_user": null,
     "public_pass": null,
-    "private_base_image": null,
-    "private_network": null,
-    "private_cloud_user": null,
-    "private_auth_url": null,
-    "private_tenant": null,
-    "private_user": null,
-    "private_pass": null,
     "distro": null,
-    "cloud_user_data": null
+    "cloud_user_data": null,
+    "ssh_proxy_host": ""
   },
   "builders": [
     {
       "type": "openstack",
-      "name": "public_cloud",
       "identity_endpoint": "{{user `public_auth_url`}}",
+      "domain_name": "Default",
       "tenant_name": "{{user `public_tenant`}}",
       "username": "{{user `public_user`}}",
       "password": "{{user `public_pass`}}",
-      "region": "DFW",
+      "region": "ca-ymq-1",
+      "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `public_cloud_user`}}",
-      "image_name": "{{user `distro`}} - mininet-ovs-26 - {{isotime \"20060102-1504\"}}",
+      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+      "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-26 - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `public_base_image`}}",
-      "flavor": "general1-1",
+      "flavor": "v1-standard-1",
       "networks": [
         "{{user `public_network`}}"
       ],
-      "user_data_file": "{{user `cloud_user_data`}}"
-    },
-    {
-      "type": "openstack",
-      "name": "private_cloud",
-      "identity_endpoint": "{{user `private_auth_url`}}",
-      "tenant_name": "{{user `private_tenant`}}",
-      "username": "{{user `private_user`}}",
-      "password": "{{user `private_pass`}}",
-      "ssh_username": "{{user `private_cloud_user`}}",
-      "image_name": "{{user `distro`}} - mininet-ovs-26 - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `private_base_image`}}",
-      "flavor": "general1-1",
-      "networks": [
-        "{{user `private_network`}}"
-      ],
-      "user_data_file": "{{user `cloud_user_data`}}"
+      "user_data_file": "{{user `cloud_user_data`}}",
+      "metadata": {
+        "ci_managed": "yes"
+      }
     }
   ],
   "provisioners": [

diff --git a/packer/templates/mininet.json b/packer/templates/mininet.json
index 702f5be15b6206791927f0832cee935e0c9a4c22..d39f2fb23e3a62664fee1155316521a2800dac4f 100644 (file)
--- a/packer/templates/mininet.json
+++ b/packer/templates/mininet.json
@@ -7,49 +7,32 @@
     "public_tenant": null,
     "public_user": null,
     "public_pass": null,
-    "private_base_image": null,
-    "private_network": null,
-    "private_cloud_user": null,
-    "private_auth_url": null,
-    "private_tenant": null,
-    "private_user": null,
-    "private_pass": null,
     "distro": null,
-    "cloud_user_data": null
+    "cloud_user_data": null,
+    "ssh_proxy_host": ""
   },
   "builders": [
     {
       "type": "openstack",
-      "name": "public_cloud",
       "identity_endpoint": "{{user `public_auth_url`}}",
+      "domain_name": "Default",
       "tenant_name": "{{user `public_tenant`}}",
       "username": "{{user `public_user`}}",
       "password": "{{user `public_pass`}}",
-      "region": "DFW",
+      "region": "ca-ymq-1",
+      "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `public_cloud_user`}}",
-      "image_name": "{{user `distro`}} - mininet - {{isotime \"20060102-1504\"}}",
+      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+      "image_name": "ZZCI - {{user `distro`}} - mininet - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `public_base_image`}}",
-      "flavor": "general1-1",
+      "flavor": "v1-standard-1",
       "networks": [
         "{{user `public_network`}}"
       ],
-      "user_data_file": "{{user `cloud_user_data`}}"
-    },
-    {
-      "type": "openstack",
-      "name": "private_cloud",
-      "identity_endpoint": "{{user `private_auth_url`}}",
-      "tenant_name": "{{user `private_tenant`}}",
-      "username": "{{user `private_user`}}",
-      "password": "{{user `private_pass`}}",
-      "ssh_username": "{{user `private_cloud_user`}}",
-      "image_name": "{{user `distro`}} - mininet - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `private_base_image`}}",
-      "flavor": "general1-1",
-      "networks": [
-        "{{user `private_network`}}"
-      ],
-      "user_data_file": "{{user `cloud_user_data`}}"
+      "user_data_file": "{{user `cloud_user_data`}}",
+      "metadata": {
+        "ci_managed": "yes"
+      }
     }
   ],
   "provisioners": [

diff --git a/packer/templates/robot.json b/packer/templates/robot.json
index d79322dc390ce544198122b1fa1fcf5b2641f428..246698b5073ab81cf1b688ba632c50fa45a3e524 100644 (file)
--- a/packer/templates/robot.json
+++ b/packer/templates/robot.json
@@ -7,49 +7,32 @@
     "public_tenant": null,
     "public_user": null,
     "public_pass": null,
-    "private_base_image": null,
-    "private_network": null,
-    "private_cloud_user": null,
-    "private_auth_url": null,
-    "private_tenant": null,
-    "private_user": null,
-    "private_pass": null,
     "distro": null,
-    "cloud_user_data": null
+    "cloud_user_data": null,
+    "ssh_proxy_host": ""
   },
   "builders": [
     {
       "type": "openstack",
-      "name": "public_cloud",
       "identity_endpoint": "{{user `public_auth_url`}}",
+      "domain_name": "Default",
       "tenant_name": "{{user `public_tenant`}}",
       "username": "{{user `public_user`}}",
       "password": "{{user `public_pass`}}",
-      "region": "DFW",
+      "region": "ca-ymq-1",
+      "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `public_cloud_user`}}",
-      "image_name": "{{user `distro`}} - robot - {{isotime \"20060102-1504\"}}",
+      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+      "image_name": "ZZCI - {{user `distro`}} - robot - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `public_base_image`}}",
-      "flavor": "general1-1",
+      "flavor": "v1-standard-1",
       "networks": [
         "{{user `public_network`}}"
       ],
-      "user_data_file": "{{user `cloud_user_data`}}"
-    },
-    {
-      "type": "openstack",
-      "name": "private_cloud",
-      "identity_endpoint": "{{user `private_auth_url`}}",
-      "tenant_name": "{{user `private_tenant`}}",
-      "username": "{{user `private_user`}}",
-      "password": "{{user `private_pass`}}",
-      "ssh_username": "{{user `private_cloud_user`}}",
-      "image_name": "{{user `distro`}} - robot - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `private_base_image`}}",
-      "flavor": "general1-1",
-      "networks": [
-        "{{user `private_network`}}"
-      ],
-      "user_data_file": "{{user `cloud_user_data`}}"
+      "user_data_file": "{{user `cloud_user_data`}}",
+      "metadata": {
+        "ci_managed": "yes"
+      }
     }
   ],
   "provisioners": [

diff --git a/packer/vars/centos.json b/packer/vars/centos.json
index 30c0d4a1a2628158289ac6b08ea96eb41a27182e..2576691e2b2f39f37604dfe3c79592f3d28ed1eb 100644 (file)
--- a/packer/vars/centos.json
+++ b/packer/vars/centos.json
@@ -1,8 +1,6 @@
 {
-  "public_base_image": "CentOS 7 (PVHVM)",
-  "public_cloud_user": "root",
-  "private_base_image": "CentOS 7 (cloudimg 1510)",
-  "private_cloud_user": "centos",
+  "public_base_image": "CentOS 7.1711 (2017-11-05) - LF upload",
+  "public_cloud_user": "centos",
   "distro": "CentOS 7",
   "cloud_user_data": "provision/rh-user_data.sh"
 }

diff --git a/packer/vars/cloud-env.json.example b/packer/vars/cloud-env.json.example
index efd33d900c38bc79a28a36d98e6793470fdf46b5..7eccab25cb8868524f1599d4c2ca8947a587d580 100644 (file)
--- a/packer/vars/cloud-env.json.example
+++ b/packer/vars/cloud-env.json.example
@@ -1,12 +1,8 @@
 {
-  "public_auth_url": "https://identity.api.rackspacecloud.com/v2.0/",
+  "public_auth_url": "https://auth.vexxhost.net/v3/",
   "public_tenant": "TENNANTID",
   "public_user": "USERID",
   "public_pass": "USERPASS",
-  "public_network": "cac67a72-aefc-48f8-ae55-9affa3540dd0",
-  "private_auth_url": "https://privapi.opendaylight.org:5000/v2.0",
-  "private_tenant": "TENNANTID",
-  "private_user": "USERID",
-  "private_pass": "USERPASS",
-  "private_network": "6bd0cc77-9896-4fba-a663-88c1a4bbd9a2"
+  "public_network": "b5fcd86e-efac-4997-b8bc-dbe0d35bc229",
+  "ssh_proxy_host": ""
 }

diff --git a/packer/vars/ubuntu-14.04.json b/packer/vars/ubuntu-14.04.json
index 699fef59e8ff7e7fcf5591c7b3bc0818724f1d78..e20a792696474b2fefb5c5a4b26f3035c811e51c 100644 (file)
--- a/packer/vars/ubuntu-14.04.json
+++ b/packer/vars/ubuntu-14.04.json
@@ -1,8 +1,6 @@
 {
-  "public_base_image": "Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)",
-  "public_cloud_user": "root",
-  "private_base_image": "Ubuntu 14.04 LTS Trusty Tahr (cloudimg)",
-  "private_cloud_user": "ubuntu",
+  "public_base_image": "Ubuntu 14.04.5 LTS (2017-12-05) - LF upload",
+  "public_cloud_user": "ubuntu",
   "distro": "Ubuntu 14.04",
   "cloud_user_data": "provision/null_data.sh"
 }

diff --git a/packer/vars/ubuntu-16.04.json b/packer/vars/ubuntu-16.04.json
index 760cd6475226bc481407a77c2ea27cf0a7facf0a..320e46dc9a59c1d2547640bb8ef45c11e4c4e0d4 100644 (file)
--- a/packer/vars/ubuntu-16.04.json
+++ b/packer/vars/ubuntu-16.04.json
@@ -1,8 +1,6 @@
 {
-  "public_base_image": "Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM)",
-  "public_cloud_user": "root",
-  "private_base_image": "Ubuntu 16.04 LTS (2016-05-03 cloudimg)",
-  "private_cloud_user": "ubuntu",
+  "public_base_image": "Ubuntu 16.04 LTS (2017-12-01) - LF upload",
+  "public_cloud_user": "ubuntu",
   "distro": "Ubuntu 16.04",
   "cloud_user_data": "provision/null_data.sh"
 }