20 files changed, 122 insertions, 23 deletions
diff --git a/build/Makefile b/build/Makefile
index 84305618..a1089a84 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -27,7 +27,7 @@ all_networks="admin_network private_network storage_network external_network api
 all: iso
 
 .PHONY: clean
-clean: images-clean rpms-clean iso-clean
+clean: images-clean rpms-clean iso-clean tacker-clean
 
 .PHONY: images
 images: undercloud overcloud-full overcloud-opendaylight overcloud-onos overcloud-opendaylight-sfc
@@ -85,6 +85,28 @@ python-pep8-check:
 	pep8 ../tests
 
 ###############
+#  TACKER     #
+###############
+
+.PHONY: tacker-clean
+
+tacker-clean:
+	@rm -rf openstack-tacker-2015.2
+	@rm -f openstack-tacker.tar.gz
+
+openstack-tacker.tar.gz:
+	@echo "Preparing the Tacker RPM prerequisites"
+	git clone http://github.com/trozet/tacker -b SFC_colorado openstack-tacker-2015.2
+	tar czf openstack-tacker.tar.gz openstack-tacker-2015.2
+
+.PHONY: tacker-rpm
+tacker-rpm: openstack-tacker.tar.gz openstack-tacker-2015.2-1.noarch.rpm
+
+openstack-tacker-2015.2-1.noarch.rpm:
+	@echo "Building the Tacker RPM"
+	rpmbuild --clean -bb --target noarch openstack-tacker.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)'
+
+###############
 #  UNDERCLOUD #
 ###############
 
@@ -129,7 +151,7 @@ overcloud-full-clean:
 .PHONY: overcloud-full
 overcloud-full: images/overcloud-full.qcow2
 
-images/overcloud-full.qcow2:
+images/overcloud-full.qcow2: tacker-rpm
 	@echo "Building the Apex Base Overcloud Image"
 	@./overcloud-full.sh
 
