openstack
/
kolla-ansible
Code Issues Proposed changes

Merge "Improve ODL configuration"

This commit is contained in:
Zuul 2018-08-30 09:44:37 +00:00 committed by Gerrit Code Review
parent cfee876895 6e17f942b5
commit f16a467758
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/group_vars/all.yml
View File

@ -813,7 +813,6 @@ vmware_vcenter_insecure: "True"
######################
# OpenDaylight
######################
opendaylight_release: "0.6.2-Carbon"
opendaylight_mechanism_driver: "opendaylight_v2"
opendaylight_l3_service_plugin: "odl-router_v2"
opendaylight_acl_impl: "learn"

6
ansible/roles/opendaylight/templates/org.apache.karaf.features.cfg.j2
View File

@ -17,7 +17,11 @@
#
################################################################################
featuresRepositories = mvn:org.apache.karaf.features/standard/3.0.8/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.8/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.2.9/xml/features,mvn:org.apache.karaf.features/spring/3.0.8/xml/features,mvn:org.opendaylight.integration/features-integration-index/{{ opendaylight_release }}/xml/features
featuresRepositories = mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features, \
mvn:org.apache.karaf.features/enterprise/${karaf.version}/xml/features, \
mvn:org.ops4j.pax.web/pax-web-features/3.2.9/xml/features, \
mvn:org.apache.karaf.features/spring/${karaf.version}/xml/features, \
mvn:org.opendaylight.integration/features-integration-index/${project.version}/xml/features
featuresBoot=config,standard,region,package,kar,ssh,management{% if not opendaylight_features == '' %},{% endif %}{{ opendaylight_features }}

2
doc/source/reference/networking-guide.rst
View File

@ -142,7 +142,6 @@ OpenDaylight ``globals.yml`` configurable options with their defaults include:
.. code-block:: yaml
opendaylight_release: "0.6.1-Carbon"
opendaylight_mechanism_driver: "opendaylight_v2"
opendaylight_l3_service_plugin: "odl-router_v2"
opendaylight_acl_impl: "learn"
@ -537,4 +536,3 @@ Verify VF devices were created and the instance starts successfully as in
the Neutron SRIOV case.
For more information see `OpenStack PCI passthrough documentation <https://docs.openstack.org/nova/pike/admin/pci-passthrough.html>`_.

5
releasenotes/notes/opendaylight_release-removal-5077cd473bee6dbd.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
``opendaylight_release`` variable is removed, version is discovered automatically
while booting features.