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 d11ef66..2d8d336 100644 (file)
--- a/puppet/services/docker.yaml
+++ b/puppet/services/docker.yaml
@@ -7,8 +7,9 @@ parameters:
   DockerInsecureRegistryAddress:
     description: Optional. The IP Address and Port of an insecure docker
                  namespace that will be configured in /etc/sysconfig/docker.
-    type: string
-    default: ''
+                 The value can be multiple addresses separated by commas.
+    type: comma_delimited_list
+    default: []
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -37,7 +38,7 @@ parameters:
     type: json
 
 conditions:
-  insecure_registry_is_empty: {equals : [{get_param: DockerInsecureRegistryAddress}, '']}
+  insecure_registry_is_empty: {equals : [{get_param: DockerInsecureRegistryAddress}, []]}
 
 outputs:
   role_data:
@@ -45,14 +46,17 @@ outputs:
     value:
       service_name: docker
       config_settings:
-        if:
-        - insecure_registry_is_empty
-        - {}
-        - tripleo::profile::base::docker::insecure_registry_address: {get_param: DockerInsecureRegistryAddress}
+        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
-