diff options
| author |   Steven Hardy <shardy@redhat.com> | 2016-08-27 09:52:43 +0100 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2016-08-27 14:15:48 +0100 |
| commit | 49b7064601a58f9d2861674d97934eea05b04592 (patch) | |
| tree | f994da4606b4b252e544f867711574003f110194 | |
| parent | 753131d6b5520552f73c9489274f2bd3c25b9e50 (diff) | |
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
| -rw-r--r-- | environments/neutron-opendaylight-l3.yaml | 2 | ||||
| -rw-r--r-- | environments/neutron-opendaylight.yaml | 2 | ||||
| -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} |