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/rpm_specs/opnfv-apex-common.spec | 10 |
3 files changed, 14 insertions, 9 deletions
diff --git a/build/Makefile b/build/Makefile index dc63bd3e..0bedd9d6 100644 --- a/build/Makefile +++ b/build/Makefile @@ -60,14 +60,17 @@ 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 67a0e511..6387cfb4 100644 --- a/build/c7-opnfv-x86_64-comps.xml +++ b/build/c7-opnfv-x86_64-comps.xml @@ -7839,7 +7839,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> @@ -7865,7 +7865,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/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec index ec0735fc..40b25290 100644 --- a/build/rpm_specs/opnfv-apex-common.spec +++ b/build/rpm_specs/opnfv-apex-common.spec @@ -51,8 +51,8 @@ install config/deploy/os-odl_l2-fdio-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-ap install config/deploy/os-odl_l2-fdio-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-noha.yaml install config/deploy/os-odl_l3-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml install config/deploy/os-odl-gluon-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-gluon-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 @@ -128,8 +128,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl-gluon-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 @@ -145,6 +145,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %doc %{_docdir}/opnfv/inventory.yaml.example %changelog +* Wed Mar 08 2017 Dan Radez <dradez@redhat.com> - 4.0-5 +- Commenting out ONOS, unsupported in Danube * Tue Feb 14 2017 Feng Pan <fpan@redhat.com> - 4.0-4 - Add network_settings_vpp.yaml * Fri Feb 3 2017 Nikolas Hermanns <nikolas.hermanns@ericsson.com> - 4.0-3 |