diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-08-29 08:48:41 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-08-29 08:48:41 +0000 |
commit | 649a24d1e41e3b33517e844fed794027a271a963 (patch) | |
tree | c7af4270f7076cae5216b4e5ad078b731049085b | |
parent | 1b020799c971e5091a17b713c291d8d8fb97165c (diff) | |
parent | 49b7064601a58f9d2861674d97934eea05b04592 (diff) |
Merge "Rename opendaylight service to opendaylight_api"
-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} |