summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-04-08 00:44:18 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-04-08 00:44:18 +0000
commit2b66c3113aa34829621e140b66fbfb25dbf086cf (patch)
tree19c0f5240bc98567bcb380a80934ba3f6e2f5125
parentd1dc7ebd54fd2eba6bbf17a0bc531e5838635206 (diff)
parent9bebfc4c3a614ca6f3721fbef4c466e74411323a (diff)
Merge "Fixes controller Image to be overcloud-full"
-rw-r--r--build/opnfv-environment.yaml5
-rwxr-xr-xbuild/undercloud.sh2
-rwxr-xr-xci/deploy.sh2
3 files changed, 9 insertions, 0 deletions
diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml
new file mode 100644
index 00000000..127a7283
--- /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 02ff3ff6..f39ee73f 100755
--- 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 9e317c8a..c14a91e3 100755
--- 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