From e8b6d6debe2b056b404fc353f54b67364b58c59d Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Mon, 10 Oct 2016 17:11:20 -0400 Subject: Migrate to stable/newton os-odl_l2_nofeature is now deprecated since new netvirt only supports odl_l3. JIRA: APEX-299 Change-Id: I3557ecb85fa4cd11bba96aa9410e56a8e8cceb00 Signed-off-by: Tim Rozet --- build/undercloud.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'build/undercloud.sh') 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" \ -- cgit 1.2.3-korg