diff --git a/build/openstack-tacker.spec b/build/openstack-tacker.spec
new file mode 100644
index 00000000..ca5ccd9a
--- /dev/null
+++ b/build/openstack-tacker.spec
@@ -0,0 +1,74 @@
+%define debug_package %{nil}
+
+Name:   openstack-tacker
+Version:  2015.2
+Release:  1
+Summary:  OpenStack servicevm/device manager
+
+Group:    Applications/Internet
+License:  Apache 2.0
+URL:    https://wiki.openstack.org/wiki/Tacker/Installation
+Source0:  openstack-tacker.tar.gz
+
+BuildArch:  noarch
+BuildRequires:  python-setuptools
+#Requires:  pbr>=0.8 Paste PasteDeploy>=1.5.0 Routes>=1.12.3!=2.0 anyjson>=0.3.3 argparse
+#Requires:  Babel>=1.3 eventlet>=0.16.1!=0.17.0 greenlet>=0.3.2 httplib2>=0.7.5 requests>=2.2.0!=2.4.0
+#Requires:  iso8601>=0.1.9 kombu>=2.5.0 netaddr>=0.7.12 SQLAlchemy<1.1.0>=0.9.7
+#Requires:  WebOb>=1.2.3 python-heatclient>=0.3.0 python-keystoneclient>=1.1.0 alembic>=0.7.2 six>=1.9.0
+#Requires:  stevedore>=1.5.0 http oslo.config>=1.11.0 oslo.messaging!=1.17.0!=1.17.1>=1.16.0 oslo.rootwrap>=2.0.0 python-novaclient>=2.22.0 
+
+%description
+OpenStack servicevm/device manager
+
+%prep
+%setup -q
+
+
+%build
+rm requirements.txt
+#/usr/bin/python setup.py build
+
+
+%install
+/usr/bin/python setup.py install --prefix=%{buildroot} --install-lib=%{buildroot}/usr/lib/python2.7/site-packages
+#remove tests
+rm -rf %{buildroot}/usr/lib/python2.7/site-packages/tacker/tests
+
+install -p -D -m 644 apex/systemd/openstack-tacker.service %{buildroot}%{_unitdir}/openstack-tacker.service
+
+install -d -m 755 %{buildroot}%{_localstatedir}/cache/tacker
+install -d -m 755 %{buildroot}%{_sharedstatedir}/tacker
+install -d -m 755 %{buildroot}%{_localstatedir}/log/tacker
+
+%pre
+getent group tacker >/dev/null || groupadd -r tacker
+if ! getent passwd tacker >/dev/null; then
+  useradd -r -g tacker -G tacker,nobody -d %{_sharedstatedir}/tacker -s /sbin/nologin -c "OpenStack Tacker Daemon" tacker
+fi
+exit 0
+
+%post
+%systemd_post openstack-tacker
+
+%preun
+%systemd_preun openstack-tacker
+
+%postun
+%systemd_postun_with_restart openstack-tacker
+
+%files
+/bin/tacker-server
+/bin/tacker-db-manage
+/bin/tacker-rootwrap
+/etc/init.d/tacker-server
+%{_unitdir}/openstack-tacker.service
+/etc/rootwrap.d/servicevm.filters
+%config(noreplace) %attr(-, root, tacker) %{_sysconfdir}/tacker/*
+/usr/lib/python2.7/site-packages/tacker/*
+/usr/lib/python2.7/site-packages/tacker-*
+%dir %attr(0750, tacker, root) %{_localstatedir}/cache/tacker
+%dir %attr(0750, tacker, root) %{_sharedstatedir}/tacker
+%dir %attr(0750, tacker, root) %{_localstatedir}/log/tacker
+
+%changelog
diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml
index 3d246bd6..4f9fd986 100644
--- a/build/opnfv-environment.yaml
+++ b/build/opnfv-environment.yaml
@@ -8,7 +8,7 @@ parameters:
   ControllerEnableSwiftStorage: false
 #  CloudDomain:
   EnableSahara: false
-  EnableTacker: false
+  EnableTacker: true
   ExtraConfig:
     tripleo::ringbuilder::build_ring: False
     nova::nova_public_key:
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 7eb22d1d..2c522943 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -53,7 +53,7 @@ done
 
 # tar up the congress puppet module
 rm -rf puppet-congress
-git clone https://github.com/radez/puppet-congress
+git clone -b stable/mitaka 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
@@ -89,7 +89,8 @@ tar czf vsperf.tar.gz vsperf
 
 # tar up the tacker puppet module
 rm -rf puppet-tacker
-git clone https://github.com/radez/puppet-tacker
+# TODO move this back to radez puppet-tacker after PR is accepted
+git clone -b fix_db_sync https://github.com/trozet/puppet-tacker
 pushd puppet-tacker > /dev/null
 git archive --format=tar.gz --prefix=tacker/ HEAD > ../puppet-tacker.tar.gz
 popd > /dev/null
@@ -133,7 +134,9 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --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" \
+    --install "python-tackerclient" \
+    --upload ../noarch/openstack-tacker-2015.2-1.noarch.rpm:/root/ \
+    --install /root/openstack-tacker-2015.2-1.noarch.rpm \
     --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
diff --git a/config/deploy/os-nosdn-nofeature-ha.yaml b/config/deploy/os-nosdn-nofeature-ha.yaml
index 6e85fa20..286b5162 100644
--- a/config/deploy/os-nosdn-nofeature-ha.yaml
+++ b/config/deploy/os-nosdn-nofeature-ha.yaml
@@ -5,6 +5,6 @@ deploy_options:
   sdn_controller: false
   sdn_l3: false
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false
diff --git a/config/deploy/os-nosdn-nofeature-noha.yaml b/config/deploy/os-nosdn-nofeature-noha.yaml
index cfdc5dd3..2d1b44ad 100644
--- a/config/deploy/os-nosdn-nofeature-noha.yaml
+++ b/config/deploy/os-nosdn-nofeature-noha.yaml
@@ -5,6 +5,6 @@ deploy_options:
   sdn_controller: false
   sdn_l3: false
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false
diff --git a/config/deploy/os-nosdn-ovs-ha.yaml b/config/deploy/os-nosdn-ovs-ha.yaml
index 739b3e3d..11b093f0 100644
--- a/config/deploy/os-nosdn-ovs-ha.yaml
+++ b/config/deploy/os-nosdn-ovs-ha.yaml
@@ -5,7 +5,7 @@ deploy_options:
   sdn_controller: false
   sdn_l3: false
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false
   dataplane: ovs_dpdk
diff --git a/config/deploy/os-nosdn-ovs-noha.yaml b/config/deploy/os-nosdn-ovs-noha.yaml
index 9cb783d3..3082dcb4 100644
--- a/config/deploy/os-nosdn-ovs-noha.yaml
+++ b/config/deploy/os-nosdn-ovs-noha.yaml
@@ -5,7 +5,7 @@ deploy_options:
   sdn_controller: false
   sdn_l3: false
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false
   dataplane: ovs_dpdk
diff --git a/config/deploy/os-nosdn-performance-ha.yaml b/config/deploy/os-nosdn-performance-ha.yaml
index c975e24d..acbc1d34 100644
--- a/config/deploy/os-nosdn-performance-ha.yaml
+++ b/config/deploy/os-nosdn-performance-ha.yaml
@@ -5,7 +5,7 @@ deploy_options:
   sdn_controller: false
   sdn_l3: false
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false
   vsperf: false
diff --git a/config/deploy/os-ocl-nofeature-ha.yaml b/config/deploy/os-ocl-nofeature-ha.yaml
index 710a0be9..4ad1ee2b 100644
--- a/config/deploy/os-ocl-nofeature-ha.yaml
+++ b/config/deploy/os-ocl-nofeature-ha.yaml
@@ -5,6 +5,6 @@ deploy_options:
   sdn_controller: opencontrail
   sdn_l3: false
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false
diff --git a/config/deploy/os-odl_l2-bgpvpn-ha.yaml b/config/deploy/os-odl_l2-bgpvpn-ha.yaml
index 73507772..1d29c2bf 100644
--- a/config/deploy/os-odl_l2-bgpvpn-ha.yaml
+++ b/config/deploy/os-odl_l2-bgpvpn-ha.yaml
@@ -5,6 +5,6 @@ deploy_options:
   sdn_controller: opendaylight
   sdn_l3: false
   tacker: false
-  congress: false
+  congress: true
   sfc: false
   vpn: true
diff --git a/config/deploy/os-odl_l2-fdio-ha.yaml b/config/deploy/os-odl_l2-fdio-ha.yaml
index e0f26696..b6b073fc 100644
--- a/config/deploy/os-odl_l2-fdio-ha.yaml
+++ b/config/deploy/os-odl_l2-fdio-ha.yaml
@@ -6,7 +6,7 @@ deploy_options:
   sdn_l3: false
   odl_version: boron
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false
   vpp: true
diff --git a/config/deploy/os-odl_l2-fdio-noha.yaml b/config/deploy/os-odl_l2-fdio-noha.yaml
index 9fc896b5..f323e2cd 100644
--- a/config/deploy/os-odl_l2-fdio-noha.yaml
+++ b/config/deploy/os-odl_l2-fdio-noha.yaml
@@ -6,7 +6,7 @@ deploy_options:
   sdn_l3: false
   odl_version: boron
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false
   vpp: true
diff --git a/config/deploy/os-odl_l2-nofeature-ha.yaml b/config/deploy/os-odl_l2-nofeature-ha.yaml
index e614fd49..4c88eeb3 100644
--- a/config/deploy/os-odl_l2-nofeature-ha.yaml
+++ b/config/deploy/os-odl_l2-nofeature-ha.yaml
@@ -6,6 +6,6 @@ deploy_options:
   sdn_l3: false
   odl_version: beryllium
   tacker: true
-  congress: false
+  congress: true
   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 ca35a0fe..f6904f05 100644
--- a/config/deploy/os-odl_l2-sdnvpn-ha.yaml
+++ b/config/deploy/os-odl_l2-sdnvpn-ha.yaml
@@ -5,6 +5,6 @@ deploy_options:
   sdn_controller: opendaylight
   sdn_l3: false
   tacker: true
-  congress: false
+  congress: true
   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 e8f3f986..fa9a7868 100644
--- a/config/deploy/os-odl_l2-sfc-noha.yaml
+++ b/config/deploy/os-odl_l2-sfc-noha.yaml
@@ -6,6 +6,6 @@ deploy_options:
   sdn_l3: false
   odl_version: boron
   tacker: true
-  congress: false
+  congress: true
   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 47650459..e54f28b0 100644
--- a/config/deploy/os-odl_l3-nofeature-ha.yaml
+++ b/config/deploy/os-odl_l3-nofeature-ha.yaml
@@ -5,6 +5,6 @@ deploy_options:
   sdn_controller: opendaylight
   sdn_l3: true
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false
diff --git a/config/deploy/os-onos-nofeature-ha.yaml b/config/deploy/os-onos-nofeature-ha.yaml
index 1de52298..0d083dda 100644
--- a/config/deploy/os-onos-nofeature-ha.yaml
+++ b/config/deploy/os-onos-nofeature-ha.yaml
@@ -5,6 +5,6 @@ deploy_options:
   sdn_controller: onos
   sdn_l3: true
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false
diff --git a/config/deploy/os-onos-sfc-ha.yaml b/config/deploy/os-onos-sfc-ha.yaml
index e0c8d9e8..f0b78511 100644
--- a/config/deploy/os-onos-sfc-ha.yaml
+++ b/config/deploy/os-onos-sfc-ha.yaml
@@ -5,6 +5,6 @@ deploy_options:
   sdn_controller: onos
   sdn_l3: true
   tacker: true
-  congress: false
+  congress: true
   sfc: true
   vpn: false
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 75c53149..1fcaa0df 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -199,8 +199,8 @@ 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
+if [ "${deploy_options_array['tacker']}" == 'False' ]; then
+    sed -i '/EnableTacker:/c\  EnableTacker: false' opnfv-environment.yaml
 fi
 
 # Create a key for use by nova for live migration