diff options
| -rw-r--r-- | build/Makefile | 16 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 6 | ||||
| -rw-r--r-- | build/rpm_specs/openstack-congress.spec | 32 | ||||
| -rw-r--r-- | build/variables.sh | 5 | ||||
| -rwxr-xr-x | lib/post-install-functions.sh | 4 |
5 files changed, 31 insertions, 32 deletions
diff --git a/build/Makefile b/build/Makefile index 30af162b..af84ea85 100644 --- a/build/Makefile +++ b/build/Makefile @@ -162,17 +162,21 @@ $(BUILD_DIR)/noarch/python-tackerclient-2016.2-1.git$(TACKERCLIENT_COMMIT).noarc # CONGRESS # ############### +.PHONY: congress-clean +congress-clean: + @rm -rf $(BUILD_DIR)/openstack-congress-2016.2 + @rm -f $(BUILD_DIR)/openstack-congress.tar.gz + $(BUILD_DIR)/openstack-congress.tar.gz: @echo "Preparing the Congress RPM prerequisites" - git clone $(CONGRESS_REPO) -b $(CONGRESS_BRANCH) $(BUILD_DIR)/openstack-congress-2016.1 - cd $(BUILD_DIR)/openstack-congress-2016.1 && curl -O https://radez.fedorapeople.org/openstack-congress.service - tar czf $(BUILD_DIR)/openstack-congress.tar.gz -C $(BUILD_DIR) openstack-congress-2016.1 + git clone $(CONGRESS_REPO) -b $(CONGRESS_BRANCH) $(BUILD_DIR)/openstack-congress-2016.2 + cd $(BUILD_DIR)/openstack-congress-2016.2 && curl -O https://radez.fedorapeople.org/openstack-congress.service + tar czf $(BUILD_DIR)/openstack-congress.tar.gz -C $(BUILD_DIR) openstack-congress-2016.2 .PHONY: congress-rpm -congress-rpm: $(BUILD_DIR)/openstack-congress.tar.gz $(BUILD_DIR)/noarch/openstack-congress-2016.1-1.git$(CONGRESS_COMMIT).noarch.rpm - +congress-rpm: $(BUILD_DIR)/noarch/openstack-congress-2016.2-1.git$(CONGRESS_COMMIT).noarch.rpm -$(BUILD_DIR)/noarch/openstack-congress-2016.1-1.git$(CONGRESS_COMMIT).noarch.rpm: +$(BUILD_DIR)/noarch/openstack-congress-2016.2-1.git$(CONGRESS_COMMIT).noarch.rpm: $(BUILD_DIR)/openstack-congress.tar.gz @echo "Building the Congress RPM" rpmbuild --clean -ba --target noarch rpm_specs/openstack-congress.spec $(RPM_DIR_ARGS) -D 'git .git$(CONGRESS_COMMIT)' diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index e97ae70a..3d9d582e 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -45,9 +45,9 @@ done # tar up the congress puppet module rm -rf puppet-congress -git clone -b stable/mitaka https://github.com/radez/puppet-congress +git clone https://github.com/openstack/puppet-congress pushd puppet-congress > /dev/null -git archive --format=tar.gz --prefix=congress/ origin/stable/mitaka > ${BUILD_DIR}/puppet-congress.tar.gz +git archive --format=tar.gz --prefix=congress/ HEAD > ${BUILD_DIR}/puppet-congress.tar.gz popd > /dev/null # tar up the fd.io module @@ -88,7 +88,6 @@ qemu-img resize overcloud-full_build.qcow2 +500MB # enable connection tracking for protocal sctp # install the congress rpms # upload and explode the congress puppet module -# install doctor driver ## Can be removed in Newton # install fd.io yum repo and packages # upload puppet fdio # git clone vsperf into the overcloud image @@ -122,7 +121,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --install "python2-congressclient" \ --upload ${BUILD_DIR}/puppet-congress.tar.gz:/etc/puppet/modules/ \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-congress.tar.gz" \ - --run-command "cd /usr/lib/python2.7/site-packages/congress/datasources && curl -O $doctor_driver" \ --run-command "yum install -y /root/fdio/*.rpm" \ --run-command "rm -f /etc/sysctl.d/80-vpp.conf" \ --install unzip \ diff --git a/build/rpm_specs/openstack-congress.spec b/build/rpm_specs/openstack-congress.spec index fd8e95ef..5f4d7b35 100644 --- a/build/rpm_specs/openstack-congress.spec +++ b/build/rpm_specs/openstack-congress.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: openstack-congress -Version: 2016.1 +Version: 2016.2 Release: 1%{?git}%{?dist} Summary: OpenStack servicevm/device manager @@ -11,19 +11,13 @@ URL: https://wiki.openstack.org/wiki/Congress/Installation Source0: openstack-congress.tar.gz BuildArch: noarch + BuildRequires: python-setuptools python2-oslo-config python2-debtcollector libffi-devel python-devel openssl-devel python2-oslo-config python2-debtcollector python34-devel -#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 policy manager %prep -#git archive --format=tar.gz --prefix=openstack-congress-%{version}/ HEAD > openstack-congress.tar.gz - %setup -q @@ -33,7 +27,9 @@ OpenStack policy manager %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} + +rm -rf %{buildroot}/usr/lib/python2.7/site-packages/congress_tempest_tests install -d -m 755 %{buildroot}/var/log/congress/ install -d -m 755 %{buildroot}/etc/congress/snapshot/ @@ -63,17 +59,17 @@ exit 0 %systemd_postun_with_restart openstack-congress %files - -%config /etc/congress/congress.conf -/etc/congress/policy.json +%{python2_sitelib}/congress-*.egg-info /etc/congress/api-paste.ini -/bin/congress-server -/bin/congress-db-manage +/etc/congress/congress.conf +/etc/congress/policy.json +/usr/bin/congress-db-manage +/usr/bin/congress-server %{_unitdir}/openstack-congress.service -/usr/lib/python2.7/site-packages/congress/* -/usr/lib/python2.7/site-packages/congress-* -/usr/lib/python2.7/site-packages/congress_tempest_tests/* -/usr/lib/python2.7/site-packages/antlr3runtime/* +/usr/lib/python2.7/site-packages/congress +/usr/lib/python2.7/site-packages/congress_dashboard +/usr/lib/python2.7/site-packages/antlr3runtime + %dir %attr(0750, congress, root) %{_localstatedir}/log/congress %changelog diff --git a/build/variables.sh b/build/variables.sh index 0aedff9c..a40eb234 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -19,7 +19,6 @@ onos_release_file=onos-1.6.0-rc2.tar.gz onos_jdk_uri=http://artifacts.opnfv.org/apex/colorado onos_ovs_uri=http://artifacts.opnfv.org/apex/colorado onos_ovs_pkg=package_ovs_rpm3.tar.gz -doctor_driver=https://raw.githubusercontent.com/openstack/congress/master/congress/datasources/doctor_driver.py if [ -z ${GS_PATHNAME+x} ]; then GS_PATHNAME=/colorado fi @@ -43,9 +42,9 @@ tackerclient_commit=$(git ls-remote ${tackerclient_repo} ${tackerclient_branch} tackerclient_pkg=python-tackerclient-2016.2-1.git${tackerclient_commit}.noarch.rpm congress_repo="http://github.com/openstack/congress" -congress_branch="stable/mitaka" +congress_branch="stable/newton" congress_commit=$(git ls-remote ${congress_repo} ${congress_branch} | awk '{print substr($1,1,7)}') -congress_pkg=openstack-congress-2016.1-1.git${congress_commit}$(rpm -E %dist).noarch.rpm +congress_pkg=openstack-congress-2016.2-1.git${congress_commit}$(rpm -E %dist).noarch.rpm netvpp_repo="https://github.com/openstack/networking-vpp" netvpp_branch="master" diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh index 102b86f5..eab17407 100755 --- a/lib/post-install-functions.sh +++ b/lib/post-install-functions.sh @@ -123,7 +123,9 @@ if [ "${deploy_options_array['dataplane']}" == 'fdio' ] || [ "${deploy_options_a done fi -if [ "${deploy_options_array['congress']}" == 'True' ]; then +# TODO: Change this back to True once everything is back in +# place with tht and puppet-congress for deployment +if [ "${deploy_options_array['congress']}" == 'NeverTrue' ]; then ds_configs="--config username=\$OS_USERNAME --config tenant_name=\$OS_TENANT_NAME --config password=\$OS_PASSWORD |