diff options
| -rw-r--r-- | build/Makefile | 31 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 9 | ||||
| -rw-r--r-- | build/rpm_specs/openstack-tacker.spec | 39 | ||||
| -rw-r--r-- | build/rpm_specs/python-tackerclient.spec | 6 | ||||
| -rw-r--r-- | build/variables.sh | 11 | ||||
| -rwxr-xr-x | ci/dev_dep_check.sh | 15 |
6 files changed, 70 insertions, 41 deletions
diff --git a/build/Makefile b/build/Makefile index ee15db33..88a6e962 100644 --- a/build/Makefile +++ b/build/Makefile @@ -14,8 +14,9 @@ export RELEASE = "0" export ISO = $(shell pwd)/release/OPNFV-CentOS-7-x86_64-${RELEASE}.iso export RPM_DIST = $(shell rpm -E %dist) -export TACKER_REPO = "http://github.com/trozet/tacker" -export TACKER_BRANCH = "SFC_colorado" + +export TACKER_REPO := $(shell awk -F\= '/^tacker_repo/ {print $$2}' variables.sh ) +export TACKER_BRANCH := $(shell awk -F\= '/^tacker_branch/ {print $$2}' variables.sh ) export TACKER_COMMIT := $(shell git ls-remote $(TACKER_REPO) $(TACKER_BRANCH) | awk '{print substr($$1,1,7)}') export TACKERCLIENT_REPO := $(shell awk -F\= '/^tackerclient_repo/ {print $$2}' variables.sh ) @@ -135,20 +136,20 @@ python-pep8-check: .PHONY: tacker-clean tacker-clean: - rm -rf openstack-tacker-2015.2 + rm -rf openstack-tacker-2016.2 rm -f openstack-tacker.tar.gz openstack-tacker.tar.gz: @echo "Preparing the Tacker RPM prerequisites" - git clone $(TACKER_REPO) -b $(TACKER_BRANCH) openstack-tacker-2015.2 - tar czf openstack-tacker.tar.gz openstack-tacker-2015.2 + git clone $(TACKER_REPO) -b $(TACKER_BRANCH) openstack-tacker-2016.2 + tar czf openstack-tacker.tar.gz openstack-tacker-2016.2 .PHONY: tacker-rpm -tacker-rpm: openstack-tacker.tar.gz noarch/openstack-tacker-2015.2-1.trozetgit$(TACKER_COMMIT).noarch.rpm +tacker-rpm: openstack-tacker.tar.gz noarch/openstack-tacker-2016.2-1.git$(TACKER_COMMIT).noarch.rpm -noarch/openstack-tacker-2015.2-1.trozetgit$(TACKER_COMMIT).noarch.rpm: +noarch/openstack-tacker-2016.2-1.git$(TACKER_COMMIT).noarch.rpm: @echo "Building the Tacker RPM" - rpmbuild --clean -ba --target noarch rpm_specs/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`)' -D 'git .trozetgit$(TACKER_COMMIT)' + rpmbuild --clean -ba --target noarch rpm_specs/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`)' -D 'git .git$(TACKER_COMMIT)' ################# # TACKERCLIENT # @@ -156,20 +157,20 @@ noarch/openstack-tacker-2015.2-1.trozetgit$(TACKER_COMMIT).noarch.rpm: .PHONY: tackerclient-clean tackerclient-clean: - rm -rf python-tackerclient-2015.2 + rm -rf python-tackerclient-2016.2 rm -f python-tackerclient.tar.gz python-tackerclient.tar.gz: @echo "Preparing the TackerClient RPM prerequisites" - git clone $(TACKERCLIENT_REPO) -b $(TACKERCLIENT_BRANCH) python-tackerclient-2015.2 - tar czf python-tackerclient.tar.gz python-tackerclient-2015.2 + git clone $(TACKERCLIENT_REPO) -b $(TACKERCLIENT_BRANCH) python-tackerclient-2016.2 + tar czf python-tackerclient.tar.gz python-tackerclient-2016.2 .PHONY: tackerclient-rpm -tackerclient-rpm: python-tackerclient.tar.gz noarch/python-tackerclient-2015.2-1.trozetgit$(TACKERCLIENT_COMMIT).noarch.rpm +tackerclient-rpm: python-tackerclient.tar.gz noarch/python-tackerclient-2016.2-1.git$(TACKERCLIENT_COMMIT).noarch.rpm -noarch/python-tackerclient-2015.2-1.trozetgit$(TACKERCLIENT_COMMIT).noarch.rpm: +noarch/python-tackerclient-2016.2-1.git$(TACKERCLIENT_COMMIT).noarch.rpm: @echo "Building the TackerClient RPM" - rpmbuild --clean -ba --target noarch rpm_specs/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`)' -D 'git .trozetgit$(TACKERCLIENT_COMMIT)' + rpmbuild --clean -ba --target noarch rpm_specs/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`)' -D 'git .git$(TACKERCLIENT_COMMIT)' ############### # CONGRESS # @@ -274,7 +275,7 @@ overcloud-full-clean: .PHONY: overcloud-full overcloud-full: images/overcloud-full.qcow2 -images/overcloud-full.qcow2: congress-rpm networking-vpp-rpm +images/overcloud-full.qcow2: congress-rpm tacker-rpm networking-vpp-rpm @echo "Building the Apex Base Overcloud Image" @./overcloud-full.sh diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 2ad605b9..d08c4115 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -75,8 +75,7 @@ tar czf vsperf.tar.gz vsperf # tar up the tacker puppet module rm -rf 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 +git clone https://github.com/openstack/puppet-tacker pushd puppet-tacker > /dev/null git archive --format=tar.gz --prefix=tacker/ HEAD > ../puppet-tacker.tar.gz popd > /dev/null @@ -105,6 +104,7 @@ qemu-img resize overcloud-full_build.qcow2 +500MB # upload puppet fdio # git clone vsperf into the overcloud image # upload the tacker puppet module and untar it +# install tacker LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "xfs_growfs /dev/sda" \ --upload ../opnfv-puppet-tripleo.tar.gz:/etc/puppet/modules \ @@ -145,6 +145,10 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "cd /var/opt && tar xzf vsperf.tar.gz" \ --upload puppet-tacker.tar.gz:/etc/puppet/modules/ \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-tacker.tar.gz" \ + --upload ../noarch/$tacker_pkg:/root/ \ + --install /root/$tacker_pkg \ + --upload ../noarch/$tackerclient_pkg:/root/ \ + --install /root/$tackerclient_pkg \ --run-command "pip install python-senlinclient" \ --upload ../neutron/agent/interface/interface.py:/usr/lib/python2.7/site-packages/neutron/agent/linux/ \ --run-command "mkdir /root/fdio_neutron_l3" \ @@ -155,6 +159,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --upload ../puppet-neutron/lib/puppet/type/neutron_agent_vpp.rb:/etc/puppet/modules/neutron/lib/puppet/type/ \ --mkdir /etc/puppet/modules/neutron/lib/puppet/provider/neutron_agent_vpp \ --upload ../puppet-neutron/lib/puppet/provider/neutron_agent_vpp/ini_setting.rb:/etc/puppet/modules/neutron/lib/puppet/provider/neutron_agent_vpp/ \ + --run-command "sed -i -E 's/timeout=[0-9]+/timeout=60/g' /usr/share/openstack-puppet/modules/rabbitmq/lib/puppet/provider/rabbitmqctl.rb" \ -a overcloud-full_build.qcow2 rm -rf ovs_nsh_patches diff --git a/build/rpm_specs/openstack-tacker.spec b/build/rpm_specs/openstack-tacker.spec index b491cd1e..7ed5cbdb 100644 --- a/build/rpm_specs/openstack-tacker.spec +++ b/build/rpm_specs/openstack-tacker.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: openstack-tacker -Version: 2015.2 +Version: 2016.2 Release: 1%{?git} Summary: OpenStack servicevm/device manager @@ -12,11 +12,6 @@ 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 @@ -31,11 +26,14 @@ rm requirements.txt %install -/usr/bin/python setup.py install --prefix=%{buildroot} --install-lib=%{buildroot}/usr/lib/python2.7/site-packages +/usr/bin/python setup.py install --root=%{buildroot} #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 +# 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 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 @@ -58,17 +56,24 @@ exit 0 %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/bin/tacker-server +/usr/bin/tacker-db-manage +/usr/bin/tacker-rootwrap +#%{_unitdir}/openstack-tacker.service /usr/lib/python2.7/site-packages/tacker/* -/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 +%{_sysconfdir}/tacker/rootwrap.conf %dir %attr(0750, tacker, root) %{_localstatedir}/cache/tacker %dir %attr(0750, tacker, root) %{_sharedstatedir}/tacker %dir %attr(0750, tacker, root) %{_localstatedir}/log/tacker %changelog +* Wed Nov 30 2016 Dan Radez <dradez@redhat.com> - 2016.2-1 +- Version update for Newton + +* Mon Jul 25 2016 Tim Rozet <trozet@redhat.com> - 2015.2-1 +- Initial Commit diff --git a/build/rpm_specs/python-tackerclient.spec b/build/rpm_specs/python-tackerclient.spec index aa379361..5758f7c0 100644 --- a/build/rpm_specs/python-tackerclient.spec +++ b/build/rpm_specs/python-tackerclient.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: python-tackerclient -Version: 2015.2 +Version: 2016.2 Release: 1%{?git} Summary: CLI and Client Library for OpenStack Networking @@ -37,4 +37,8 @@ rm requirements.txt /usr/lib/python2.7/site-packages/python_tackerclient-* %changelog +* Wed Nov 30 2016 Dan Radez <dradez@redhat.com> - 2016.2-1 +- Version update for Newton +* Mon Jul 25 2016 Tim Rozet <trozet@redhat.com> - 2015.2-1 +- Initial Commit diff --git a/build/variables.sh b/build/variables.sh index c8754379..0c938775 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -27,10 +27,15 @@ dpdk_rpms=( 'ovs4opnfv-e8acab14-openvswitch-2.5.90-0.12032.gitc61e93d6.1.el7.centos.x86_64.rpm' ) -tackerclient_repo="http://github.com/trozet/python-tackerclient" -tackerclient_branch="SFC_refactor" +tacker_repo="http://github.com/openstack/tacker" +tacker_branch="stable/newton" +tacker_commit=$(git ls-remote ${tacker_repo} ${tacker_branch} | awk '{print substr($$1,1,7)}') +tacker_pkg=openstack-tacker-2016.2-1.git${tacker_commit}.noarch.rpm + +tackerclient_repo="http://github.com/openstack/python-tackerclient" +tackerclient_branch="stable/newton" tackerclient_commit=$(git ls-remote ${tackerclient_repo} ${tackerclient_branch} | awk '{print substr($$1,1,7)}') -tackerclient_pkg=python-tackerclient-2015.2-1.trozetgit${tackerclient_commit}.noarch.rpm +tackerclient_pkg=python-tackerclient-2016.2-1.git${tackerclient_commit}.noarch.rpm congress_repo="http://github.com/openstack/congress" congress_branch="stable/mitaka" diff --git a/ci/dev_dep_check.sh b/ci/dev_dep_check.sh index 52643459..6814227e 100755 --- a/ci/dev_dep_check.sh +++ b/ci/dev_dep_check.sh @@ -64,11 +64,20 @@ virt_pkgs=( 'perl-Sys-Guestfs-1.32.7-3.el7.x86_64.rpm' 'python-libguestfs-1.32.7-3.el7.x86_64.rpm' ) - +dir=/tmp/packages.$RANDOM +mkdir -p $dir +pushd $dir +all_packages="" for pkg in ${virt_pkgs[@]}; do if ! rpm -q ${pkg%-*-*}; then - if ! sudo yum -y install $virt_uri_base/$pkg; then - echo "ERROR: Failed to update $pkg" + if ! wget $virt_uri_base/$pkg; then + echo "ERROR: Failed to download $pkg" fi + all_packages="$all_packages $pkg" fi done +if [[ $all_packages != "" ]];then + yum install -y $all_packages +fi +rm -rf $dir +popd |