diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-21 12:58:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-21 12:58:45 +0000 |
| commit | cc79c92b732354dbd5f8faf3c4047d6de6b0c1e1 (patch) | |
| tree | a5df5b8df17fca0cf0894f18747b3f10cbedce97 /environments | |
| parent | ded5fe48f7cabaa82d13df324940069d69c3aabb (diff) | |
| parent | 59f19b5e37cfd970a10ece2775f2a6a4b0e508f8 (diff) | |
Merge "Removes EnableODL heat parameter and fixes missing local_ip param"
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 5c47147e..00be3048 100644 --- a/environments/neutron-opendaylight-l3.yaml +++ b/environments/neutron-opendaylight-l3.yaml @@ -8,7 +8,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 8110eab3..35c90aab 100644 --- a/environments/neutron-opendaylight.yaml +++ b/environments/neutron-opendaylight.yaml @@ -7,6 +7,5 @@ resource_registry: OS::TripleO::Services::OpenDaylightOvs: ../puppet/services/opendaylight-ovs.yaml parameter_defaults: - EnableOpenDaylightOnController: true NeutronEnableForceMetadata: true NeutronMechanismDrivers: 'opendaylight' |