Change flat network name for nosdn fdio scenario

[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 54e49b5..1feb62b 100644 (file)
--- a/puppet/services/opendaylight-api.yaml
+++ b/puppet/services/opendaylight-api.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenDaylight SDN Controller.
@@ -37,6 +37,10 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -54,6 +58,18 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  OpenDaylightManageRepositories:
+    description: Whether to manage the OpenDaylight repository
+    type: boolean
+    default: false
+  OpenDaylightSNATMechanism:
+    description: SNAT mechanism to be used
+    default: 'conntrack'
+    type: string
+    constraints:
+      - allowed_values:
+          - conntrack
+          - controller
 
 outputs:
   role_data:
@@ -68,6 +84,7 @@ outputs:
         opendaylight::enable_dhcp: {get_param: OpenDaylightEnableDHCP}
         opendaylight::odl_bind_ip: {get_param: [ServiceNetMap, OpendaylightApiNetwork]}
         opendaylight::nb_connection_protocol: {get_param: OpenDaylightConnectionProtocol}
+        opendaylight::manage_repositories: {get_param: OpenDaylightManageRepositories}
         tripleo.opendaylight_api.firewall_rules:
               '137 opendaylight api':
                 dport:
@@ -75,6 +92,8 @@ outputs:
                   - 6640
                   - 6653
                   - 2550
+                  - 8185
+        opendaylight::snat_mechanism: {get_param: OpenDaylightSNATMechanism}
       step_config: |
         include tripleo::profile::base::neutron::opendaylight
       upgrade_tasks: