From f24803d805444a72d5d664fe896c9f61c824b844 Mon Sep 17 00:00:00 2001
From: spurti-chopra <spurti@us.ibm.com>
Date: Tue, 3 Apr 2018 06:07:55 -0400
Subject: [PATCH] Added bastion host option for Openstack builder

---
 .example.env     |  5 +++++
 ci-opal.yml      | 15 ++++++++++++++-
 ci-sardonyx.yml  | 15 ++++++++++++++-
 ci-stevonnie.yml | 15 ++++++++++++++-
 4 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/.example.env b/.example.env
index 3a4e4cdf5..85b231c28 100644
--- a/.example.env
+++ b/.example.env
@@ -24,8 +24,13 @@ export OS_NETWORKS='ffffffff-aaaa-ffff-aaaa-ffffffffffff'
 export OS_PASSWORD='extremesecrecyhello'
 export OS_PROJECT_ID='vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv'
 export OS_PROJECT_NAME='Travis CI'
+export OS_DOMAIN_NAME='to_be_used_in_case_v3_identity_api'
 export OS_REGION_NAME='RegionOne'
+export OS_ZONE='nova'
+export OS_BASTION_HOST='bastion-host-name-or-ip'
+export OS_SSH_KEY='KEYPAIR-NAME'
 export OS_SOURCE_IMAGE_XENIAL='Ubuntu 16.04 LE'
+export OS_VM_FLAVOR='m1.medium'
 export OS_TENANT_ID='vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv'
 export OS_TENANT_NAME='Travis CI'
 export OS_USERNAME='whoami'
diff --git a/ci-opal.yml b/ci-opal.yml
index ae16f62d5..4b728befa 100644
--- a/ci-opal.yml
+++ b/ci-opal.yml
@@ -7,6 +7,10 @@ variables:
   gce_project_id: "{{ env `GCE_PROJECT_ID` }}"
   image_name: travis-ci-opal-xenial-{{ timestamp }}-<%= git_desc %>
   openstack_source_image_name: "{{ env `OS_SOURCE_IMAGE_XENIAL` }}"
+  openstack_ssh_key: "{{ env `OS_SSH_KEY` }}"
+  openstack_bastion_host_ip: "{{ env `OS_BASTION_HOST` }}"
+  openstack_zone: "{{ env `OS_ZONE` }}"
+  openstack_vm_flavor: "{{ env `OS_VM_FLAVOR` }}"
   travis_cookbooks_branch: "{{ env `TRAVIS_COOKBOOKS_BRANCH` }}"
   travis_cookbooks_edge_branch: master
   travis_cookbooks_sha: "{{ env `TRAVIS_COOKBOOKS_SHA` }}"
@@ -52,7 +56,7 @@ builders:
 # https://github.com/travis-ci/packer-templates/issues/555
 # - type: openstack
 #   name: openstack
-#   flavor: m1.medium-travis-ci
+#   flavor: "{{ user `openstack_vm_flavor` }}"
 #   image_name: "{{ user `image_name` }}"
 #   ssh_username: ubuntu
 #   networks:
@@ -60,6 +64,15 @@ builders:
 #   - <%= network %>
 #   <% end %>
 #   source_image_name: "{{ user `openstack_source_image_name` }}"
+#   availability_zone: "{{ user `openstack_zone` }}"
+#   <% if ! ENV['OS_BASTION_HOST'].to_s.empty? %>
+#   ssh_bastion_host: "{{ user `openstack_bastion_host_ip` }}"
+#   ssh_bastion_port: 22
+#   ssh_bastion_username: ubuntu
+#   ssh_bastion_private_key_file: "{{ user `openstack_ssh_key` }}"
+#   <% end %>
+#   ssh_keypair_name: "{{ user `openstack_ssh_key` }}"
+#   ssh_private_key_file: "{{ user `openstack_ssh_key` }}"
 provisioners:
 - type: shell
   inline: sleep 10
diff --git a/ci-sardonyx.yml b/ci-sardonyx.yml
index 5394b4845..abecf64a3 100644
--- a/ci-sardonyx.yml
+++ b/ci-sardonyx.yml
@@ -7,6 +7,10 @@ variables:
   gce_project_id: "{{ env `GCE_PROJECT_ID` }}"
   image_name: travis-ci-sardonyx-xenial-{{ timestamp }}-<%= git_desc %>
   openstack_source_image_name: "{{ env `OS_SOURCE_IMAGE_XENIAL` }}"
