X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fopendaylight-api.yaml;h=0ed9d20641746b1ee9d1a5dd4bc5bcc8dd1f1161;hb=227364a82f600b3ee25f73e38f42f4e83600541b;hp=d2ee036e843ba77f05187cfb88bb331dac082015;hpb=5124693c0e2ce39ac5cadb79f42c7dd36d7041f8;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/opendaylight-api.yaml b/puppet/services/opendaylight-api.yaml
index d2ee036e..0ed9d206 100644
--- 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,6 @@ parameters:
     type: string
     description: The password for the opendaylight server.
     hidden: true
-  OpenDaylightEnableL3:
-    description: Knob to enable/disable ODL L3
-    type: string
-    default: 'no'
   OpenDaylightEnableDHCP:
     description: Knob to enable/disable ODL DHCP Server
     type: boolean
@@ -33,14 +25,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: ''
@@ -66,15 +50,16 @@ outputs:
       service_name: opendaylight_api
       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]}
+        opendaylight::odl_bind_ip: {get_param: [ServiceNetMap, OpendaylightApiNetwork]}
+        tripleo.opendaylight_api.firewall_rules:
+              '137 opendaylight api':
+                dport:
+                  - {get_param: OpenDaylightPort}
+                  - 6640
+                  - 6653
       step_config: |
         include tripleo::profile::base::neutron::opendaylight
-        include tripleo::profile::base::neutron::plugins::ovs::opendaylight