summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-04-07 11:52:01 -0400
committerTim Rozet <trozet@redhat.com>2016-04-07 14:34:37 -0400
commit9bebfc4c3a614ca6f3721fbef4c466e74411323a (patch)
treeadd216ffcf907ea10fc36d4c260ae773066f7115 /build
parent48d62412ec1e2302edae13e3eee15d1f38c2ab7b (diff)
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>
Diffstat (limited to 'build')
-rw-r--r--build/opnfv-environment.yaml5
-rwxr-xr-xbuild/undercloud.sh2
2 files changed, 7 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
+