X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fdocker.yaml;h=d11ef66ace9bcd93026ce211f7d72640ce135b3a;hb=46bbb1e0645ea8e59548b70184d5023e955a5eab;hp=e7da23837a2507649f7e7711ae7fac401ef0fb2c;hpb=0162749f71c6831f3078ef2c7277f208aac05042;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/docker.yaml b/puppet/services/docker.yaml
index e7da2383..d11ef66a 100644
--- a/puppet/services/docker.yaml
+++ b/puppet/services/docker.yaml
@@ -1,21 +1,23 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   Configures docker on the host
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: tripleoupstream
+  DockerInsecureRegistryAddress:
+    description: Optional. The IP Address and Port of an insecure docker
+                 namespace that will be configured in /etc/sysconfig/docker.
     type: string
-  DockerNamespaceIsRegistry:
-    type: boolean
-    default: false
+    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 +27,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,8 +45,10 @@ 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}
+        if:
+        - insecure_registry_is_empty
+        - {}
+        - tripleo::profile::base::docker::insecure_registry_address: {get_param: DockerInsecureRegistryAddress}
       step_config: |
         include ::tripleo::profile::base::docker
       upgrade_tasks: