From: Tim Rozet Date: Fri, 14 Oct 2016 21:50:12 +0000 (-0400) Subject: Disables Neutron ML2 config on Compute for OpenDaylight X-Git-Tag: opnfv-6.0.0~1472^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=6b9fe61995d3cece93fa152b2ef9120690b957b2;p=apex-tripleo-heat-templates.git 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 --- 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