Merge "Cleanup docker services templates"

diff --cc docker/services/database/mongodb.yaml
Simple merge

diff --cc docker/services/database/mysql.yaml
index 531c1eb,fe45c46..0ffd033
--- 1/docker/services/database/mysql.yaml
--- 2/docker/services/database/mysql.yaml
+++ b/docker/services/database/mysql.yaml
@@@ -135,18 -123,10 +135,15 @@@ outputs
            config_volume: 'mysql_init_tasks'
            puppet_tags: 'mysql_database,mysql_grant,mysql_user'
            step_config: 'include ::tripleo::profile::base::database::mysql'
-           config_image:
-             list_join:
-               - '/'
-               - [ {get_param: DockerNamespace}, {get_param: DockerMysqlImage} ]
+           config_image: *mysql_image
            volumes:
 -            - "mariadb:/var/lib/mysql/:ro"
 +            - "/var/lib/mysql:/var/lib/mysql/:ro"
              - "/var/lib/config-data/mysql/root:/root:ro" #provides .my.cnf
 +      host_prep_tasks:
 +        - name: create /var/lib/mysql
 +          file:
 +            path: /var/lib/mysql
 +            state: directory
        upgrade_tasks:
          - name: Stop and disable mysql service
            tags: step2

diff --cc docker/services/keystone.yaml
Simple merge

diff --cc docker/services/swift-storage.yaml
index 9c8d84e,1b89827..301ef69
--- 1/docker/services/swift-storage.yaml
--- 2/docker/services/swift-storage.yaml
+++ b/docker/services/swift-storage.yaml
@@@ -104,15 -104,12 +104,12 @@@ outputs
                  - '/'
                  - [ {get_param: DockerNamespace}, {get_param: DockerSwiftAccountImage} ]
              user: root
 -            command: ['/bin/bash', '-c', 'mkdir /srv/node && chown swift:swift /srv/node']
 +            command: ['chown', '-R', 'swift:', '/srv/node']
              volumes:
 -              - swift-srv:/srv
 +              - /srv/node:/srv/node
          step_4:
            swift_account_auditor:
-             image:
-               list_join:
-                 - '/'
-                 - [ {get_param: DockerNamespace}, {get_param: DockerSwiftAccountImage} ]
+             image: *swift_account_image
              net: host
              user: swift
              restart: always