diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-14 18:41:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-14 18:41:37 +0000 |
| commit | 86f958491e514cc5bfd903742d00a5a81fa4513f (patch) | |
| tree | 78f9e8b674f7ec2e585b23b0e5504dcb8dc1b61f | |
| parent | 74317f2b966d6c91150cb33666be7d15e2b31ffe (diff) | |
| parent | 32d7c52bf8a7abb851994c36a846f1770ad5068a (diff) | |
Merge "Fixes missing provider mappings for OpenDaylight"
| -rw-r--r-- | puppet/services/opendaylight-ovs.yaml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/puppet/services/opendaylight-ovs.yaml b/puppet/services/opendaylight-ovs.yaml index 8bcb72f7..ea7410ca 100644 --- a/puppet/services/opendaylight-ovs.yaml +++ b/puppet/services/opendaylight-ovs.yaml @@ -19,6 +19,11 @@ parameters: OpenDaylightApiVirtualIP: type: string default: '' + OpenDaylightProviderMappings: + description: Mappings between logical networks and physical interfaces. + Required for VLAN deployments. For example physnet1 -> eth1. + type: comma_delimited_list + default: "datacentre:br-ex" EndpointMap: default: {} description: Mapping of service endpoint -> protocol. Typically set @@ -43,5 +48,10 @@ outputs: opendaylight::odl_rest_port: {get_param: OpenDaylightPort} opendaylight_check_url: {get_param: OpenDaylightCheckURL} opendaylight::nb_connection_protocol: {get_param: OpenDaylightConnectionProtocol} + neutron::plugins::ovs::opendaylight::provider_mappings: + str_replace: + template: MAPPINGS + params: + MAPPINGS: {get_param: OpenDaylightProviderMappings} step_config: | include tripleo::profile::base::neutron::plugins::ovs::opendaylight |