diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile | 49 | ||||
| -rw-r--r-- | build/network-environment.yaml | 1 | ||||
| -rwxr-xr-x | build/openstack-congress.spec | 80 | ||||
| -rw-r--r-- | build/openstack-tacker.spec | 74 | ||||
| -rw-r--r-- | build/opnfv-environment.yaml | 8 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 14 | ||||
| -rwxr-xr-x | build/overcloud-onos.sh | 4 | ||||
| -rwxr-xr-x | build/overcloud-opendaylight-sfc.sh | 4 | ||||
| -rw-r--r-- | build/variables.sh | 7 |
9 files changed, 225 insertions, 16 deletions
diff --git a/build/Makefile b/build/Makefile index 84305618..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 +clean: images-clean rpms-clean iso-clean tacker-clean congress-clean .PHONY: images images: undercloud overcloud-full overcloud-opendaylight overcloud-onos overcloud-opendaylight-sfc @@ -85,6 +85,51 @@ python-pep8-check: pep8 ../tests ############### +# TACKER # +############### + +.PHONY: tacker-clean + +tacker-clean: + @rm -rf openstack-tacker-2015.2 + @rm -f openstack-tacker.tar.gz + +openstack-tacker.tar.gz: + @echo "Preparing the Tacker RPM prerequisites" + git clone http://github.com/trozet/tacker -b SFC_colorado openstack-tacker-2015.2 + 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 + +openstack-tacker-2015.2-1.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`)' + +############### +# 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 # ############### @@ -129,7 +174,7 @@ overcloud-full-clean: .PHONY: overcloud-full overcloud-full: images/overcloud-full.qcow2 -images/overcloud-full.qcow2: +images/overcloud-full.qcow2: tacker-rpm congress-rpm @echo "Building the Apex Base Overcloud Image" @./overcloud-full.sh diff --git a/build/network-environment.yaml b/build/network-environment.yaml index bbd0796f..8b5b070c 100644 --- a/build/network-environment.yaml +++ b/build/network-environment.yaml @@ -81,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/openstack-tacker.spec b/build/openstack-tacker.spec new file mode 100644 index 00000000..ca5ccd9a --- /dev/null +++ b/build/openstack-tacker.spec @@ -0,0 +1,74 @@ +%define debug_package %{nil} + +Name: openstack-tacker +Version: 2015.2 +Release: 1 +Summary: OpenStack servicevm/device manager + +Group: Applications/Internet +License: Apache 2.0 +URL: https://wiki.openstack.org/wiki/Tacker/Installation +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 + +%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 +#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 + +install -d -m 755 %{buildroot}%{_localstatedir}/cache/tacker +install -d -m 755 %{buildroot}%{_sharedstatedir}/tacker +install -d -m 755 %{buildroot}%{_localstatedir}/log/tacker + +%pre +getent group tacker >/dev/null || groupadd -r tacker +if ! getent passwd tacker >/dev/null; then + useradd -r -g tacker -G tacker,nobody -d %{_sharedstatedir}/tacker -s /sbin/nologin -c "OpenStack Tacker Daemon" tacker +fi +exit 0 + +%post +%systemd_post openstack-tacker + +%preun +%systemd_preun openstack-tacker + +%postun +%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/lib/python2.7/site-packages/tacker/* +/usr/lib/python2.7/site-packages/tacker-* +%dir %attr(0750, tacker, root) %{_localstatedir}/cache/tacker +%dir %attr(0750, tacker, root) %{_sharedstatedir}/tacker +%dir %attr(0750, tacker, root) %{_localstatedir}/log/tacker + +%changelog diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml index 61915c96..4f9fd986 100644 --- a/build/opnfv-environment.yaml +++ b/build/opnfv-environment.yaml @@ -8,9 +8,15 @@ parameters: ControllerEnableSwiftStorage: false # CloudDomain: EnableSahara: false - EnableTacker: false + EnableTacker: true ExtraConfig: tripleo::ringbuilder::build_ring: False + nova::nova_public_key: + type: 'ssh-rsa' + replace_public_key: + nova::nova_private_key: + type: 'ssh-rsa' + replace_private_key: nova::policy::policies: nova-os_compute_api:servers:show:host_status: key: 'os_compute_api:servers:show:host_status' diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 7eb22d1d..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/ @@ -53,7 +52,7 @@ done # tar up the congress puppet module rm -rf puppet-congress -git clone https://github.com/radez/puppet-congress +git clone -b stable/mitaka https://github.com/radez/puppet-congress pushd puppet-congress > /dev/null git archive --format=tar.gz --prefix=congress/ origin/stable/mitaka > ../puppet-congress.tar.gz popd > /dev/null @@ -89,7 +88,8 @@ tar czf vsperf.tar.gz vsperf # tar up the tacker puppet module rm -rf puppet-tacker -git clone https://github.com/radez/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 pushd puppet-tacker > /dev/null git archive --format=tar.gz --prefix=tacker/ HEAD > ../puppet-tacker.tar.gz popd > /dev/null @@ -120,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" \ @@ -133,9 +134,12 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --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 "openstack-tacker,python-tackerclient" \ + --install "python-tackerclient" \ + --upload ../noarch/openstack-tacker-2015.2-1.noarch.rpm:/root/ \ + --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/overcloud-onos.sh b/build/overcloud-onos.sh index e13923d9..4b8b1350 100755 --- a/build/overcloud-onos.sh +++ b/build/overcloud-onos.sh @@ -19,8 +19,8 @@ cp -f overcloud-full.qcow2 overcloud-full-onos_build.qcow2 ####################################### # upgrade ovs into ovs 2.5.90 with NSH function -curl -L -O ${onos_ovs_uri}/package_ovs_rpm_new.tar.gz -tar -xzf package_ovs_rpm_new.tar.gz +curl -L -O ${onos_ovs_uri}/package_ovs_rpm2.tar.gz +tar -xzf package_ovs_rpm2.tar.gz LIBGUESTFS_BACKEND=direct virt-customize --upload ${ovs_kmod_rpm_name}:/root/ \ --run-command "yum install -y /root/${ovs_kmod_rpm_name}" \ --upload ${ovs_rpm_name}:/root/ \ diff --git a/build/overcloud-opendaylight-sfc.sh b/build/overcloud-opendaylight-sfc.sh index 5032ba06..7f8508a8 100755 --- a/build/overcloud-opendaylight-sfc.sh +++ b/build/overcloud-opendaylight-sfc.sh @@ -20,8 +20,8 @@ cp -f overcloud-full-opendaylight.qcow2 overcloud-full-opendaylight-sfc_build.qc # upgrade ovs into ovs 2.5.90 with NSH function if ! [[ -f "$ovs_rpm_name" && -f "$ovs_kmod_rpm_name" ]]; then - curl -L -O ${onos_ovs_uri}/package_ovs_rpm_new.tar.gz - tar -xzf package_ovs_rpm_new.tar.gz + curl -L -O ${onos_ovs_uri}/package_ovs_rpm2.tar.gz + tar -xzf package_ovs_rpm2.tar.gz fi LIBGUESTFS_BACKEND=direct virt-customize --upload ${ovs_kmod_rpm_name}:/root/ \ diff --git a/build/variables.sh b/build/variables.sh index 6632b526..134cc295 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -12,9 +12,8 @@ rdo_images_uri=https://ci.centos.org/artifacts/rdo/images/mitaka/delorean/stable 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/7rfr9l2qz3a36cc -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 +onos_ovs_uri=https://www.dropbox.com/s/2dyd8zyt2l6p586 +doctor_driver=https://raw.githubusercontent.com/openstack/congress/master/congress/datasources/doctor_driver.py dpdk_uri_base=http://artifacts.opnfv.org/ovsnfv dpdk_rpms=( @@ -25,5 +24,5 @@ dpdk_rpms=( 'ovs4opnfv-32930523-openvswitch-2.5.90-0.12032.gitc61e93d6.1.el7.centos.x86_64.rpm' ) -ovs_rpm_name=openvswitch-2.5.90-0.11974.gitc4623bb8.1.el7.centos.x86_64.rpm +ovs_rpm_name=openvswitch-2.5.90-1.el7.centos.x86_64.rpm ovs_kmod_rpm_name=openvswitch-kmod-2.5.90-1.el7.centos.x86_64.rpm |