+  openstack_ssh_key: "{{ env `OS_SSH_KEY` }}"
+  openstack_bastion_host_ip: "{{ env `OS_BASTION_HOST` }}"
+  openstack_zone: "{{ env `OS_ZONE` }}"
+  openstack_vm_flavor: "{{ env `OS_VM_FLAVOR` }}"
   travis_cookbooks_branch: "{{ env `TRAVIS_COOKBOOKS_BRANCH` }}"
   travis_cookbooks_edge_branch: master
   travis_cookbooks_sha: "{{ env `TRAVIS_COOKBOOKS_SHA` }}"
@@ -52,7 +56,7 @@ builders:
 # https://github.com/travis-ci/packer-templates/issues/555
 # - type: openstack
 #   name: openstack
-#   flavor: m1.medium-travis-ci
+#   flavor: "{{ user `openstack_vm_flavor` }}"
 #   image_name: "{{ user `image_name` }}"
 #   ssh_username: ubuntu
 #   networks:
@@ -60,6 +64,15 @@ builders:
 #   - <%= network %>
 #   <% end %>
 #   source_image_name: "{{ user `openstack_source_image_name` }}"
+#   availability_zone: "{{ user `openstack_zone` }}"
+#   <% if ! ENV['OS_BASTION_HOST'].to_s.empty? %>
+#   ssh_bastion_host: "{{ user `openstack_bastion_host_ip` }}"
+#   ssh_bastion_port: 22
+#   ssh_bastion_username: ubuntu
+#   ssh_bastion_private_key_file: "{{ user `openstack_ssh_key` }}"
+#   <% end %>
+#   ssh_keypair_name: "{{ user `openstack_ssh_key` }}"
+#   ssh_private_key_file: "{{ user `openstack_ssh_key` }}"
 provisioners:
 - type: shell
   inline: sleep 10
diff --git a/ci-stevonnie.yml b/ci-stevonnie.yml
index 02347b288..7a2041ad4 100644
--- a/ci-stevonnie.yml
+++ b/ci-stevonnie.yml
@@ -7,6 +7,10 @@ variables:
   gce_project_id: "{{ env `GCE_PROJECT_ID` }}"
   image_name: travis-ci-stevonnie-xenial-{{ timestamp }}-<%= git_desc %>
   openstack_source_image_name: "{{ env `OS_SOURCE_IMAGE_XENIAL` }}"
+  openstack_ssh_key: "{{ env `OS_SSH_KEY` }}"
+  openstack_bastion_host_ip: "{{ env `OS_BASTION_HOST` }}"
+  openstack_zone: "{{ env `OS_ZONE` }}"
+  openstack_vm_flavor: "{{ env `OS_VM_FLAVOR` }}"
   travis_cookbooks_branch: "{{ env `TRAVIS_COOKBOOKS_BRANCH` }}"
   travis_cookbooks_edge_branch: master
   travis_cookbooks_sha: "{{ env `TRAVIS_COOKBOOKS_SHA` }}"
@@ -52,7 +56,7 @@ builders:
 # https://github.com/travis-ci/packer-templates/issues/555
 # - type: openstack
 #   name: openstack
-#   flavor: m1.large-travis-ci
+#   flavor: "{{ user `openstack_vm_flavor` }}"
 #   image_name: "{{ user `image_name` }}"
 #   ssh_username: ubuntu
 #   networks:
@@ -60,6 +64,15 @@ builders:
 #   - <%= network %>
 #   <% end %>
 #   source_image_name: "{{ user `openstack_source_image_name` }}"
+#   availability_zone: "{{ user `openstack_zone` }}"
+#   <% if ! ENV['OS_BASTION_HOST'].to_s.empty? %>
+#   ssh_bastion_host: "{{ user `openstack_bastion_host_ip` }}"
+#   ssh_bastion_port: 22
+#   ssh_bastion_username: ubuntu
+#   ssh_bastion_private_key_file: "{{ user `openstack_ssh_key` }}"
+#   <% end %>
+#   ssh_keypair_name: "{{ user `openstack_ssh_key` }}"
+#   ssh_private_key_file: "{{ user `openstack_ssh_key` }}"
 provisioners:
 - type: shell
   inline: sleep 10