diff options
author | Tim Rozet <trozet@redhat.com> | 2016-10-14 17:50:12 -0400 |
---|---|---|
committer | Tim Rozet <trozet@redhat.com> | 2016-10-15 21:47:31 +0000 |
commit | 6b9fe61995d3cece93fa152b2ef9120690b957b2 (patch) | |
tree | 6d6caa9f367015e89c0b652a165e83387be64aaf /environments | |
parent | 9fa2b4e97b2e60d9bd18d628b16c81bcb0c536cd (diff) |
Disables Neutron ML2 config on Compute for OpenDaylight
This is not needed with ODL and actually triggers deployments to fail
due to missing ODL username/password info on compute nodes.
Depends-On: Ifd906db4e6062ac271c2147fe1149b1009d06ae2
Closes-Bug: 1633630
Change-Id: Ib88e8ef91c393d30c44b86a932103f5a294bc547
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, 2 insertions, 0 deletions
diff --git a/environments/neutron-opendaylight-l3.yaml b/environments/neutron-opendaylight-l3.yaml index 0e8fb9aa..5c47147e 100644 --- a/environments/neutron-opendaylight-l3.yaml +++ b/environments/neutron-opendaylight-l3.yaml @@ -2,6 +2,7 @@ resource_registry: OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None + OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None OS::TripleO::Services::OpenDaylightApi: ../puppet/services/opendaylight-api.yaml OS::TripleO::Services::OpenDaylightOvs: ../puppet/services/opendaylight-ovs.yaml OS::TripleO::Services::NeutronL3Agent: OS::Heat::None diff --git a/environments/neutron-opendaylight.yaml b/environments/neutron-opendaylight.yaml index a0fe4514..8110eab3 100644 --- a/environments/neutron-opendaylight.yaml +++ b/environments/neutron-opendaylight.yaml @@ -2,6 +2,7 @@ resource_registry: OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None + OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None OS::TripleO::Services::OpenDaylightApi: ../puppet/services/opendaylight-api.yaml OS::TripleO::Services::OpenDaylightOvs: ../puppet/services/opendaylight-ovs.yaml |