diff options
| -rw-r--r-- | build/opnfv-apex-common.spec | 13 | ||||
| -rw-r--r-- | build/variables.sh | 2 | ||||
| -rw-r--r-- | config/deploy/os-nosdn-nofeature-noha.yaml | 10 | ||||
| -rw-r--r-- | config/deploy/os-ocl-nofeature-ha.yaml (renamed from config/deploy/os-opencontrail-nofeature-ha.yaml) | 0 |
4 files changed, 17 insertions, 8 deletions
diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec index 8048dea8..0e44ebbc 100644 --- a/build/opnfv-apex-common.spec +++ b/build/opnfv-apex-common.spec @@ -24,6 +24,8 @@ https://wiki.opnfv.org/apex rst2html docs/installation-instructions/index.rst docs/installation-instructions.html rst2html docs/release-notes/release-notes.rst docs/release-notes.html +%global __python %{__python3} + %install mkdir -p %{buildroot}%{_bindir}/ install ci/deploy.sh %{buildroot}%{_bindir}/opnfv-deploy @@ -66,13 +68,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %attr(755,root,root) %{_bindir}/opnfv-util %{_var}/opt/opnfv/lib/common-functions.sh %{_var}/opt/opnfv/lib/utility-functions.sh -%{_var}/opt/opnfv/lib/python/apex-python-utils.py -%{_var}/opt/opnfv/lib/python/apex-python-utils.pyo -%{_var}/opt/opnfv/lib/python/apex-python-utils.pyc -%{python3_sitelib}/apex/ip_utils.py -%{python3_sitelib}/apex/net_env.py -%{python3_sitelib}/apex/__init__.py -%{python3_sitelib}/apex/__pycache__/* +%{_var}/opt/opnfv/lib/python/ +%{python3_sitelib}/apex/ %{_var}/opt/opnfv/lib/installer/onos/onos_gw_mac_update.sh %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml @@ -90,6 +87,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %doc %{_docdir}/opnfv/inventory.yaml.example %changelog +* Sun May 15 2016 Feng Pan <fpan@redhat.com> - 3.0-5 +- Fixes python3 dependency. * Sun May 8 2016 Feng Pan <fpan@redhat.com> - 3.0-4 - Adds dependency for python34-setuptools * Fri Apr 22 2016 Feng Pan <fpan@redhat.com> - 3.0-3 diff --git a/build/variables.sh b/build/variables.sh index 9bb40a9c..115650da 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -9,5 +9,5 @@ ############################################################################## rdo_images_uri=https://ci.centos.org/artifacts/rdo/images/mitaka/delorean/stable/ -onos_release_uri=http://downloads.onosproject.org/release +onos_release_uri=https://dl.dropboxusercontent.com/u/7079970/ onos_release_file=onos-1.5.0.tar.gz diff --git a/config/deploy/os-nosdn-nofeature-noha.yaml b/config/deploy/os-nosdn-nofeature-noha.yaml new file mode 100644 index 00000000..9bda3e8e --- /dev/null +++ b/config/deploy/os-nosdn-nofeature-noha.yaml @@ -0,0 +1,10 @@ +global_params: + ha_enabled: false + +deploy_options: + sdn_controller: false + sdn_l3: false + tacker: false + congress: false + sfc: false + vpn: false diff --git a/config/deploy/os-opencontrail-nofeature-ha.yaml b/config/deploy/os-ocl-nofeature-ha.yaml index f01a8a92..f01a8a92 100644 --- a/config/deploy/os-opencontrail-nofeature-ha.yaml +++ b/config/deploy/os-ocl-nofeature-ha.yaml |