Merge "Adding tacker support"

21 files changed, 63 insertions, 15 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
diff --git a/config/deploy/deploy_settings.yaml b/config/deploy/deploy_settings.yaml
index 8292dee5..82cc0811 100644
--- a/config/deploy/deploy_settings.yaml
+++ b/config/deploy/deploy_settings.yaml
@@ -4,7 +4,7 @@ global_params:
 deploy_options:
   sdn_controller: opendaylight
   sdn_l3: false
-  tacker: false
+  tacker: true
   congress: false
   sfc: false
   vpn: false
diff --git a/config/deploy/os-nosdn-nofeature-ha.yaml b/config/deploy/os-nosdn-nofeature-ha.yaml
index 0313f9c1..6e85fa20 100644
--- a/config/deploy/os-nosdn-nofeature-ha.yaml
+++ b/config/deploy/os-nosdn-nofeature-ha.yaml
@@ -4,7 +4,7 @@ global_params:
 deploy_options:
   sdn_controller: false
   sdn_l3: false
-  tacker: false
+  tacker: true
   congress: false
   sfc: false
   vpn: false
diff --git a/config/deploy/os-nosdn-nofeature-noha.yaml b/config/deploy/os-nosdn-nofeature-noha.yaml
index 9bda3e8e..cfdc5dd3 100644
--- a/config/deploy/os-nosdn-nofeature-noha.yaml
+++ b/config/deploy/os-nosdn-nofeature-noha.yaml
@@ -4,7 +4,7 @@ global_params:
 deploy_options:
   sdn_controller: false
   sdn_l3: false
-  tacker: false
+  tacker: true
   congress: false
   sfc: false
   vpn: false
diff --git a/config/deploy/os-nosdn-ovs-ha.yaml b/config/deploy/os-nosdn-ovs-ha.yaml
index b1715869..739b3e3d 100644
--- a/config/deploy/os-nosdn-ovs-ha.yaml
+++ b/config/deploy/os-nosdn-ovs-ha.yaml
@@ -4,7 +4,7 @@ global_params:
 deploy_options:
   sdn_controller: false
   sdn_l3: false
-  tacker: false
+  tacker: true
   congress: false
   sfc: false
   vpn: false
diff --git a/config/deploy/os-nosdn-ovs-noha.yaml b/config/deploy/os-nosdn-ovs-noha.yaml
index ea6b4e0e..9cb783d3 100644
--- a/config/deploy/os-nosdn-ovs-noha.yaml
+++ b/config/deploy/os-nosdn-ovs-noha.yaml
@@ -4,7 +4,7 @@ global_params:
 deploy_options:
   sdn_controller: false
   sdn_l3: false
-  tacker: false
+  tacker: true
   congress: false
   sfc: false
   vpn: false
diff --git a/config/deploy/os-nosdn-performance-ha.yaml b/config/deploy/os-nosdn-performance-ha.yaml
index 9bbbdd2b..c975e24d 100644
--- a/config/deploy/os-nosdn-performance-ha.yaml
+++ b/config/deploy/os-nosdn-performance-ha.yaml
@@ -4,7 +4,7 @@ global_params:
 deploy_options:
   sdn_controller: false
   sdn_l3: false
-  tacker: false
+  tacker: true
   congress: false
   sfc: false
   vpn: false
diff --git a/config/deploy/os-ocl-nofeature-ha.yaml b/config/deploy/os-ocl-nofeature-ha.yaml
index f01a8a92..710a0be9 100644
--- a/config/deploy/os-ocl-nofeature-ha.yaml
+++ b/config/deploy/os-ocl-nofeature-ha.yaml
@@ -4,7 +4,7 @@ global_params:
 deploy_options:
   sdn_controller: opencontrail
   sdn_l3: false
-  tacker: false
+  tacker: true
   congress: false
   sfc: false
   vpn: false
diff --git a/config/deploy/os-odl_l2-fdio-ha.yaml b/config/deploy/os-odl_l2-fdio-ha.yaml
index b258c653..e0f26696 100644
--- a/config/deploy/os-odl_l2-fdio-ha.yaml
+++ b/config/deploy/os-odl_l2-fdio-ha.yaml
@@ -5,7 +5,7 @@ deploy_options:
   sdn_controller: opendaylight
   sdn_l3: false
   odl_version: boron
-  tacker: false
+  tacker: true
   congress: false
   sfc: false
   vpn: false
diff --git a/config/deploy/os-odl_l2-fdio-noha.yaml b/config/deploy/os-odl_l2-fdio-noha.yaml
index 52e312e3..9fc896b5 100644
--- a/config/deploy/os-odl_l2-fdio-noha.yaml
+++ b/config/deploy/os-odl_l2-fdio-noha.yaml
@@ -5,7 +5,7 @@ deploy_options:
   sdn_controller: opendaylight
   sdn_l3: false
   odl_version: boron
