openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Fixing resources path in OpenDaylight"

Browse Source
This commit is contained in:
Jenkins 2016-10-05 14:30:53 +00:00 committed by Gerrit Code Review
commit ef8bf6379e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
environments/neutron-opendaylight-l3.yaml
View File

@ -2,8 +2,8 @@
resource_registry: resource_registry:
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::OpenDaylight: puppet/services/opendaylight-api.yaml OS::TripleO::Services::OpenDaylight: ../puppet/services/opendaylight-api.yaml
OS::TripleO::Services::OpenDaylightOvs: puppet/services/opendaylight-ovs.yaml OS::TripleO::Services::OpenDaylightOvs: ../puppet/services/opendaylight-ovs.yaml
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
parameter_defaults: parameter_defaults:

4
environments/neutron-opendaylight.yaml
View File

@ -2,8 +2,8 @@
resource_registry: resource_registry:
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::OpenDaylight: puppet/services/opendaylight-api.yaml OS::TripleO::Services::OpenDaylight: ../puppet/services/opendaylight-api.yaml
OS::TripleO::Services::OpenDaylightOvs: puppet/services/opendaylight-ovs.yaml OS::TripleO::Services::OpenDaylightOvs: ../puppet/services/opendaylight-ovs.yaml
parameter_defaults: parameter_defaults:
EnableOpenDaylightOnController: true EnableOpenDaylightOnController: true