Merge "Remove DockerNamespace references"

5 files changed, 19 insertions, 51 deletions

diff --git a/docker/firstboot/setup_docker_host.yaml b/docker/firstboot/setup_docker_host.yaml
index 41b036da..ddfa8802 100644
--- a/docker/firstboot/setup_docker_host.yaml
+++ b/docker/firstboot/setup_docker_host.yaml
@@ -1,14 +1,5 @@
 heat_template_version: pike
 
-parameters:
-  DockerNamespace:
-    type: string
-    default: tripleoupstream
-    description: namespace
-  DockerNamespaceIsRegistry:
-    type: boolean
-    default: false
-
 resources:
 
   userdata:
@@ -21,12 +12,7 @@ resources:
     type: OS::Heat::SoftwareConfig
     properties:
       group: script
-      config:
-        str_replace:
-          params:
-            $docker_registry: {get_param: DockerNamespace}
-            $docker_namespace_is_registry: {get_param: DockerNamespaceIsRegistry}
-          template: {get_file: ./setup_docker_host.sh}
+      config: {get_file: ./setup_docker_host.sh}
 
 outputs:
   OS::stack_id:
diff --git a/docker/services/manila-share.yaml b/docker/services/manila-share.yaml
index 9733b6f9..09d1a574 100644
--- a/docker/services/manila-share.yaml
+++ b/docker/services/manila-share.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Manila Share service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerManilaShareImage:
     description: image
-    default: 'centos-binary-manila-share:latest'
     type: string
   DockerManilaConfigImage:
     description: image
-    default: 'centos-binary-manila-base:latest'
     type: string
   EndpointMap:
     default: {}
@@ -72,10 +66,7 @@ outputs:
         config_volume: manila
         puppet_tags: manila_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerManilaConfigImage} ]
+        config_image: {get_param: DockerManilaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/manila_share.json:
           command: /usr/bin/manila-share --config-file /usr/share/manila/manila-dist.conf --config-file /etc/manila/manila.conf
@@ -96,10 +87,7 @@ outputs:
       docker_config:
         step_4:
           manila_share:
-            image: &manila_share_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerManilaShareImage} ]
+            image: &manila_share_image {get_param: DockerManilaShareImage}
             net: host
             restart: always
             volumes:
diff --git a/docker/services/opendaylight-api.yaml b/docker/services/opendaylight-api.yaml
index 7d7892dd..80ca822b 100644
--- a/docker/services/opendaylight-api.yaml
+++ b/docker/services/opendaylight-api.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized OpenDaylight API service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerOpendaylightApiImage:
     description: image
-    default: 'centos-binary-opendaylight:latest'
     type: string
   DockerOpendaylightConfigImage:
     description: image
-    default: 'centos-binary-opendaylight:latest'
     type: string
   EndpointMap:
     default: {}
@@ -77,10 +71,7 @@ outputs:
         # 'file,concat,file_line,augeas' are included by default
         puppet_tags: odl_user,tripleo::profile::base::neutron::opendaylight::configure_cluster
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerOpendaylightConfigImage} ]
+        config_image: {get_param: DockerOpendaylightConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/opendaylight_api.json:
           command: /opt/opendaylight/bin/karaf
@@ -97,10 +88,7 @@ outputs:
         step_1:
           opendaylight_api:
             start_order: 0
-            image: &odl_api_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerOpendaylightApiImage} ]
+            image: &odl_api_image {get_param: DockerOpendaylightApiImage}
             privileged: false
             net: host
             detach: true
diff --git a/environments/docker-centos-tripleoupstream.yaml b/environments/docker-centos-tripleoupstream.yaml
index d94ac6d7..47f8e528 100644
--- a/environments/docker-centos-tripleoupstream.yaml
+++ b/environments/docker-centos-tripleoupstream.yaml
@@ -59,6 +59,7 @@ parameter_defaults:
   DockerManilaApiImage: tripleoupstream/centos-binary-manila-api:latest
   DockerManilaConfigImage: tripleoupstream/centos-binary-manila-api:latest
   DockerManilaSchedulerImage: tripleoupstream/centos-binary-manila-scheduler:latest
+  DockerManilaShareImage: tripleoupstream/centos-binary-manila-share:latest
   DockerMemcachedConfigImage: tripleoupstream/centos-binary-memcached:latest
   DockerMemcachedImage: tripleoupstream/centos-binary-memcached:latest
   DockerMistralApiImage: tripleoupstream/centos-binary-mistral-api:latest
@@ -99,6 +100,8 @@ parameter_defaults:
   DockerOctaviaHealthManagerImage: tripleoupstream/centos-binary-octavia-health-manager:latest
   DockerOctaviaHousekeepingImage: tripleoupstream/centos-binary-octavia-housekeeping:latest
   DockerOctaviaWorkerImage: tripleoupstream/centos-binary-octavia-worker:latest
+  DockerOpendaylightApiImage: tripleoupstream/centos-binary-opendaylight:latest
+  DockerOpendaylightConfigImage: tripleoupstream/centos-binary-opendaylight:latest
   DockerOpenvswitchImage: tripleoupstream/centos-binary-neutron-openvswitch-agent:latest
   DockerPankoApiImage: tripleoupstream/centos-binary-panko-api:latest
   DockerPankoConfigImage: tripleoupstream/centos-binary-panko-api:latest
diff --git a/puppet/services/docker.yaml b/puppet/services/docker.yaml
index d92b666b..d11ef66a 100644
--- a/puppet/services/docker.yaml
+++ b/puppet/services/docker.yaml
@@ -4,13 +4,11 @@ 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
@@ -38,14 +36,19 @@ parameters:
     description: Parameters specific to the role
     type: json
 
+conditions:
+  insecure_registry_is_empty: {equals : [{get_param: DockerInsecureRegistryAddress}, '']}
+
 outputs:
   role_data:
     description: Role data for the docker service
     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: