7 files changed, 31 insertions, 16 deletions
diff --git a/build/Makefile b/build/Makefile
index 7b392d21..fb0d0c32 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -133,6 +133,7 @@ python-pep8-check:
 $(BUILD_DIR)/openstack-tacker.tar.gz:
 	@echo "Preparing the Tacker RPM prerequisites"
 	git clone $(TACKER_REPO) -b $(TACKER_BRANCH) $(BUILD_DIR)/openstack-tacker-2016.2
+	cp rpm_specs/openstack-tacker-server.service $(BUILD_DIR)/openstack-tacker-2016.2
 	tar czf $(BUILD_DIR)/openstack-tacker.tar.gz -C $(BUILD_DIR) openstack-tacker-2016.2
 
 .PHONY: tacker-rpm
diff --git a/build/csit-environment.yaml b/build/csit-environment.yaml
index 5e473525..d9833218 100644
--- a/build/csit-environment.yaml
+++ b/build/csit-environment.yaml
@@ -28,10 +28,6 @@ parameter_defaults:
     nova::api::default_floating_pool: 'external'
   ControllerServices:
     - OS::TripleO::Services::CACerts
-    - OS::TripleO::Services::CinderApi
-    - OS::TripleO::Services::CinderBackup
-    - OS::TripleO::Services::CinderScheduler
-    - OS::TripleO::Services::CinderVolume
     - OS::TripleO::Services::Core
     - OS::TripleO::Services::Kernel
     - OS::TripleO::Services::Keystone
diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml
index ea14ef55..7e0f8017 100644
--- a/build/opnfv-environment.yaml
+++ b/build/opnfv-environment.yaml
@@ -105,6 +105,7 @@ parameter_defaults:
     - OS::TripleO::Services::VipHosts
     - OS::TripleO::Services::Etcd
     - OS::TripleO::Services::Gluon
+    - OS::TripleO::Services::Tacker
   ComputeServices:
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::CephClient
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 59f67fe8..db695daf 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -66,7 +66,7 @@ tar czf vsperf.tar.gz vsperf
 rm -rf puppet-tacker
 git clone https://github.com/openstack/puppet-tacker
 pushd puppet-tacker > /dev/null
-git archive --format=tar.gz --prefix=tacker/ HEAD > ${BUILD_DIR}/puppet-tacker.tar.gz
+git archive --format=tar.gz --prefix=tacker/ origin/stable/ocata > ${BUILD_DIR}/puppet-tacker.tar.gz
 popd > /dev/null
 
 # Master FD.IO Repo
diff --git a/build/rpm_specs/openstack-tacker-server.service b/build/rpm_specs/openstack-tacker-server.service
new file mode 100644
index 00000000..9bf16cd5
--- /dev/null
+++ b/build/rpm_specs/openstack-tacker-server.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=OpenStack Tacker Server
+After=syslog.target network.target
+
+[Service]
+Type=simple
+User=tacker
+ExecStart=/usr/bin/openstack-tacker-server --config-file /usr/share/tacker/tacker-dist.conf --config-file /etc/tacker/tacker.conf --log-file /var/log/tacker/tacker.log
+PrivateTmp=true
+NotifyAccess=all
+KillMode=process
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/build/rpm_specs/openstack-tacker.spec b/build/rpm_specs/openstack-tacker.spec
index 7ed5cbdb..0ec4d518 100644
--- a/build/rpm_specs/openstack-tacker.spec
+++ b/build/rpm_specs/openstack-tacker.spec
@@ -31,7 +31,12 @@ rm requirements.txt
 rm -rf %{buildroot}/usr/lib/python2.7/site-packages/tacker/tests
 # Move config files from /usr/etc/ to /etc
 mv %{buildroot}/usr/etc %{buildroot}
-#install -p -D -m 644 apex/systemd/openstack-tacker.service %{buildroot}%{_unitdir}/openstack-tacker.service
+#remove init script
+rm -fr %{buildroot}/etc/init.d
+
+# Install systemd script
+install -p -D -m 644 openstack-tacker-server.service %{buildroot}%{_unitdir}/openstack-tacker-server.service
+
 # Remove egg-info
 rm -rf %{buildroot}/usr/lib/python2.7/site-packages/*egg-info
 
@@ -47,22 +52,22 @@ fi
 exit 0
 
 %post
-%systemd_post openstack-tacker
+%systemd_post openstack-tacker-server
 
 %preun
-%systemd_preun openstack-tacker
+%systemd_preun openstack-tacker-server
 
 %postun
-%systemd_postun_with_restart openstack-tacker
+%systemd_postun_with_restart openstack-tacker-server
 
 %files
 /usr/bin/tacker-server
 /usr/bin/tacker-db-manage
 /usr/bin/tacker-rootwrap
-#%{_unitdir}/openstack-tacker.service
+%{_unitdir}/openstack-tacker-server.service
 /usr/lib/python2.7/site-packages/tacker/*
+
 #%config(noreplace) %attr(-, root, tacker) %{_sysconfdir}/tacker/tacker.conf`
-%{_sysconfdir}/init.d/tacker-server
 %{_sysconfdir}/rootwrap.d/tacker.filters
 %{_sysconfdir}/tacker/api-paste.ini
 %{_sysconfdir}/tacker/policy.json
diff --git a/build/undercloud.sh b/build/undercloud.sh
index e7f4c07b..b27b9108 100755
--- a/build/undercloud.sh
+++ b/build/undercloud.sh
@@ -34,7 +34,7 @@ python3 -c 'import py_compile; py_compile.compile("image.py", cfile="image.pyc")
 # seeding configuration files specific to OPNFV
 # add congress client
 # add congress password to python-tripleoclient
-# add tacker password to python-tripleoclient
+# add tacker password to tripleo-common
 # upload tacker repo and install the client package
 # Add performance image scripts
 # hack for disabling undercloud package update
@@ -58,10 +58,7 @@ 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: 8888 },' /usr/lib/python2.7/site-packages/os_cloud_config/keystone.py" \
+    --run-command "sed -i '/SwiftPassword/a\    \x27TackerPassword\x27,' /usr/lib/python2.7/site-packages/tripleo_common/constants.py" \
     --upload ${BUILD_DIR}/noarch/$tackerclient_pkg:/root/ \
     --install /root/$tackerclient_pkg \
     --install "python2-aodhclient" \