Fixes controller Image to be overcloud-full

New param introduced into THT that exposes the image to use for the
Controller.  The new var is defaulted to use overcloud-control and is
causing master to fail.

Changes Include:
 - Adds opnfv-environment yaml file to use for common parameters
   required in all deployments
 - Defaults controllerImage to be overcloud-full

Change-Id: I5da8921d9c9efd167748a3d6f42866d18f46d2b7
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml
new file mode 100644 (file)
index 0000000..127a728
--- /dev/null
+++ b/build/opnfv-environment.yaml
@@ -0,0 +1,5 @@
+#Environment file used to list common parameters required for all deployment
+#types
+
+parameters:
+  controllerImage: overcloud-full

diff --git a/build/undercloud.sh b/build/undercloud.sh
index 02ff3ff..f39ee73 100755 (executable)
--- a/build/undercloud.sh
+++ b/build/undercloud.sh
@@ -27,6 +27,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "curl http://download.opensuse.org/repositories/Openwsman/CentOS_CentOS-7/Openwsman.repo > /etc/yum.repos.d/wsman.repo" \
     --run-command "yum update -y openwsman*" \
     --run-command "cp /usr/share/instack-undercloud/undercloud.conf.sample /home/stack/undercloud.conf && chown stack:stack /home/stack/undercloud.conf" \
+    --upload ../opnfv-environment.yaml:/home/stack/ \
     -a undercloud.qcow2
 
 # Patch in OpenDaylight installation and configuration
@@ -34,3 +35,4 @@ LIBGUESTFS_BACKEND=direct virt-customize \
 #                                         --run-command "cd /usr/share/openstack-tripleo-heat-templates/ && patch -Np1 < /tmp/opnfv-tripleo-heat-templates.patch" \
 #                                         -a undercloud.qcow2
 popd > /dev/null
+

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 9e317c8..c14a91e 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -922,6 +922,8 @@ function undercloud_prep_overcloud_deploy {
      DEPLOY_OPTIONS+=" --control-flavor control --compute-flavor compute"
   fi
 
+  DEPLOY_OPTIONS+=" -e opnfv-environment.yaml"
+
   echo -e "${blue}INFO: Deploy options set:\n${DEPLOY_OPTIONS}${reset}"
 
   ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI