Merge "Renames OpenDaylight to OpenDaylightApi and splits out OVS configuration"

5 files changed, 5 insertions, 15 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:
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index d4a5c6b6..1102a7f4 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -188,7 +188,7 @@ resource_registry:
   OS::TripleO::Services::NovaIronic: OS::Heat::None
   OS::TripleO::Services::TripleoPackages: puppet/services/tripleo-packages.yaml
   OS::TripleO::Services::TripleoFirewall: puppet/services/tripleo-firewall.yaml
-  OS::TripleO::Services::OpenDaylight: OS::Heat::None
+  OS::TripleO::Services::OpenDaylightApi: OS::Heat::None
   OS::TripleO::Services::OpenDaylightOvs: OS::Heat::None
   OS::TripleO::Services::SensuClient: OS::Heat::None
 
diff --git a/puppet/services/opendaylight-api.yaml b/puppet/services/opendaylight-api.yaml
index d2ee036e..30351dfb 100644
--- a/puppet/services/opendaylight-api.yaml
+++ b/puppet/services/opendaylight-api.yaml
@@ -33,14 +33,6 @@ parameters:
     description: List of features to install with ODL
     type: comma_delimited_list
     default: ["odl-netvirt-openstack","odl-netvirt-ui"]
-  OpenDaylightConnectionProtocol:
-    description: L7 protocol used for REST access
-    type: string
-    default: 'http'
-  OpenDaylightCheckURL:
-    description: URL postfix to verify ODL has finished starting up
-    type: string
-    default: 'restconf/operational/network-topology:network-topology/topology/netvirt:1'
   OpenDaylightApiVirtualIP:
     type: string
     default: ''
@@ -67,14 +59,11 @@ outputs:
       config_settings:
         opendaylight::odl_rest_port: {get_param: OpenDaylightPort}
         odl_on_controller: {get_param: EnableOpenDaylightOnController}
-        opendaylight_check_url: {get_param: OpenDaylightCheckURL}
         opendaylight::username: {get_param: OpenDaylightUsername}
         opendaylight::password: {get_param: OpenDaylightPassword}
         opendaylight::enable_l3: {get_param: OpenDaylightEnableL3}
         opendaylight::extra_features: {get_param: OpenDaylightFeatures}
         opendaylight::enable_dhcp: {get_param: OpenDaylightEnableDHCP}
-        opendaylight::nb_connection_protocol: {get_param: OpenDaylightConnectionProtocol}
         opendaylight::odl_bind_ip: {get_param: [ServiceNetMap, OpenDaylightApiNetwork]}
       step_config: |
         include tripleo::profile::base::neutron::opendaylight
-        include tripleo::profile::base::neutron::plugins::ovs::opendaylight
diff --git a/roles_data.yaml b/roles_data.yaml
index f3b64475..86d0e4f5 100644
--- a/roles_data.yaml
+++ b/roles_data.yaml
@@ -90,7 +90,8 @@
     - OS::TripleO::Services::NovaIronic
     - OS::TripleO::Services::TripleoPackages
     - OS::TripleO::Services::TripleoFirewall
-    - OS::TripleO::Services::OpenDaylight
+    - OS::TripleO::Services::OpenDaylightApi
+    - OS::TripleO::Services::OpenDaylightOvs
     - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::FluentdClient
     - OS::TripleO::Services::VipHosts