Integration work for ONOS in Danube was not completed.
Disabling this scenario for this release.
Disabling completed mostly by commenting out sections enabling
easy re-enabling next release once integration work is completed.
Change-Id: I1d7b457e8234bf6bb299b9908b356040e68370e5
Signed-off-by: Dan Radez <dradez@redhat.com>
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:
<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>
<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>
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
%{_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
%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
DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight-external.yaml"
SDN_IMAGE=opendaylight
elif [ "${deploy_options_array['sdn_controller']}" == 'onos' ]; then
- if [ "${deploy_options_array['sfc']}" == 'True' ]; then
- DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/onos_sfc.yaml"
- else
- DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/onos.yaml"
- fi
- SDN_IMAGE=onos
+ echo -e "${red}ERROR: ONOS is unsupported in Danube...exiting${reset}"
+ exit 1
+ #if [ "${deploy_options_array['sfc']}" == 'True' ]; then
+ # DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/onos_sfc.yaml"
+ #else
+ # DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/onos.yaml"
+ #fi
+ #SDN_IMAGE=onos
elif [ "${deploy_options_array['sdn_controller']}" == 'opencontrail' ]; then
echo -e "${red}ERROR: OpenContrail is currently unsupported...exiting${reset}"
exit 1