From 58f428fdf5b0688fc5a8c5348154da62e087f769 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Thu, 30 Jun 2016 11:59:28 -0400 Subject: Adding tacker support opnfv-tht-pr: 34 opnfv-puppet-tripleo-pr: 4 JIRA: APEX-126 Change-Id: I050e7ae2e94779c1886f670841aa4e2dec4aa8d2 Signed-off-by: Dan Radez --- build/undercloud.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'build/undercloud.sh') diff --git a/build/undercloud.sh b/build/undercloud.sh index 7b40625e..d6c6c414 100755 --- a/build/undercloud.sh +++ b/build/undercloud.sh @@ -22,6 +22,14 @@ pushd opnfv-tht > /dev/null git archive --format=tar.gz --prefix=openstack-tripleo-heat-templates/ HEAD > ../opnfv-tht.tar.gz popd > /dev/null +cat > /tmp/tacker.repo << EOF +[tacker-trozet] +name=Tacker RPMs built from https://github.com/trozet/ tacker repositories +baseurl=http://radez.fedorapeople.org/tacker/ +enabled=1 +gpgcheck=0 +EOF + pushd images > /dev/null # installing forked opnfv-tht # enabling ceph OSDs to live on the controller @@ -29,6 +37,8 @@ pushd images > /dev/null # seeding configuration files specific to OPNFV # add congress client and apply: https://review.openstack.org/#/c/297515/ # add congress password to python-triploclient +# 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 \ --run-command "cd /usr/share && rm -rf openstack-tripleo-heat-templates && tar xzf opnfv-tht.tar.gz" \ @@ -46,6 +56,12 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --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" \ --run-command "sed -i '/^SERVICES/a\ \x27congress\x27: {\x27description\x27: \x27Congress Service\x27, \x27type\x27: \x27policy\x27, \x27path\x27: \x27/\x27, \x27port\x27: 1789 },' /usr/lib/python2.7/site-packages/os_cloud_config/keystone.py" \ + --run-command "sed -i '/SERVICE_LIST/a\\ \x27tacker\x27: {\x27password_field\x27: \x27OVERCLOUD_TACKER_PASSWORD\x27},' /usr/lib/python2.7/site-packages/tripleoclient/constants.py" \ + --run-command "sed -i '/PASSWORD_NAMES =/a\\ \"OVERCLOUD_TACKER_PASSWORD\",' /usr/lib/python2.7/site-packages/tripleoclient/utils.py" \ + --run-command "sed -i '/AodhPassword/a\\ parameters\[\x27TackerPassword\x27\] = passwords\[\x27OVERCLOUD_TACKER_PASSWORD\x27\]' /usr/lib/python2.7/site-packages/tripleoclient/v1/overcloud_deploy.py" \ + --run-command "sed -i '/^SERVICES/a\ \x27tacker\x27: {\x27description\x27: \x27Tacker Service\x27, \x27type\x27: \x27servicevm\x27, \x27path\x27: \x27/\x27, \x27port\x27: 1789 },' /usr/lib/python2.7/site-packages/os_cloud_config/keystone.py" \ + --upload /tmp/tacker.repo:/etc/yum.repos.d/ \ + --install "python-tackerclient" \ -a undercloud_build.qcow2 # Add custom IPA to allow kernel params -- cgit 1.2.3-korg