adding tackerclient to the build

JIRA: APEX-235

Change-Id: Ie3ead17f1f82bc74dc38413bb4a3118fbcb82e9c
Signed-off-by: Dan Radez <dradez@redhat.com>

diff --git a/build/Makefile b/build/Makefile
index 91b1fc5..0d7cba2 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -100,12 +100,34 @@ openstack-tacker.tar.gz:
        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
+tacker-rpm: openstack-tacker.tar.gz openstack-tacker-2015.2-1.trozet.noarch.rpm
 
-openstack-tacker-2015.2-1.noarch.rpm:
+openstack-tacker-2015.2-1.trozet.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`)'
 
+#################
+#  TACKERCLIENT #
+#################
+
+.PHONY: tackerclient-clean
+
+tackerclient-clean:
+       @rm -rf python-tackerclient-2015.2
+       @rm -f python-tackerclient.tar.gz
+
+python-tackerclient.tar.gz:
+       @echo "Preparing the TackerClient RPM prerequisites"
+       git clone http://github.com/trozet/python-tackerclient -b SFC_refactor python-tackerclient-2015.2
+       tar czf python-tackerclient.tar.gz python-tackerclient-2015.2
+
+.PHONY: tackerclient-rpm
+tackerclient-rpm: python-tackerclient.tar.gz python-tackerclient-2015.2-1.trozet.noarch.rpm
+
+python-tackerclient-2015.2-1.trozet.noarch.rpm:
+       @echo "Building the TackerClient RPM"
+       rpmbuild --clean -bb --target noarch python-tackerclient.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`)'
+
 ###############
 #  CONGRESS   #
 ###############
@@ -167,7 +189,7 @@ undercloud-clean:
 .PHONY: undercloud
 undercloud: images/undercloud.qcow2
 
-images/undercloud.qcow2:
+images/undercloud.qcow2: tackerclient-rpm
        @echo "Building the Apex Undercloud Image"
        @./undercloud.sh
 
@@ -201,7 +223,7 @@ overcloud-full-clean:
 .PHONY: overcloud-full
 overcloud-full: images/overcloud-full.qcow2
 
-images/overcloud-full.qcow2: tacker-rpm congress-rpm vpp-build
+images/overcloud-full.qcow2: tacker-rpm tackerclient-rpm congress-rpm vpp-build
        @echo "Building the Apex Base Overcloud Image"
        @./overcloud-full.sh
 

diff --git a/build/openstack-tacker.spec b/build/openstack-tacker.spec
index ca5ccd9..b4c9ada 100644 (file)
--- a/build/openstack-tacker.spec
+++ b/build/openstack-tacker.spec
@@ -2,7 +2,7 @@
 
 Name:   openstack-tacker
 Version:  2015.2
-Release:  1
+Release:  1.trozet
 Summary:  OpenStack servicevm/device manager
 
 Group:    Applications/Internet

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 636ac59..98a0477 100755 (executable)
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -66,14 +66,6 @@ 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
@@ -104,7 +96,6 @@ popd > /dev/null
 # 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 \
@@ -137,10 +128,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 "python-tackerclient" \
-    --upload ../noarch/openstack-tacker-2015.2-1.noarch.rpm:/root/ \
-    --install /root/openstack-tacker-2015.2-1.noarch.rpm \
+    --upload ../noarch/python-tackerclient-2015.2-1.trozet.noarch.rpm:/root/ \
+    --install /root/python-tackerclient-2015.2-1.trozet.noarch.rpm \
+    --upload ../noarch/openstack-tacker-2015.2-1.trozet.noarch.rpm:/root/ \
+    --install /root/openstack-tacker-2015.2-1.trozet.noarch.rpm \
     --upload puppet-tacker.tar.gz:/etc/puppet/modules/ \
     --run-command "cd /etc/puppet/modules/ && tar xzf puppet-tacker.tar.gz" \
     --run-command "yum install -y https://dl.dropboxusercontent.com/u/7079970/rabbitmq-server-3.6.3-5.el7ost.noarch.rpm" \

diff --git a/build/python-tackerclient.spec b/build/python-tackerclient.spec
new file mode 100644 (file)
index 0000000..72cbf62
--- /dev/null
+++ b/build/python-tackerclient.spec
@@ -0,0 +1,40 @@
+%define debug_package %{nil}
+
+Name:          python-tackerclient
+Version:       2015.2
+Release:       1.trozet
+Summary:       CLI and Client Library for OpenStack Networking
+
+Group:         Applications/Internet
+License:       Apache 2.0
+URL:           https://wiki.openstack.org/wiki/Tacker/Installation
+Source0:       python-tackerclient.tar.gz
+
+BuildArch:     noarch
+BuildRequires: python-setuptools
+#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
+CLI and Client Library for OpenStack Networking
+
+%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
+#rm -rf %{buildroot}/usr/lib/python2.7/site-packages/tacker/tests
+
+
+%files
+/bin/tacker
+/usr/lib/python2.7/site-packages/tackerclient/*
+/usr/lib/python2.7/site-packages/python_tackerclient-*
+
+%changelog
+

diff --git a/build/undercloud.sh b/build/undercloud.sh
index 75aa265..10c46e7 100755 (executable)
--- a/build/undercloud.sh
+++ b/build/undercloud.sh
@@ -22,14 +22,6 @@ 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
@@ -59,9 +51,9 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --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" \
-    --upload /tmp/tacker.repo:/etc/yum.repos.d/ \
-    --install "python-tackerclient" \
+    --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 ../noarch/python-tackerclient-2015.2-1.trozet.noarch.rpm:/root/ \
+    --install /root/python-tackerclient-2015.2-1.trozet.noarch.rpm \
     --install "python2-aodhclient" \
     --install "openstack-heat-engine" \
     --install "openstack-heat-api-cfn" \