diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-07 17:04:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-07 17:04:12 +0000 |
| commit | 521b8d418f4b1dd7a4fa65f92737caa03e60f6be (patch) | |
| tree | e4052d9991a55707feaad031db30bec56ef7457d /environments | |
| parent | b301d5edb7dd591d5a1deda41f09b1b42628486e (diff) | |
| parent | 78500bc2e606bd1f80e05d86bf7da4d1d27f77b1 (diff) | |
Merge "Renames OpenDaylight to OpenDaylightApi and splits out OVS configuration"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/neutron-opendaylight-l3.yaml | 2 | ||||
| -rw-r--r-- | environments/neutron-opendaylight.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/environments/neutron-opendaylight-l3.yaml b/environments/neutron-opendaylight-l3.yaml index da915bd8..0e8fb9aa 100644 --- a/environments/neutron-opendaylight-l3.yaml +++ b/environments/neutron-opendaylight-l3.yaml @@ -2,7 +2,7 @@ resource_registry: OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None - OS::TripleO::Services::OpenDaylight: ../puppet/services/opendaylight-api.yaml + 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 88240ed2..a0fe4514 100644 --- a/environments/neutron-opendaylight.yaml +++ b/environments/neutron-opendaylight.yaml @@ -2,7 +2,7 @@ resource_registry: OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None - OS::TripleO::Services::OpenDaylight: ../puppet/services/opendaylight-api.yaml + OS::TripleO::Services::OpenDaylightApi: ../puppet/services/opendaylight-api.yaml OS::TripleO::Services::OpenDaylightOvs: ../puppet/services/opendaylight-ovs.yaml parameter_defaults: |