diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile | 9 | ||||
| -rw-r--r-- | build/c7-opnfv-x86_64-comps.xml | 4 | ||||
| -rw-r--r-- | build/opnfv-environment.yaml | 3 | ||||
| -rwxr-xr-x | build/overcloud-onos.sh | 6 | ||||
| -rw-r--r-- | build/rpm_specs/opnfv-apex-common.spec | 11 | ||||
| -rw-r--r-- | build/variables.sh | 4 |
6 files changed, 19 insertions, 18 deletions
diff --git a/build/Makefile b/build/Makefile index 5dc4ef13..ed983256 100644 --- a/build/Makefile +++ b/build/Makefile @@ -60,17 +60,14 @@ clean: clean-cache: rm -rf $(CACHE_DIR) -# ONOS integration did not get updated for Danube, -# removing it from the default builds - .PHONY: images -images: undercloud overcloud-full overcloud-opendaylight # overcloud-onos +images: undercloud overcloud-full overcloud-opendaylight overcloud-onos .PHONY: rpms -rpms: common-rpm undercloud-rpm opendaylight-rpm # onos-rpm +rpms: common-rpm undercloud-rpm opendaylight-rpm onos-rpm .PHONY: rpms-check -rpms-check: release-rpm-check common-rpm-check undercloud-rpm-check opendaylight-rpm-check # onos-rpm-check +rpms-check: release-rpm-check common-rpm-check undercloud-rpm-check opendaylight-rpm-check onos-rpm-check .PHONY: rpms-clean rpms-clean: diff --git a/build/c7-opnfv-x86_64-comps.xml b/build/c7-opnfv-x86_64-comps.xml index 8bbe81d4..16f6ec77 100644 --- a/build/c7-opnfv-x86_64-comps.xml +++ b/build/c7-opnfv-x86_64-comps.xml @@ -7836,7 +7836,7 @@ <groupid>virtualization-hypervisor</groupid> <groupid>virtualization-tools</groupid> <groupid>apex-opendaylight</groupid> - <!--groupid>apex-onos</groupid--> + <groupid>apex-onos</groupid> </grouplist> <optionlist> <groupid>virtualization-platform</groupid> @@ -7862,7 +7862,7 @@ <groupid>virtualization-hypervisor</groupid> <groupid>virtualization-tools</groupid> <groupid>apex-opendaylight</groupid> - <!--groupid>apex-onos</groupid--> + <groupid>apex-onos</groupid> </grouplist> <optionlist> <groupid>kde-desktop</groupid> diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml index e29b0c7a..8eeb1265 100644 --- a/build/opnfv-environment.yaml +++ b/build/opnfv-environment.yaml @@ -107,6 +107,8 @@ parameter_defaults: - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::OpenDaylightApi - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::ONOSApi + - OS::TripleO::Services::ONOSOvs - OS::TripleO::Services::SensuClient - OS::TripleO::Services::FluentdClient - OS::TripleO::Services::VipHosts @@ -138,6 +140,7 @@ parameter_defaults: - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::NeutronSriovAgent - OS::TripleO::Services::OpenDaylightOvs + - OS::TripleO::Services::ONOSOvs - OS::TripleO::Services::SensuClient - OS::TripleO::Services::FluentdClient - OS::TripleO::Services::VipHosts diff --git a/build/overcloud-onos.sh b/build/overcloud-onos.sh index 40f9f66a..c64c19b3 100755 --- a/build/overcloud-onos.sh +++ b/build/overcloud-onos.sh @@ -28,12 +28,16 @@ LIBGUESTFS_BACKEND=direct virt-customize --upload ${CACHE_DIR}/${onos_release_fi -a overcloud-full-onos_build.qcow2 #Those files can be store in local cache for saving download time -git clone https://github.com/saravanaonos/puppet-onos.git +git clone https://github.com/bobzhouHW/puppet-onos.git tar --xform="s:puppet-onos/:onos/:" -czf puppet-onos.tar.gz puppet-onos LIBGUESTFS_BACKEND=direct virt-customize --upload ${CACHE_DIR}/jdk-8u51-linux-x64.tar.gz:/opt/ \ --upload ${BUILD_DIR}/puppet-onos/files/install_jdk8.tar:/opt/ \ --run-command "cd /opt/ && tar -xf install_jdk8.tar && sh /opt/install_jdk8/install_jdk8.sh" \ + --upload ${BUILD_DIR}/puppet-onos/files/networking-onos.tar:/opt/ \ + --run-command "cd /opt/ && tar -xf networking-onos.tar && sh /opt/networking-onos/install_driver.sh" \ + --upload ${BUILD_DIR}/puppet-onos/files/networking-sfc.tar:/opt/ \ + --run-command "cd /opt/ && tar -xf networking-sfc.tar && sh /opt/networking-sfc/install_driver.sh" \ --upload ${BUILD_DIR}/puppet-onos.tar.gz:/etc/puppet/modules/ \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-onos.tar.gz" \ -a overcloud-full-onos_build.qcow2 diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec index 8be717bf..13a04817 100644 --- a/build/rpm_specs/opnfv-apex-common.spec +++ b/build/rpm_specs/opnfv-apex-common.spec @@ -60,8 +60,8 @@ install config/deploy/os-odl-ovs_dpdk-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-a install config/deploy/os-odl-ovs_dpdk-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-ovs_dpdk-noha.yaml install config/deploy/os-odl-gluon-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-gluon-noha.yaml install config/deploy/os-ovn-nofeature-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-ovn-nofeature-noha.yaml -#install config/deploy/os-onos-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml -#install config/deploy/os-onos-sfc-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-onos-sfc-ha.yaml +install config/deploy/os-onos-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml +install config/deploy/os-onos-sfc-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-onos-sfc-ha.yaml install config/deploy/os-ocl-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-ocl-nofeature-ha.yaml install config/network/network_settings.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/network_settings.yaml install config/network/network_settings_v6.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/network_settings_v6.yaml @@ -91,7 +91,6 @@ install lib/python/apex/common/__init__.py %{buildroot}%{python3_sitelib}/apex/c install lib/python/apex/common/constants.py %{buildroot}%{python3_sitelib}/apex/common/ install lib/python/apex/common/utils.py %{buildroot}%{python3_sitelib}/apex/common/ mkdir -p %{buildroot}%{_var}/opt/opnfv/lib/installer/onos/ -install lib/installer/onos/onos_gw_mac_update.sh %{buildroot}%{_var}/opt/opnfv/lib/installer/onos/ install lib/installer/domain.xml %{buildroot}%{_var}/opt/opnfv/lib/installer/ mkdir -p %{buildroot}%{_docdir}/opnfv/ @@ -120,7 +119,6 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_var}/opt/opnfv/lib/utility-functions.sh %{_var}/opt/opnfv/lib/python/ %{python3_sitelib}/apex/ -%{_var}/opt/opnfv/lib/installer/onos/onos_gw_mac_update.sh %{_var}/opt/opnfv/lib/installer/domain.xml %{_sysconfdir}/bash_completion.d/apex %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-noha.yaml @@ -146,8 +144,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_sysconfdir}/opnfv-apex/os-odl-nofeature-noha.yaml %{_sysconfdir}/opnfv-apex/os-odl-gluon-noha.yaml %{_sysconfdir}/opnfv-apex/os-ovn-nofeature-noha.yaml -#%{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml -#%{_sysconfdir}/opnfv-apex/os-onos-sfc-ha.yaml +%{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml +%{_sysconfdir}/opnfv-apex/os-onos-sfc-ha.yaml %{_sysconfdir}/opnfv-apex/os-ocl-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/network_settings.yaml %{_sysconfdir}/opnfv-apex/network_settings_v6.yaml @@ -176,7 +174,6 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ * Fri Mar 10 2017 Feng Pan <fpan@redhat.com> - 4.0-6 - Add os-odl_l3-fdio-noha.yaml and os-odl_l3-fdio-ha.yaml * Wed Mar 08 2017 Dan Radez <dradez@redhat.com> - 4.0-5 -- Commenting out ONOS, unsupported in Danube - Adding kvm4nfv files - Adding OVN files * Tue Feb 14 2017 Feng Pan <fpan@redhat.com> - 4.0-4 diff --git a/build/variables.sh b/build/variables.sh index f577beca..fe375327 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -16,8 +16,8 @@ CACHE_HISTORY=".cache_history" PATCHES_DIR="${BUILD_ROOT}/patches" rdo_images_uri=${RDO_IMAGES_URI:-http://buildlogs.centos.org/centos/7/cloud/$(uname -p)/tripleo_images/newton/delorean} -onos_release_uri=https://downloads.onosproject.org/nightly/ -onos_release_file=onos-1.8.0-rc6.tar.gz +onos_release_uri=https://downloads.onosproject.org/release/ +onos_release_file=onos-1.8.4.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 |