-  tacker: false
+  tacker: true
   congress: false
   sfc: false
   vpn: false
diff --git a/config/deploy/os-odl_l2-nofeature-ha.yaml b/config/deploy/os-odl_l2-nofeature-ha.yaml
index b35da150..e614fd49 100644
--- a/config/deploy/os-odl_l2-nofeature-ha.yaml
+++ b/config/deploy/os-odl_l2-nofeature-ha.yaml
@@ -5,7 +5,7 @@ deploy_options:
   sdn_controller: opendaylight
   sdn_l3: false
   odl_version: beryllium
-  tacker: false
+  tacker: true
   congress: false
   sfc: false
   vpn: false
diff --git a/config/deploy/os-odl_l2-sdnvpn-ha.yaml b/config/deploy/os-odl_l2-sdnvpn-ha.yaml
index 73507772..ca35a0fe 100644
--- a/config/deploy/os-odl_l2-sdnvpn-ha.yaml
+++ b/config/deploy/os-odl_l2-sdnvpn-ha.yaml
@@ -4,7 +4,7 @@ global_params:
 deploy_options:
   sdn_controller: opendaylight
   sdn_l3: false
-  tacker: false
+  tacker: true
   congress: false
   sfc: false
   vpn: true
diff --git a/config/deploy/os-odl_l2-sfc-noha.yaml b/config/deploy/os-odl_l2-sfc-noha.yaml
index 106fbca9..e8f3f986 100644
--- a/config/deploy/os-odl_l2-sfc-noha.yaml
+++ b/config/deploy/os-odl_l2-sfc-noha.yaml
@@ -5,7 +5,7 @@ deploy_options:
   sdn_controller: opendaylight
   sdn_l3: false
   odl_version: boron
-  tacker: false
+  tacker: true
   congress: false
   sfc: true
   vpn: false
diff --git a/config/deploy/os-odl_l3-nofeature-ha.yaml b/config/deploy/os-odl_l3-nofeature-ha.yaml
index 69ab5e7e..47650459 100644
--- a/config/deploy/os-odl_l3-nofeature-ha.yaml
+++ b/config/deploy/os-odl_l3-nofeature-ha.yaml
@@ -4,7 +4,7 @@ global_params:
 deploy_options:
   sdn_controller: opendaylight
   sdn_l3: true
-  tacker: false
+  tacker: true
   congress: false
   sfc: false
   vpn: false
diff --git a/config/deploy/os-onos-nofeature-ha.yaml b/config/deploy/os-onos-nofeature-ha.yaml
index 7f56fbc0..1de52298 100644
--- a/config/deploy/os-onos-nofeature-ha.yaml
+++ b/config/deploy/os-onos-nofeature-ha.yaml
@@ -4,7 +4,7 @@ global_params:
 deploy_options:
   sdn_controller: onos
   sdn_l3: true
-  tacker: false
+  tacker: true
   congress: false
   sfc: false
   vpn: false
diff --git a/config/deploy/os-onos-sfc-ha.yaml b/config/deploy/os-onos-sfc-ha.yaml
index a81023db..e0c8d9e8 100644
--- a/config/deploy/os-onos-sfc-ha.yaml
+++ b/config/deploy/os-onos-sfc-ha.yaml
@@ -4,7 +4,7 @@ global_params:
 deploy_options:
   sdn_controller: onos
   sdn_l3: true
-  tacker: false
+  tacker: true
   congress: false
   sfc: true
   vpn: false
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 0c3f9d44..14c37247 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -199,6 +199,10 @@ if [ "$debug" == 'TRUE' ]; then
     LIBGUESTFS_BACKEND=direct virt-customize -a overcloud-full.qcow2 --root-password password:opnfvapex
 fi
 
+if [ "${deploy_options_array['tacker']}" == 'True' ]; then
+    sed -i '/EnableTacker/\\c  EnableTacker: true' opnfv-environment.yaml
+fi
+
 source stackrc
 set -o errexit
 # Workaround for APEX-207 where sometimes swift proxy is down
diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh
index 8ccd896f..af72d8f9 100755
--- a/lib/post-install-functions.sh
+++ b/lib/post-install-functions.sh
@@ -158,6 +158,11 @@ if [ "$debug" == "TRUE" ]; then
     echo "---------------------------"
     echo "----------END LOG----------"
     echo "---------------------------"
+
+    ssh -T ${SSH_OPTIONS[@]} "heat-admin@\$node" <<EOF
+echo "$node"
+sudo openstack-status
+EOF
 fi
  ssh -T ${SSH_OPTIONS[@]} "heat-admin@\$node" <<EOF
  sudo rm -f /home/heat-admin/messages.log