From fb5885ab7cc0ab76a0bcc5c4e8fc3ba1d10e34ae Mon Sep 17 00:00:00 2001
From: Tim Rozet <trozet@redhat.com>
Date: Fri, 26 May 2017 15:16:23 -0400
Subject: Fix tacker not starting correctly

JIRA: APEX-446

Change-Id: I69fecfa8dae111cc53d83e701ce913de80de94ef
Signed-off-by: Tim Rozet <trozet@redhat.com>
---
 build/overcloud-full.sh                         | 16 ++++++++++++++++
 build/rpm_specs/openstack-tacker-server.service |  2 +-
 build/rpm_specs/openstack-tacker.spec           |  4 +---
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index fe00c9f7..e1c58001 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -85,6 +85,16 @@ for package in ${fdio_pkgs[@]}; do
   fdio_pkg_str+=" --upload ${BUILD_DIR}/${package##*/}:/root/fdio/"
 done
 
+# tosca parser
+rm -rf tosca-parser
+git clone https://github.com/openstack/tosca-parser
+tar czf tosca-parser.tar.gz tosca-parser
+
+# heat translator
+rm -rf heat-translator
+git clone https://github.com/openstack/heat-translator
+tar czf heat-translator.tar.gz heat-translator
+
 # Increase disk size by 900MB to accommodate more packages
 qemu-img resize overcloud-full_build.qcow2 +900MB
 
@@ -139,6 +149,12 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --install /root/$tacker_pkg \
     --upload ${BUILD_DIR}/noarch/$tackerclient_pkg:/root/ \
     --install /root/$tackerclient_pkg \
+    --upload ${BUILD_DIR}/tosca-parser.tar.gz:/root/ \
+    --run-command "cd /root/ && tar xzf tosca-parser.tar.gz" \
+    --run-command "cd /root/tosca-parser && python setup.py build && python setup.py install" \
+    --upload ${BUILD_DIR}/heat-translator.tar.gz:/root/ \
+    --run-command "cd /root/ && tar xzf heat-translator.tar.gz" \
+    --run-command "cd /root/heat-translator && python setup.py build && python setup.py install" \
     --upload ${BUILD_DIR}/puppet-ovn.tar.gz:/etc/puppet/modules/ \
     --run-command "cd /etc/puppet/modules/ && rm -fr ovn && tar xzf puppet-ovn.tar.gz" \
     --run-command "curl -f https://copr.fedorainfracloud.org/coprs/leifmadsen/ovs-master/repo/epel-7/leifmadsen-ovs-master-epel-7.repo > /etc/yum.repos.d/leifmadsen-ovs-master-epel-7.repo" \
diff --git a/build/rpm_specs/openstack-tacker-server.service b/build/rpm_specs/openstack-tacker-server.service
index 9bf16cd5..44191f70 100644
--- a/build/rpm_specs/openstack-tacker-server.service
+++ b/build/rpm_specs/openstack-tacker-server.service
@@ -5,7 +5,7 @@ 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
+ExecStart=/usr/bin/tacker-server --config-file /etc/tacker/tacker.conf --log-file /var/log/tacker/tacker.log
 PrivateTmp=true
 NotifyAccess=all
 KillMode=process
diff --git a/build/rpm_specs/openstack-tacker.spec b/build/rpm_specs/openstack-tacker.spec
index 0ec4d518..64761a50 100644
--- a/build/rpm_specs/openstack-tacker.spec
+++ b/build/rpm_specs/openstack-tacker.spec
@@ -37,9 +37,6 @@ 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
-
 install -d -m 755 %{buildroot}%{_localstatedir}/cache/tacker
 install -d -m 755 %{buildroot}%{_sharedstatedir}/tacker
 install -d -m 755 %{buildroot}%{_localstatedir}/log/tacker
@@ -66,6 +63,7 @@ exit 0
 /usr/bin/tacker-rootwrap
 %{_unitdir}/openstack-tacker-server.service
 /usr/lib/python2.7/site-packages/tacker/*
+/usr/lib/python2.7/site-packages/tacker-*.egg-info
 
 #%config(noreplace) %attr(-, root, tacker) %{_sysconfdir}/tacker/tacker.conf`
 %{_sysconfdir}/rootwrap.d/tacker.filters
-- 
cgit 1.2.3-korg