Rename opendaylight service to opendaylight_api

For compatibility with the custom-roles patches which convert
hard-coded hiera mappings (such as opendaylight_api_node_ips) to
data generated based on the service_name, we need to either change
this name to match the hiera (node_ips and vip) keys, or change the
hiera keys to match the service.  I took the former approach because
it involves less juggling patch dependencies between t-h-t and p-t.

Change-Id: Ic179550027f37946097afe0e5b9f504ea19fa7bc
Partially-Implements: blueprint custom-roles

diff --git a/environments/neutron-opendaylight-l3.yaml b/environments/neutron-opendaylight-l3.yaml
index 92f02a4..d61270b 100644 (file)
--- 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 afc2ef9..8fa2e54 100644 (file)
--- 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
similarity index 98%
rename from puppet/services/opendaylight.yaml
rename to puppet/services/opendaylight-api.yaml
index c8da701..64dd766 100644 (file)
--- 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}