summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-06-30 11:59:28 -0400
committerDan Radez <dradez@redhat.com>2016-07-20 15:28:34 -0400
commit58f428fdf5b0688fc5a8c5348154da62e087f769 (patch)
tree73183a3fa5990ea1fd461faae95ae16fed4b1c69 /build
parente255c4e1bfc2ab88a8bf0636cd7ca43d30ffb52c (diff)
Adding tacker support
opnfv-tht-pr: 34 opnfv-puppet-tripleo-pr: 4 JIRA: APEX-126 Change-Id: I050e7ae2e94779c1886f670841aa4e2dec4aa8d2 Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'build')
-rw-r--r--build/network-environment.yaml1
-rw-r--r--build/opnfv-environment.yaml1
-rwxr-xr-xbuild/overcloud-full.sh21
-rwxr-xr-xbuild/undercloud.sh16
4 files changed, 39 insertions, 0 deletions
diff --git a/build/network-environment.yaml b/build/network-environment.yaml
index f1503feb..84bb5cef 100644
--- a/build/network-environment.yaml
+++ b/build/network-environment.yaml
@@ -81,6 +81,7 @@ parameters:
NovaVncProxyNetwork: internal_api
SwiftMgmtNetwork: storage
SwiftProxyNetwork: storage
+ TackerApiNetwork: internal_api
HorizonNetwork: internal_api
MemcachedNetwork: internal_api
RabbitMqNetwork: internal_api
diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml
index 0f841529..61915c96 100644
--- a/build/opnfv-environment.yaml
+++ b/build/opnfv-environment.yaml
@@ -8,6 +8,7 @@ parameters:
ControllerEnableSwiftStorage: false
# CloudDomain:
EnableSahara: false
+ EnableTacker: false
ExtraConfig:
tripleo::ringbuilder::build_ring: False
nova::policy::policies:
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 675343db..7eb22d1d 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -67,6 +67,14 @@ enabled=1
gpgcheck=0
EOF
+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
+
# tar up the fd.io module
rm -rf puppet-fdio
git clone https://github.com/radez/puppet-fdio
@@ -79,6 +87,13 @@ rm -rf vsperf vsperf.tar.gz
git clone https://gerrit.opnfv.org/gerrit/vswitchperf vsperf
tar czf vsperf.tar.gz vsperf
+# tar up the tacker puppet module
+rm -rf puppet-tacker
+git clone https://github.com/radez/puppet-tacker
+pushd puppet-tacker > /dev/null
+git archive --format=tar.gz --prefix=tacker/ HEAD > ../puppet-tacker.tar.gz
+popd > /dev/null
+
# installing forked opnfv-puppet-tripleo
# enable connection tracking for protocal sctp
# upload dpdk rpms but do not install
@@ -89,6 +104,8 @@ tar czf vsperf.tar.gz vsperf
# install fd.io yum repo and packages
# upload puppet fdio
# git clone vsperf into the overcloud image
+# upload tacker repo and install the packages
+# upload the tacker puppet module and untar it
LIBGUESTFS_BACKEND=direct virt-customize \
--upload ../opnfv-puppet-tripleo.tar.gz:/etc/puppet/modules \
--run-command "if ! rpm -qa | grep python-redis; then yum install -y python-redis; fi" \
@@ -115,6 +132,10 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--run-command "cd /etc/puppet/modules && tar xzf puppet-fdio.tar.gz" \
--upload vsperf.tar.gz:/var/opt \
--run-command "cd /var/opt && tar xzf vsperf.tar.gz" \
+ --upload /tmp/tacker.repo:/etc/yum.repos.d/ \
+ --install "openstack-tacker,python-tackerclient" \
+ --upload puppet-tacker.tar.gz:/etc/puppet/modules/ \
+ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-tacker.tar.gz" \
-a overcloud-full_build.qcow2
mv -f overcloud-full_build.qcow2 overcloud-full.qcow2
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