Merge "Use a single configuration file for specifying docker containers."

4 files changed, 7 insertions, 51 deletions

diff --git a/docker/services/database/mongodb.yaml b/docker/services/database/mongodb.yaml
index 62e20094..5ba79b31 100644
--- a/docker/services/database/mongodb.yaml
+++ b/docker/services/database/mongodb.yaml
@@ -4,17 +4,11 @@ description: >
   MongoDB service deployment using puppet and docker
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerMongodbImage:
     description: image
-    default: 'centos-binary-mongodb:latest'
     type: string
   DockerMongodbConfigImage:
     description: The container image to use for the mongodb config_volume
-    default: 'centos-binary-mongodb:latest'
     type: string
   EndpointMap:
     default: {}
@@ -74,10 +68,7 @@ outputs:
         config_volume: mongodb
         puppet_tags: file # set this even though file is the default
         step_config: *step_config
-        config_image: &mongodb_config_image
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerMongodbConfigImage} ]
+        config_image: &mongodb_config_image {get_param: DockerMongodbConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/mongodb.json:
           command: /usr/bin/mongod --unixSocketPrefix=/var/run/mongodb --config /etc/mongod.conf run
@@ -96,10 +87,7 @@ outputs:
       docker_config:
         step_2:
           mongodb:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerMongodbImage} ]
+            image: {get_param: DockerMongodbImage}
             net: host
             privileged: false
             volumes: &mongodb_volumes
diff --git a/docker/services/database/mysql-client.yaml b/docker/services/database/mysql-client.yaml
index 9e51aeab..d45d58e1 100644
--- a/docker/services/database/mysql-client.yaml
+++ b/docker/services/database/mysql-client.yaml
@@ -4,13 +4,8 @@ description: >
   Configuration for containerized MySQL clients
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerMysqlClientConfigImage:
     description: The container image to use for the mysql_client config_volume
-    default: 'centos-binary-mariadb:latest'
     type: string
   ServiceData:
     default: {}
@@ -62,9 +57,6 @@ outputs:
         config_volume: mysql_client
         puppet_tags: file # set this even though file is the default
         step_config: "include ::tripleo::profile::base::database::mysql::client"
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerMysqlClientConfigImage} ]
+        config_image: {get_param: DockerMysqlClientConfigImage}
       # no need for a docker config, this service only generates configuration files
       docker_config: {}
diff --git a/docker/services/database/mysql.yaml b/docker/services/database/mysql.yaml
index 40744bbf..54331415 100644
--- a/docker/services/database/mysql.yaml
+++ b/docker/services/database/mysql.yaml
@@ -4,17 +4,11 @@ description: >
   MySQL service deployment using puppet
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerMysqlImage:
     description: image
-    default: 'centos-binary-mariadb:latest'
     type: string
   DockerMysqlConfigImage:
     description: The container image to use for the mysql config_volume
-    default: 'centos-binary-mariadb:latest'
     type: string
   EndpointMap:
     default: {}
@@ -83,10 +77,7 @@ outputs:
         config_volume: mysql
         puppet_tags: file # set this even though file is the default
         step_config: *step_config
-        config_image: &mysql_config_image
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerMysqlConfigImage} ]
+        config_image: &mysql_config_image {get_param: DockerMysqlConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/mysql.json:
           command: /usr/bin/mysqld_safe
@@ -103,10 +94,7 @@ outputs:
         # Kolla_bootstrap runs before permissions set by kolla_config
         step_1:
           mysql_init_logs:
-            image: &mysql_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerMysqlImage} ]
+            image: &mysql_image {get_param: DockerMysqlImage}
             privileged: false
             user: root
             volumes:
diff --git a/docker/services/database/redis.yaml b/docker/services/database/redis.yaml
index 8696d216..980a8c6d 100644
--- a/docker/services/database/redis.yaml
+++ b/docker/services/database/redis.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Redis services
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerRedisImage:
     description: image
-    default: 'centos-binary-redis:latest'
     type: string
   DockerRedisConfigImage:
     description: The container image to use for the redis config_volume
-    default: 'centos-binary-redis:latest'
     type: string
   EndpointMap:
     default: {}
@@ -73,10 +67,7 @@ outputs:
         # https://github.com/arioch/puppet-redis/commit/1c004143223e660cbd433422ff8194508aab9763
         puppet_tags: 'exec'
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerRedisConfigImage} ]
+        config_image: {get_param: DockerRedisConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/redis.json:
           command: /usr/bin/redis-server /etc/redis.conf
@@ -94,10 +85,7 @@ outputs:
           redis_init_logs:
             start_order: 0
             detach: false
-            image: &redis_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerRedisImage} ]
+            image: &redis_image {get_param: DockerRedisImage}
             privileged: false
             user: root
             volumes: