summaryrefslogtreecommitdiffstats
path: root/build/undercloud.sh
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-08-17 17:05:28 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-17 17:05:28 +0000
commit295f767df246efb71eb1bb394ae0f85654710699 (patch)
tree6f6acc375e1e8ea51a403047ce035853decd4fa8 /build/undercloud.sh
parentaae3c0250fc0f2b67293bafd000fba5a621928fd (diff)
parent0b7fdc099fd750c76334261ef18bfa2e3d70234e (diff)
Merge "adding tackerclient to the build"
Diffstat (limited to 'build/undercloud.sh')
-rwxr-xr-xbuild/undercloud.sh14
1 files changed, 3 insertions, 11 deletions
diff --git a/build/undercloud.sh b/build/undercloud.sh
index 75aa265a..10c46e74 100755
--- a/build/undercloud.sh
+++ b/build/undercloud.sh
@@ -22,14 +22,6 @@ 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
@@ -59,9 +51,9 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--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: 8888 },' /usr/lib/python2.7/site-packages/os_cloud_config/keystone.py" \
- --upload /tmp/tacker.repo:/etc/yum.repos.d/ \
- --install "python-tackerclient" \
+ --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 ../noarch/python-tackerclient-2015.2-1.trozet.noarch.rpm:/root/ \
+ --install /root/python-tackerclient-2015.2-1.trozet.noarch.rpm \
--install "python2-aodhclient" \
--install "openstack-heat-engine" \
--install "openstack-heat-api-cfn" \