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

2 files changed, 4 insertions, 30 deletions

diff --git a/docker/services/pacemaker/database/mysql.yaml b/docker/services/pacemaker/database/mysql.yaml
index b87c381a..f38cccfc 100644
--- a/docker/services/pacemaker/database/mysql.yaml
+++ b/docker/services/pacemaker/database/mysql.yaml
@@ -4,17 +4,11 @@ description: >
   MySQL service deployment with pacemaker bundle
 
 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: {}
@@ -70,11 +64,7 @@ outputs:
       config_settings:
         map_merge:
           - {get_attr: [MysqlPuppetBase, role_data, config_settings]}
-          - tripleo::profile::pacemaker::database::mysql_bundle::mysql_docker_image: &mysql_image
-              list_join:
-                - '/'
-                - - {get_param: DockerNamespace}
-                  - {get_param: DockerMysqlImage}
+          - tripleo::profile::pacemaker::database::mysql_bundle::mysql_docker_image: &mysql_image {get_param: DockerMysqlImage}
       step_config: ""
       # BEGIN DOCKER SETTINGS #
       puppet_config:
@@ -86,10 +76,7 @@ outputs:
             - - "['Mysql_datadir', 'Mysql_user', 'Mysql_database', 'Mysql_grant', 'Mysql_plugin'].each |String $val| { noop_resource($val) }"
               - "exec {'wait-for-settle': command => '/bin/true' }"
               - "include ::tripleo::profile::pacemaker::database::mysql_bundle"
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerMysqlConfigImage} ]
+        config_image: {get_param: DockerMysqlConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/mysql.json:
           command: /usr/sbin/pacemaker_remoted
diff --git a/docker/services/pacemaker/database/redis.yaml b/docker/services/pacemaker/database/redis.yaml
index 703d94d0..e124b045 100644
--- a/docker/services/pacemaker/database/redis.yaml
+++ b/docker/services/pacemaker/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: {}
@@ -66,11 +60,7 @@ outputs:
           - redis::service_manage: false
             redis::notify_service: false
             redis::managed_by_cluster_manager: true
-            tripleo::profile::pacemaker::database::redis_bundle::redis_docker_image: &redis_image
-              list_join:
-                - '/'
-                - - {get_param: DockerNamespace}
-                  - {get_param: DockerRedisImage}
+            tripleo::profile::pacemaker::database::redis_bundle::redis_docker_image: &redis_image {get_param: DockerRedisImage}
 
       step_config: ""
       service_config_settings: {get_attr: [RedisBase, role_data, service_config_settings]}
@@ -83,10 +73,7 @@ outputs:
         puppet_tags: 'exec'
         step_config:
           get_attr: [RedisBase, role_data, step_config]
-        config_image: &redis_config_image
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerRedisConfigImage} ]
+        config_image: &redis_config_image {get_param: DockerRedisConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/redis.json:
           command: /usr/sbin/pacemaker_remoted