summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-05-26 13:41:24 -0400
committerDan Radez <dradez@redhat.com>2016-07-01 14:17:25 -0400
commit7398338596cb4fc5dc6a884b05a2ab81b32d5b06 (patch)
tree9c7efd5f47259d4663022b2ae97bfc873e070540
parent9366d88b499d51369182c8fb04fa358ae6694844 (diff)
Adding congress support
JIRA: APEX-135 opnfv-tht-pr: 16 opnfv-puppet-tripleo-pr: 2 Change-Id: Ic14abd13e2aa46d7ef37b74dd7b005ebf9977bdd Signed-off-by: Dan Radez <dradez@redhat.com>
-rwxr-xr-xbuild/overcloud-full.sh15
-rwxr-xr-xbuild/undercloud.sh6
-rw-r--r--build/variables.sh2
-rwxr-xr-xci/deploy.sh9
4 files changed, 31 insertions, 1 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 171731ff..936decc3 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -13,6 +13,7 @@ source ./variables.sh
source ./functions.sh
populate_cache "$rdo_images_uri/overcloud-full.tar"
+populate_cache "$openstack_congress"
if [ ! -d images/ ]; then mkdir images; fi
tar -xf cache/overcloud-full.tar -C images/
@@ -50,9 +51,19 @@ for package in ${dpdk_rpms[@]}; do
dpdk_pkg_str+=" --upload $package:/root/dpdk_rpms"
done
+# tar up the congress puppet module
+rm -rf puppet-congress
+git clone https://github.com/radez/puppet-congress
+pushd puppet-congress > /dev/null
+git archive --format=tar.gz --prefix=congress/ origin/stable/mitaka > ../puppet-congress.tar.gz
+popd > /dev/null
+
# installing forked opnfv-puppet-tripleo
# enable connection tracking for protocal sctp
# upload dpdk rpms but do not install
+# enable connection tracking for protocal sctp
+# install the congress rpms
+# upload and explode the congress puppet module
LIBGUESTFS_BACKEND=direct virt-customize \
--upload ../opnfv-puppet-tripleo.tar.gz:/etc/puppet/modules \
--run-command "sed -i 's/^#UseDNS.*$/UseDNS no/' /etc/ssh/sshd_config" \
@@ -66,6 +77,10 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--run-command "yum remove -y qemu-system-x86" \
--upload ../os-net-config.tar.gz:/usr/lib/python2.7/site-packages \
--run-command "cd /usr/lib/python2.7/site-packages/ && rm -rf os_net_config && tar xzf os-net-config.tar.gz" \
+ --install "$openstack_congress" \
+ --install "python2-congressclient" \
+ --upload puppet-congress.tar.gz:/etc/puppet/modules/ \
+ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-congress.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 c1d7c3ab..9873c177 100755
--- a/build/undercloud.sh
+++ b/build/undercloud.sh
@@ -27,6 +27,7 @@ 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 password to python-triploclient
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" \
@@ -37,6 +38,11 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--run-command "cp /usr/share/instack-undercloud/undercloud.conf.sample /home/stack/undercloud.conf && chown stack:stack /home/stack/undercloud.conf" \
--upload ../opnfv-environment.yaml:/home/stack/ \
--upload ../virtual-environment.yaml:/home/stack/ \
+ --install "python2-congressclient" \
+ --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" \
+ --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" \
-a undercloud_build.qcow2
# Add custom IPA to allow kernel params
diff --git a/build/variables.sh b/build/variables.sh
index a00c5b0d..ccd1add5 100644
--- a/build/variables.sh
+++ b/build/variables.sh
@@ -13,7 +13,7 @@ onos_release_uri=https://downloads.onosproject.org/nightly/
onos_release_file=onos-1.6.0-rc2.tar.gz
onos_jdk_uri=https://www.dropbox.com/s/qyujpib8zyhzeev
onos_ovs_uri=https://www.dropbox.com/s/gm6o6k80l56pf0o
-
+openstack_congress=https://radez.fedorapeople.org/openstack-congress-2016.1-1.fc24.noarch.rpm
dpdk_uri_base=http://artifacts.opnfv.org/ovsnfv
dpdk_rpms=(
diff --git a/ci/deploy.sh b/ci/deploy.sh
index e5d47bec..2b1de1d9 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -1102,6 +1102,15 @@ swift_endpoint_id=\$(openstack endpoint list | grep swift | cut -d ' ' -f 2)
openstack endpoint delete \$swift_endpoint_id
openstack service delete \$swift_service_id
+if [ "${deploy_options_array['congress']}" == 'True' ]; then
+ for s in nova neutronv2 ceilometer cinder glancev2 keystone; do
+ openstack congress datasource create \$s "\$s" \\
+ --config username=\$OS_USERNAME \\
+ --config tenant_name=\$OS_TENANT_NAME \\
+ --config password=\$OS_PASSWORD \\
+ --config auth_url=\$OS_AUTH_URL
+ done
+fi
EOI
echo -e "${blue}INFO: Checking if OVS bridges have IP addresses...${reset}"