Put service stop at step1 and quiesce at step2.

[apex-tripleo-heat-templates.git] / puppet / services / opendaylight-api.yaml

diff --git a/puppet/services/opendaylight-api.yaml b/puppet/services/opendaylight-api.yaml
index 30351df..1e7aa47 100644 (file)
--- a/puppet/services/opendaylight-api.yaml
+++ b/puppet/services/opendaylight-api.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   OpenDaylight SDN Controller.
@@ -8,10 +8,6 @@ parameters:
     default: 8081
     description: Set opendaylight service port
     type: number
-  EnableOpenDaylightOnController:
-    default: false
-    description: Whether to install OpenDaylight on control nodes.
-    type: boolean
   OpenDaylightUsername:
     default: 'admin'
     description: The username for the opendaylight server.
@@ -21,10 +17,10 @@ parameters:
     type: string
     description: The password for the opendaylight server.
     hidden: true
-  OpenDaylightEnableL3:
-    description: Knob to enable/disable ODL L3
+  OpenDaylightConnectionProtocol:
+    description: L7 protocol used for REST access
     type: string
-    default: 'no'
+    default: 'http'
   OpenDaylightEnableDHCP:
     description: Knob to enable/disable ODL DHCP Server
     type: boolean
@@ -58,12 +54,17 @@ outputs:
       service_name: opendaylight_api
       config_settings:
         opendaylight::odl_rest_port: {get_param: OpenDaylightPort}
-        odl_on_controller: {get_param: EnableOpenDaylightOnController}
         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::odl_bind_ip: {get_param: [ServiceNetMap, OpenDaylightApiNetwork]}
+        opendaylight::odl_bind_ip: {get_param: [ServiceNetMap, OpendaylightApiNetwork]}
+        opendaylight::nb_connection_protocol: {get_param: OpenDayLightConnectionProtocol}
+        tripleo.opendaylight_api.firewall_rules:
+              '137 opendaylight api':
+                dport:
+                  - {get_param: OpenDaylightPort}
+                  - 6640
+                  - 6653
       step_config: |
         include tripleo::profile::base::neutron::opendaylight