Change flat network name for nosdn fdio scenario

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

diff --git a/puppet/services/docker.yaml b/puppet/services/docker.yaml
index e7da238..2d8d336 100644 (file)
--- a/puppet/services/docker.yaml
+++ b/puppet/services/docker.yaml
@@ -1,21 +1,24 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   Configures docker on the host
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: tripleoupstream
-    type: string
-  DockerNamespaceIsRegistry:
-    type: boolean
-    default: false
+  DockerInsecureRegistryAddress:
+    description: Optional. The IP Address and Port of an insecure docker
+                 namespace that will be configured in /etc/sysconfig/docker.
+                 The value can be multiple addresses separated by commas.
+    type: comma_delimited_list
+    default: []
   EndpointMap:
     default: {}
     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
@@ -25,6 +28,17 @@ parameters:
   DefaultPasswords:
     default: {}
     type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
+
+conditions:
+  insecure_registry_is_empty: {equals : [{get_param: DockerInsecureRegistryAddress}, []]}
 
 outputs:
   role_data:
@@ -32,12 +46,17 @@ outputs:
     value:
       service_name: docker
       config_settings:
-        tripleo::profile::base::docker::docker_namespace: {get_param: DockerNamespace}
-        tripleo::profile::base::docker::insecure_registry: {get_param: DockerNamespaceIsRegistry}
+        map_merge:
+          - tripleo::profile::base::docker::configure_network: true
+            tripleo::profile::base::docker::network_options: "--bip=172.31.0.1/24"
+          -
+            if:
+            - insecure_registry_is_empty
+            - {}
+            - tripleo::profile::base::docker::insecure_registries: {get_param: DockerInsecureRegistryAddress}
       step_config: |
         include ::tripleo::profile::base::docker
       upgrade_tasks:
         - name: Install docker packages on upgrade if missing
           tags: step3
           yum: name=docker state=latest
-