summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--environments/neutron-opendaylight-l3.yaml2
-rw-r--r--environments/neutron-opendaylight.yaml2
-rw-r--r--puppet/services/opendaylight-api.yaml (renamed from puppet/services/opendaylight.yaml)2
3 files changed, 3 insertions, 3 deletions
diff --git a/environments/neutron-opendaylight-l3.yaml b/environments/neutron-opendaylight-l3.yaml
index 92f02a49..d61270b2 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.yaml
+ OS::TripleO::Services::OpenDaylight: 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 afc2ef98..8fa2e542 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.yaml
+ OS::TripleO::Services::OpenDaylight: puppet/services/opendaylight-api.yaml
OS::TripleO::Services::OpenDaylightOvs: puppet/services/opendaylight-ovs.yaml
parameter_defaults:
diff --git a/puppet/services/opendaylight.yaml b/puppet/services/opendaylight-api.yaml
index c8da7014..64dd7663 100644
--- a/puppet/services/opendaylight.yaml
+++ b/puppet/services/opendaylight-api.yaml
@@ -63,7 +63,7 @@ outputs:
role_data:
description: Role data for the OpenDaylight service.
value:
- service_name: opendaylight
+ service_name: opendaylight_api
config_settings:
opendaylight::odl_rest_port: {get_param: OpenDaylightPort}
odl_on_controller: {get_param: EnableOpenDaylightOnController}