diff options
author | Tim Rozet <trozet@redhat.com> | 2016-10-14 17:36:26 -0400 |
---|---|---|
committer | Tim Rozet <trozet@redhat.com> | 2016-10-17 11:32:06 -0400 |
commit | 59f19b5e37cfd970a10ece2775f2a6a4b0e508f8 (patch) | |
tree | c6803ad3fad9a6706d659fcd325e3177e01e98be /environments | |
parent | 86f958491e514cc5bfd903742d00a5a81fa4513f (diff) |
Removes EnableODL heat parameter and fixes missing local_ip param
EnableOpenDaylightOnController was not very composable. Removing this
parameter to make the service truly composable. Also fixes missing
local_ip setting for OVS, required for VXLAN or GRE tenant networks.
Closes-Bug: 1633625
Depends-On: Ia55c05e12d5d434111a13e1ed795da530e3ff4a5
Change-Id: I0e07e1631793311334d1436ee8fdf9af2802ba70
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'environments')
-rw-r--r-- | environments/neutron-opendaylight-l3.yaml | 1 | ||||
-rw-r--r-- | environments/neutron-opendaylight.yaml | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/environments/neutron-opendaylight-l3.yaml b/environments/neutron-opendaylight-l3.yaml index 0e8fb9aa..fc0a4378 100644 --- a/environments/neutron-opendaylight-l3.yaml +++ b/environments/neutron-opendaylight-l3.yaml @@ -7,7 +7,6 @@ resource_registry: OS::TripleO::Services::NeutronL3Agent: OS::Heat::None parameter_defaults: - EnableOpenDaylightOnController: true NeutronEnableForceMetadata: true NeutronMechanismDrivers: 'opendaylight' NeutronServicePlugins: "networking_odl.l3.l3_odl.OpenDaylightL3RouterPlugin" diff --git a/environments/neutron-opendaylight.yaml b/environments/neutron-opendaylight.yaml index a0fe4514..1db6879c 100644 --- a/environments/neutron-opendaylight.yaml +++ b/environments/neutron-opendaylight.yaml @@ -6,6 +6,5 @@ resource_registry: OS::TripleO::Services::OpenDaylightOvs: ../puppet/services/opendaylight-ovs.yaml parameter_defaults: - EnableOpenDaylightOnController: true NeutronEnableForceMetadata: true NeutronMechanismDrivers: 'opendaylight' |