diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-09-06 20:49:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-09-06 20:49:24 +0000 |
| commit | a1d2af3918c9aeded6668ecb75532c3d820fa18d (patch) | |
| tree | 6fd7f9901f29107dce2c72fd5894b6af424027e8 | |
| parent | d3098f8c48e44be402986f4312079b17f1a133a0 (diff) | |
| parent | 4e8013ea4c29f6ff14a2fcb813ee6bf37db45a88 (diff) | |
Merge "Add param to configure snat mechanism" into stable/pike
| -rw-r--r-- | environments/neutron-opendaylight-dpdk.yaml | 1 | ||||
| -rw-r--r-- | puppet/services/opendaylight-api.yaml | 9 | ||||
| -rw-r--r-- | releasenotes/notes/configuring-snat-in-opendaylight-d5ed4d62275e1876.yaml | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/environments/neutron-opendaylight-dpdk.yaml b/environments/neutron-opendaylight-dpdk.yaml index d675252d..236b2fb9 100644 --- a/environments/neutron-opendaylight-dpdk.yaml +++ b/environments/neutron-opendaylight-dpdk.yaml @@ -12,6 +12,7 @@ parameter_defaults: NeutronMechanismDrivers: 'opendaylight_v2' NeutronServicePlugins: 'odl-router_v2' NovaSchedulerDefaultFilters: "RamFilter,ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter" + OpenDaylightSNATMechanism: 'controller' ComputeOvsDpdkParameters: OvsEnableDpdk: True diff --git a/puppet/services/opendaylight-api.yaml b/puppet/services/opendaylight-api.yaml index 472dbcce..71536ff3 100644 --- a/puppet/services/opendaylight-api.yaml +++ b/puppet/services/opendaylight-api.yaml @@ -62,6 +62,14 @@ parameters: description: Whether to manage the OpenDaylight repository type: boolean default: false + OpenDaylightSNATMechanism: + description: SNAT mechanism to be used + default: 'conntrack' + type: string + constraints: + - allowed_values: + - conntrack + - controller outputs: role_data: @@ -84,6 +92,7 @@ outputs: - 6640 - 6653 - 2550 + opendaylight::snat_mechanism: {get_param: OpenDaylightSNATMechanism} step_config: | include tripleo::profile::base::neutron::opendaylight upgrade_tasks: diff --git a/releasenotes/notes/configuring-snat-in-opendaylight-d5ed4d62275e1876.yaml b/releasenotes/notes/configuring-snat-in-opendaylight-d5ed4d62275e1876.yaml new file mode 100644 index 00000000..31564e09 --- /dev/null +++ b/releasenotes/notes/configuring-snat-in-opendaylight-d5ed4d62275e1876.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Configure OpenDaylight SNAT to use conntrack mechanism with OVS and controller + based mechanism with OVS-DPDK. |