summaryrefslogtreecommitdiffstats
path: root/build/undercloud.sh
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-11-11 19:26:47 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-11 19:26:47 +0000
commit5f2cc4e6b222d109836abd1172f481f303f46319 (patch)
tree3cf444cb9e0aead555945195d07b5f61230a90d4 /build/undercloud.sh
parent0333a22450988e3950c0915aa0cebeddf0886952 (diff)
parente8b6d6debe2b056b404fc353f54b67364b58c59d (diff)
Merge "Migrate to stable/newton"
Diffstat (limited to 'build/undercloud.sh')
-rwxr-xr-xbuild/undercloud.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/build/undercloud.sh b/build/undercloud.sh
index 3cc56009..eaa3b501 100755
--- a/build/undercloud.sh
+++ b/build/undercloud.sh
@@ -27,12 +27,14 @@ pushd images > /dev/null
# enabling ceph OSDs to live on the controller
# OpenWSMan package update supports the AMT Ironic driver for the TealBox
# seeding configuration files specific to OPNFV
-# add congress client and apply: https://review.openstack.org/#/c/297515/
-# add congress password to python-triploclient
+# add congress client
+# add congress password to python-tripleoclient
# add tacker password to python-tripleoclient
# upload tacker repo and install the client package
LIBGUESTFS_BACKEND=direct virt-customize \
--upload ../opnfv-tht.tar.gz:/usr/share \
+ --install "openstack-utils" \
+ --install "ceph-common" \
--run-command "cd /usr/share && rm -rf openstack-tripleo-heat-templates && tar xzf opnfv-tht.tar.gz" \
--run-command "sed -i '/ControllerEnableCephStorage/c\\ ControllerEnableCephStorage: true' /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml" \
--run-command "sed -i '/ComputeEnableCephStorage/c\\ ComputeEnableCephStorage: true' /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml" \
@@ -42,8 +44,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--upload ../opnfv-environment.yaml:/home/stack/ \
--upload ../virtual-environment.yaml:/home/stack/ \
--install "python2-congressclient" \
- --upload ../python-congressclient.diff:/tmp \
- --run-command "cd /usr/lib/python2.7/site-packages && patch -p1 < /tmp/python-congressclient.diff" \
--run-command "sed -i '/SERVICE_LIST/a\\ \x27congress\x27: {\x27password_field\x27: \x27OVERCLOUD_CONGRESS_PASSWORD\x27},' /usr/lib/python2.7/site-packages/tripleoclient/constants.py" \
--run-command "sed -i '/PASSWORD_NAMES =/a\\ \"OVERCLOUD_CONGRESS_PASSWORD\",' /usr/lib/python2.7/site-packages/tripleoclient/utils.py" \
--run-command "sed -i '/AodhPassword/a\\ parameters\[\x27CongressPassword\x27\] = passwords\[\x27OVERCLOUD_CONGRESS_PASSWORD\x27\]' /usr/lib/python2.7/site-packages/tripleoclient/v1/overcloud_deploy.py" \