diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile | 27 | ||||
| -rw-r--r-- | build/build_perf_image.sh | 2 | ||||
| -rw-r--r-- | build/network-environment.yaml | 2 | ||||
| -rwxr-xr-x | build/openstack-congress.spec | 80 | ||||
| -rw-r--r-- | build/opnfv-apex-common.spec | 4 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 5 | ||||
| -rw-r--r-- | build/variables.sh | 3 |
7 files changed, 114 insertions, 9 deletions
diff --git a/build/Makefile b/build/Makefile index a1089a84..96711d23 100644 --- a/build/Makefile +++ b/build/Makefile @@ -27,7 +27,7 @@ all_networks="admin_network private_network storage_network external_network api all: iso .PHONY: clean -clean: images-clean rpms-clean iso-clean tacker-clean +clean: images-clean rpms-clean iso-clean tacker-clean congress-clean .PHONY: images images: undercloud overcloud-full overcloud-opendaylight overcloud-onos overcloud-opendaylight-sfc @@ -107,6 +107,29 @@ openstack-tacker-2015.2-1.noarch.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`)' ############### +# CONGRESS # +############### + +.PHONY: congress-clean + +congress-clean: + @rm -rf openstack-congress-2016.1 + @rm -f openstack-congress.tar.gz + +openstack-congress.tar.gz: + @echo "Preparing the Congress RPM prerequisites" + git clone http://github.com/openstack/congress -b stable/mitaka openstack-congress-2016.1 + cd openstack-congress-2016.1 && curl -O https://radez.fedorapeople.org/openstack-congress.service + tar czf openstack-congress.tar.gz openstack-congress-2016.1 + +.PHONY: congress-rpm +congress-rpm: openstack-congress.tar.gz openstack-congress-2016.1-1.noarch.rpm + +openstack-congress-2016.1-1.noarch.rpm: + @echo "Building the Congress RPM" + rpmbuild --clean -bb --target noarch openstack-congress.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`)' + +############### # UNDERCLOUD # ############### @@ -151,7 +174,7 @@ overcloud-full-clean: .PHONY: overcloud-full overcloud-full: images/overcloud-full.qcow2 -images/overcloud-full.qcow2: tacker-rpm +images/overcloud-full.qcow2: tacker-rpm congress-rpm @echo "Building the Apex Base Overcloud Image" @./overcloud-full.sh diff --git a/build/build_perf_image.sh b/build/build_perf_image.sh index c91b563d..a6ca066b 100644 --- a/build/build_perf_image.sh +++ b/build/build_perf_image.sh @@ -27,8 +27,6 @@ fi if [ "$CATEGORY" == "nova" ]; then if [ "$KEY" == "libvirtpin" ]; then sudo sed -i "s/#LibvirtCPUPinSet:.*/LibvirtCPUPinSet: '${VALUE}'/" /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml - sudo sed -i "s/^#resource_registry:/resource_registry:/" /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml - sudo sed -i "s/# {numa}/ OS::TripleO::ComputeExtraConfigPre: ..\/puppet\/extraconfig\/pre_deploy\/compute\/numa.yaml/" /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml fi fi diff --git a/build/network-environment.yaml b/build/network-environment.yaml index 84bb5cef..8b5b070c 100644 --- a/build/network-environment.yaml +++ b/build/network-environment.yaml @@ -39,7 +39,6 @@ resource_registry: OS::TripleO::Compute::Net::SoftwareConfig: nics/compute.yaml OS::TripleO::Controller::Net::SoftwareConfig: nics/controller.yaml - parameter_defaults: NeutronExternalNetworkBridge: 'br-ex' ControlPlaneSubnetCidr: "24" @@ -82,6 +81,7 @@ parameters: SwiftMgmtNetwork: storage SwiftProxyNetwork: storage TackerApiNetwork: internal_api + CongressApiNetwork: internal_api HorizonNetwork: internal_api MemcachedNetwork: internal_api RabbitMqNetwork: internal_api diff --git a/build/openstack-congress.spec b/build/openstack-congress.spec new file mode 100755 index 00000000..0dd3491c --- /dev/null +++ b/build/openstack-congress.spec @@ -0,0 +1,80 @@ +%define debug_package %{nil} + +Name: openstack-congress +Version: 2016.1 +Release: 1%{?dist} +Summary: OpenStack servicevm/device manager + +Group: Applications/Internet +License: Apache 2.0 +URL: https://wiki.openstack.org/wiki/Congress/Installation +Source0: openstack-congress.tar.gz + +BuildArch: noarch +BuildRequires: python-setuptools python2-oslo-config python2-debtcollector +#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 + + +%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 + +install -d -m 755 %{buildroot}/var/log/congress/ +install -d -m 755 %{buildroot}/etc/congress/snapshot/ + +install etc/api-paste.ini %{buildroot}/etc/congress/api-paste.ini +install etc/policy.json %{buildroot}/etc/congress/policy.json +tox -egenconfig +install etc/congress.conf.sample %{buildroot}/etc/congress/congress.conf + +install -p -D -m 644 openstack-congress.service %{buildroot}%{_unitdir}/openstack-congress.service +install -d -m 755 %{buildroot}%{_sharedstatedir}/congress + +%pre +getent group congress >/dev/null || groupadd -r congress +if ! getent passwd congress >/dev/null; then + useradd -r -g congress -G congress,nobody -d %{_sharedstatedir}/congress -s /sbin/nologin -c "OpenStack Congress Daemon" congress +fi +exit 0 + +%post +%systemd_post openstack-congress + +%preun +%systemd_preun openstack-congress + +%postun +%systemd_postun_with_restart openstack-congress + +%files + +%config /etc/congress/congress.conf +/etc/congress/policy.json +/etc/congress/api-paste.ini +/bin/congress-server +/bin/congress-db-manage +%{_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/* +%dir %attr(0750, congress, root) %{_localstatedir}/log/congress + +%changelog + diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec index 854fbbb6..6b86bf87 100644 --- a/build/opnfv-apex-common.spec +++ b/build/opnfv-apex-common.spec @@ -35,6 +35,7 @@ install ci/util.sh %{buildroot}%{_bindir}/opnfv-util mkdir -p %{buildroot}%{_sysconfdir}/opnfv-apex/ install config/deploy/os-nosdn-nofeature-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-noha.yaml +install config/deploy/os-nosdn-fdio-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-fdio-noha.yaml install config/deploy/os-nosdn-ovs-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-ovs-noha.yaml install config/deploy/os-nosdn-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-ha.yaml install config/deploy/os-nosdn-performance-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-performance-ha.yaml @@ -104,6 +105,7 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_var}/opt/opnfv/lib/installer/onos/onos_gw_mac_update.sh %{_var}/opt/opnfv/lib/installer/domain.xml %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-noha.yaml +%{_sysconfdir}/opnfv-apex/os-nosdn-fdio-noha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-ovs-noha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-performance-ha.yaml @@ -129,6 +131,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %doc %{_docdir}/opnfv/inventory.yaml.example %changelog +* Thu Aug 1 2016 Tim Rozet <trozet@redhat.com> - 3.0-11 +- Add nosdn fdio scenarios. * Tue Jul 5 2016 Dan Radez <dradez@redhat.com> - 3.0-10 - Adding functions.sh files * Thu Jun 15 2016 Tim Rozet <trozet@redhat.com> - 3.0-9 diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 2c522943..6a72705a 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -13,7 +13,6 @@ source ./variables.sh source ./functions.sh populate_cache "$rdo_images_uri/overcloud-full.tar" -populate_cache "$openstack_congress" if [ ! -d images/ ]; then mkdir images; fi tar -xf cache/overcloud-full.tar -C images/ @@ -121,7 +120,8 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "yum remove -y qemu-system-x86" \ --upload ../os-net-config.tar.gz:/usr/lib/python2.7/site-packages \ --run-command "cd /usr/lib/python2.7/site-packages/ && rm -rf os_net_config && tar xzf os-net-config.tar.gz" \ - --install "$openstack_congress" \ + --upload ../noarch/openstack-congress-2016.1-1.el7.centos.noarch.rpm:/root/ \ + --install /root/openstack-congress-2016.1-1.el7.centos.noarch.rpm \ --install "python2-congressclient" \ --upload puppet-congress.tar.gz:/etc/puppet/modules/ \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-congress.tar.gz" \ @@ -139,6 +139,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --install /root/openstack-tacker-2015.2-1.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" \ -a overcloud-full_build.qcow2 mv -f overcloud-full_build.qcow2 overcloud-full.qcow2 diff --git a/build/variables.sh b/build/variables.sh index 27118c93..134cc295 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -13,8 +13,7 @@ onos_release_uri=https://downloads.onosproject.org/nightly/ onos_release_file=onos-1.6.0-rc2.tar.gz onos_jdk_uri=https://www.dropbox.com/s/qyujpib8zyhzeev onos_ovs_uri=https://www.dropbox.com/s/2dyd8zyt2l6p586 -openstack_congress=https://radez.fedorapeople.org/openstack-congress-2016.1-1.fc24.noarch.rpm -doctor_driver=https://raw.githubusercontent.com/muroi/congress/doctor-poc/congress/datasources/doctor_driver.py +doctor_driver=https://raw.githubusercontent.com/openstack/congress/master/congress/datasources/doctor_driver.py dpdk_uri_base=http://artifacts.opnfv.org/ovsnfv dpdk_rpms=( |