moving python-neutronclient Make from tools/packaging/third_party to…

… tools/packaging/openstack/centos_64/neutronclient/icehouse

    added python-pbr dependency in neutronclient spec file for icehouse.
    neutronclient new pacakge moved to 3contrail and removed epoch.
    new package is already added in cache
    depends_packages.cfg modified with 3contrail packages.
    manifest files already modified to fetch sources in distro/openstack/ instead of third_party.
    All these changes are for centos_64/65 icehouse

Change-Id: Ib3868cf96406ecee699802b5db7df2990b09071b

build/package_configs/centos64/icehouse/depends_packages.cfg

@@ -661,8 +661,8 @@ file  = python-nose-0.10.4-3.1.el6.noarch.rpm
 md5   = 09ec3f7669fb1e49b671b14298710fbd
 
 [python-neutronclient]
-file  = python-neutronclient-2.3.4-2contrail.noarch.rpm
-md5   = 331104b779bddf8239dc2d392bcf0006 
+file  = python-neutronclient-2.3.4-3contrail.noarch.rpm
+md5   = 0d74883d831235744cffc64196cc8162
 
 [python-paste_1.7.4]
 file  = python-paste-1.7.4-2.el6.noarch.rpm

build/package_configs/centos65/icehouse/depends_packages.cfg

@@ -1525,8 +1525,8 @@ file  = python-neutron-2014.1.1-3.el6.noarch.rpm
 md5   = e0bf2318fc955e25ac2697cbbe883636
 
 [python-neutronclient]
-file  = python-neutronclient-2.3.4-2contrail.noarch.rpm
-md5   = 331104b779bddf8239dc2d392bcf0006
+file  = python-neutronclient-2.3.4-3contrail.noarch.rpm
+md5   = 0d74883d831235744cffc64196cc8162
 
 [python-nose_0.10.4_3.1.el6]
 file  = python-nose-0.10.4-3.1.el6.noarch.rpm

openstack/centos_64/Makefile

@@ -56,6 +56,13 @@ $(LOCAL_PY): $(PPREP)
 		$(LOCAL_PY) $(PKGBLDDIR)/packaging/archives/ez_setup.py; \
 	fi
 
+neutronclient:package-python-neutronclient
+python-neutronclient:package-python-neutronclient
+package-python-neutronclient:
+	@echo making rpm for package-python-neutronclient
+	rpmbuild --define '_topdir $(BUILD_BASE)' --define '_builddir $(DISTRO_BLDDIR)' \
+	-bb neutronclient/${CONTRAIL_SKU}/python-neutronclient.spec $(G_TAG)
+
 # Openstack packages
 ifeq ($(CONTRAIL_SKU), havana)
 nova: package-nova
@@ -102,13 +109,6 @@ contrail-openstack-dashboard: $(PREP)
 	rpmbuild --define '_topdir $(BUILD_BASE)' --define '_builddir $(DASH_PLUGIN_BLDDIR)' \
 	-bb horizon-plugin/havana/openstack-horizon-plugin.spec $(G_TAG)
 
-neutronclient:package-python-neutronclient
-python-neutronclient:package-python-neutronclient
-package-python-neutronclient:
-	@echo making rpm for package-python-neutronclient
-	rpmbuild --define '_topdir $(BUILD_BASE)' --define '_builddir $(DISTRO_BLDDIR)' \
-	-bb neutronclient/havana/python-neutronclient.spec $(G_TAG)
-
 all: $(PREP) package-nova package-neutron horizon contrail-openstack-dashboard
 else
 all: $(PREP)

third_party/python-neutronclient-icehouse.spec → openstack/centos_64/neutronclient/icehouse/python-neutronclient.spec

@@ -1,12 +1,12 @@
 #
 # This is 2.3.4 icehouse
 #
-%define         _relstr      2contrail
+%define         _relstr      3contrail
 %{echo: "Building release %{_relstr}\n"}
 
 Name:       python-neutronclient
 Version:    2.3.4
-Epoch:      2
+#Epoch:      2
 Release:    %{_relstr}
 Summary:    Python API and CLI for OpenStack Neutron
 
@@ -29,24 +29,25 @@ Requires: python-cliff >= 1.0
 Requires: python-prettytable >= 0.6
 Requires: python-setuptools
 Requires: python-simplejson
+Requires: python-pbr
 
 %description
 Client library and command line utility for interacting with Openstack
 Neutron's API.
 
 %prep
-pushd %{_builddir}/..
-pushd third_party/python-neutronclient
+pushd %{_builddir}
+pushd python-neutronclient
 sed -i 's/Babel>=0.9.6/Babel/' requirements.txt
 
 %build
-pushd %{_builddir}/..
-pushd third_party/python-neutronclient
+pushd %{_builddir}
+pushd python-neutronclient
 %{__python} setup.py build
 
 %install
-pushd %{_builddir}/..
-pushd third_party/python-neutronclient
+pushd %{_builddir}
+pushd python-neutronclient
 %{__python} setup.py install -O1 --skip-build --root %{buildroot} %{?_venvtr}
 %{__python} setup.py sdist
 
@@ -67,6 +68,9 @@ rm -rf %{buildroot}%{python_sitelib}/neutronclient/tests
 %{_sysconfdir}/profile.d/neutron.sh
 
 %changelog
+* Tue Sep 9 2014 Atul Moghe <amoghe@juniper.net> 2.3.4-3contrail
+- Added 3contrail, added python-pbr dependency
+
 * Tue Aug 12 2014 Atul Moghe <amoghe@juniper.net> 2.3.4-1
 - Added epoch for contrail/juniper