Merge "Drop step_config as top level docker requirement"

5 years ago · 6a72a9f1b4
parent 6bae8ba2a5 a307fe7ffc
commit 6a72a9f1b4
103 changed files with 323 additions and 429 deletions
--- a/docker/services/README.rst
+++ b/docker/services/README.rst
@ -52,11 +52,6 @@ are re-asserted when applying latter ones.
   puppet/services templates and only need to be appended
   to on accasion if docker specific config settings are required.

- * step_config: This setting controls the manifest that is used to
-   create docker config files via puppet. The puppet tags below are
-   used along with this manifest to generate a config directory for
-   this container.
-
 * kolla_config: Contains YAML that represents how to map config files
   into the kolla container. This config file is typically mapped into
   the container itself at the /var/lib/kolla/config_files/config.json
--- a/docker/services/aodh-api.yaml
+++ b/docker/services/aodh-api.yaml
@ -76,17 +76,16 @@ outputs:
          - apache::default_vhost: false
      logging_source: {get_attr: [AodhApiPuppetBase, role_data, logging_source]}
      logging_groups: {get_attr: [AodhApiPuppetBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [AodhApiPuppetBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
      service_config_settings: {get_attr: [AodhApiPuppetBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: aodh
        puppet_tags: aodh_api_paste_ini,aodh_config
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [AodhApiPuppetBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
        config_image: {get_param: DockerAodhConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/aodh_api.json:
--- a/docker/services/aodh-evaluator.yaml
+++ b/docker/services/aodh-evaluator.yaml
@ -69,17 +69,16 @@ outputs:
          - get_attr: [AodhEvaluatorBase, role_data, config_settings]
      logging_source: {get_attr: [AodhEvaluatorBase, role_data, logging_source]}
      logging_groups: {get_attr: [AodhEvaluatorBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [AodhEvaluatorBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
      service_config_settings: {get_attr: [AodhEvaluatorBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: aodh
        puppet_tags: aodh_config
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [AodhEvaluatorBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
        config_image: {get_param: DockerAodhConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/aodh_evaluator.json:
--- a/docker/services/aodh-listener.yaml
+++ b/docker/services/aodh-listener.yaml
@ -69,17 +69,16 @@ outputs:
          - get_attr: [AodhListenerBase, role_data, config_settings]
      logging_source: {get_attr: [AodhListenerBase, role_data, logging_source]}
      logging_groups: {get_attr: [AodhListenerBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [AodhListenerBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
      service_config_settings: {get_attr: [AodhListenerBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: aodh
        puppet_tags: aodh_config
-        step_config: *step_config
+        step_config:
+            list_join:
+              - "\n"
+              - - {get_attr: [AodhListenerBase, role_data, step_config]}
+                - {get_attr: [MySQLClient, role_data, step_config]}
        config_image: {get_param: DockerAodhConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/aodh_listener.json:
--- a/docker/services/aodh-notifier.yaml
+++ b/docker/services/aodh-notifier.yaml
@ -69,17 +69,16 @@ outputs:
          - get_attr: [AodhNotifierBase, role_data, config_settings]
      logging_source: {get_attr: [AodhNotifierBase, role_data, logging_source]}
      logging_groups: {get_attr: [AodhNotifierBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [AodhNotifierBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
      service_config_settings: {get_attr: [AodhNotifierBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: aodh
        puppet_tags: aodh_config
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [AodhNotifierBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
        config_image: {get_param: DockerAodhConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/aodh_notifier.json:
--- a/docker/services/barbican-api.yaml
+++ b/docker/services/barbican-api.yaml
@ -77,17 +77,16 @@ outputs:
          - apache::default_vhost: false
      logging_source: {get_attr: [BarbicanApiBase, role_data, logging_source]}
      logging_groups: {get_attr: [BarbicanApiBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [BarbicanApiBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
      service_config_settings: {get_attr: [BarbicanApiBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: barbican
        puppet_tags: barbican_api_paste_ini,barbican_config
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [BarbicanApiBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
        config_image: {get_param: DockerBarbicanConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/barbican_api.json:
--- a/docker/services/ceilometer-agent-central.yaml
+++ b/docker/services/ceilometer-agent-central.yaml
@ -64,14 +64,13 @@ outputs:
      config_settings: {get_attr: [CeilometerAgentCentralBase, role_data, config_settings]}
      logging_source: {get_attr: [CeilometerAgentCentralBase, role_data, logging_source]}
      logging_groups: {get_attr: [CeilometerAgentCentralBase, role_data, logging_groups]}
-      step_config: &step_config
-        get_attr: [CeilometerAgentCentralBase, role_data, step_config]
      service_config_settings: {get_attr: [CeilometerAgentCentralBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: ceilometer
        puppet_tags: ceilometer_config
-        step_config: *step_config
+        step_config:
+          get_attr: [CeilometerAgentCentralBase, role_data, step_config]
        config_image: {get_param: DockerCeilometerConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/ceilometer_agent_central.json:
--- a/docker/services/ceilometer-agent-compute.yaml
+++ b/docker/services/ceilometer-agent-compute.yaml
@ -64,14 +64,13 @@ outputs:
      config_settings: {get_attr: [CeilometerAgentComputeBase, role_data, config_settings]}
      logging_source: {get_attr: [CeilometerAgentComputeBase, role_data, logging_source]}
      logging_groups: {get_attr: [CeilometerAgentComputeBase, role_data, logging_groups]}
-      step_config: &step_config
-        get_attr: [CeilometerAgentComputeBase, role_data, step_config]
      service_config_settings: {get_attr: [CeilometerAgentComputeBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: ceilometer
        puppet_tags: ceilometer_config
-        step_config: *step_config
+        step_config:
+          get_attr: [CeilometerAgentComputeBase, role_data, step_config]
        config_image: {get_param: DockerCeilometerConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/ceilometer_agent_compute.json:
--- a/docker/services/ceilometer-agent-ipmi.yaml
+++ b/docker/services/ceilometer-agent-ipmi.yaml
@ -64,14 +64,13 @@ outputs:
      config_settings: {get_attr: [CeilometerAgentIpmiBase, role_data, config_settings]}
      logging_source: {get_attr: [CeilometerAgentIpmiBase, role_data, logging_source]}
      logging_groups: {get_attr: [CeilometerAgentIpmiBase, role_data, logging_groups]}
-      step_config: &step_config
-        get_attr: [CeilometerAgentIpmiBase, role_data, step_config]
      service_config_settings: {get_attr: [CeilometerAgentIpmiBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: ceilometer
        puppet_tags: ceilometer_config
-        step_config: *step_config
+        step_config:
+          get_attr: [CeilometerAgentIpmiBase, role_data, step_config]
        config_image: {get_param: DockerCeilometerConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/ceilometer-agent-ipmi.json:
--- a/docker/services/ceilometer-agent-notification.yaml
+++ b/docker/services/ceilometer-agent-notification.yaml
@ -64,14 +64,13 @@ outputs:
      config_settings: {get_attr: [CeilometerAgentNotificationBase, role_data, config_settings]}
      logging_source: {get_attr: [CeilometerAgentNotificationBase, role_data, logging_source]}
      logging_groups: {get_attr: [CeilometerAgentNotificationBase, role_data, logging_groups]}
-      step_config: &step_config
-        get_attr: [CeilometerAgentNotificationBase, role_data, step_config]
      service_config_settings: {get_attr: [CeilometerAgentNotificationBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: ceilometer
        puppet_tags: ceilometer_config
-        step_config: *step_config
+        step_config:
+          get_attr: [CeilometerAgentNotificationBase, role_data, step_config]
        config_image: {get_param: DockerCeilometerConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/ceilometer_agent_notification.json:
--- a/docker/services/ceph-ansible/ceph-base.yaml
+++ b/docker/services/ceph-ansible/ceph-base.yaml
@ -182,7 +182,6 @@ outputs:
    value:
      service_name: ceph_base
      upgrade_tasks: []
-      step_config: ''
      puppet_config:
        config_image: ''
        config_volume: ''
--- a/docker/services/ceph-ansible/ceph-client.yaml
+++ b/docker/services/ceph-ansible/ceph-client.yaml
@ -48,7 +48,6 @@ outputs:
    value:
      service_name: ceph_client
      upgrade_tasks: []
-      step_config: ''
      puppet_config:
        config_image: ''
        config_volume: ''
--- a/docker/services/ceph-ansible/ceph-external.yaml
+++ b/docker/services/ceph-ansible/ceph-external.yaml
@ -52,7 +52,6 @@ outputs:
    value:
      service_name: ceph_client
      upgrade_tasks: []
-      step_config: ''
      puppet_config:
        config_image: ''
        config_volume: ''
@ -63,4 +62,4 @@ outputs:
        ceph_client_ansible_vars:
          map_merge:
          - {get_attr: [CephBase, role_data, config_settings, ceph_common_ansible_vars]}
-          - external_cluster_mon_ips: {get_param: CephExternalMonHost}
+          - external_cluster_mon_ips: {get_param: CephExternalMonHost}
--- a/docker/services/ceph-ansible/ceph-mds.yaml
+++ b/docker/services/ceph-ansible/ceph-mds.yaml
@ -68,7 +68,6 @@ outputs:
    value:
      service_name: ceph_mds
      upgrade_tasks: []
-      step_config: ''
      puppet_config:
        config_image: ''
        config_volume: ''
--- a/docker/services/ceph-ansible/ceph-mon.yaml
+++ b/docker/services/ceph-ansible/ceph-mon.yaml
@ -65,7 +65,6 @@ outputs:
    value:
      service_name: ceph_mon
      upgrade_tasks: []
-      step_config: ''
      puppet_config:
        config_image: ''
        config_volume: ''
--- a/docker/services/ceph-ansible/ceph-osd.yaml
+++ b/docker/services/ceph-ansible/ceph-osd.yaml
@ -59,7 +59,6 @@ outputs:
        - name: Check legacy Ceph hieradata
          tags: step0,validation
          shell: test "nil" == "$(hiera -c /etc/puppet/hiera.yaml ceph::profile::params::osds)"
-      step_config: ''
      puppet_config:
        config_image: ''
        config_volume: ''
@ -76,4 +75,4 @@ outputs:
            map_merge:
            - {get_attr: [CephBase, role_data, config_settings, ceph_common_ansible_vars]}
            - osd_objectstore: filestore
-            - {get_param: CephAnsibleDisksConfig}
+            - {get_param: CephAnsibleDisksConfig}
--- a/docker/services/ceph-ansible/ceph-rgw.yaml
+++ b/docker/services/ceph-ansible/ceph-rgw.yaml
@ -56,7 +56,6 @@ outputs:
    value:
      service_name: ceph_rgw
      upgrade_tasks: []
-      step_config: ''
      puppet_config:
        config_image: ''
        config_volume: ''
--- a/docker/services/cinder-api.yaml
+++ b/docker/services/cinder-api.yaml
@ -74,17 +74,16 @@ outputs:
      config_settings: {get_attr: [CinderBase, role_data, config_settings]}
      logging_source: {get_attr: [CinderBase, role_data, logging_source]}
      logging_groups: {get_attr: [CinderBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [CinderBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
      service_config_settings: {get_attr: [CinderBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: cinder
        puppet_tags: cinder_config,file,concat,file_line
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [CinderBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
        config_image: {get_param: DockerCinderConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/cinder_api.json:
--- a/docker/services/cinder-backup.yaml
+++ b/docker/services/cinder-backup.yaml
@ -67,17 +67,16 @@ outputs:
      config_settings: {get_attr: [CinderBase, role_data, config_settings]}
      logging_source: {get_attr: [CinderBase, role_data, logging_source]}
      logging_groups: {get_attr: [CinderBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [CinderBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
      service_config_settings: {get_attr: [CinderBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: cinder
        puppet_tags: cinder_config,file,concat,file_line
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [CinderBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
        config_image: {get_param: DockerCinderConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/cinder_backup.json:
--- a/docker/services/cinder-scheduler.yaml
+++ b/docker/services/cinder-scheduler.yaml
@ -67,17 +67,16 @@ outputs:
      config_settings: {get_attr: [CinderBase, role_data, config_settings]}
      logging_source: {get_attr: [CinderBase, role_data, logging_source]}
      logging_groups: {get_attr: [CinderBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [CinderBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
      service_config_settings: {get_attr: [CinderBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: cinder
        puppet_tags: cinder_config,file,concat,file_line
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [CinderBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
        config_image: {get_param: DockerCinderConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/cinder_scheduler.json:
--- a/docker/services/cinder-volume.yaml
+++ b/docker/services/cinder-volume.yaml
@ -79,18 +79,17 @@ outputs:
          - tripleo::profile::base::lvm::enable_udev: false
      logging_source: {get_attr: [CinderBase, role_data, logging_source]}
      logging_groups: {get_attr: [CinderBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - "include ::tripleo::profile::base::lvm"
-            - get_attr: [CinderBase, role_data, step_config]
-            - get_attr: [MySQLClient, role_data, step_config]
      service_config_settings: {get_attr: [CinderBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: cinder
        puppet_tags: cinder_config,file,concat,file_line
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - "include ::tripleo::profile::base::lvm"
+              - get_attr: [CinderBase, role_data, step_config]
+              - get_attr: [MySQLClient, role_data, step_config]
        config_image: {get_param: DockerCinderConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/cinder_volume.json:
--- a/docker/services/collectd.yaml
+++ b/docker/services/collectd.yaml
@ -68,14 +68,13 @@ outputs:
            collectd::plugin::logfile::log_file: /var/log/collectd/collectd.log
      logging_source: {get_attr: [CollectdBase, role_data, logging_source]}
      logging_groups: {get_attr: [CollectdBase, role_data, logging_groups]}
-      step_config: &step_config
-        get_attr: [CollectdBase, role_data, step_config]
      service_config_settings: {get_attr: [CollectdBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: collectd
        puppet_tags:  collectd_client_config
-        step_config: *step_config
+        step_config:
+          get_attr: [CollectdBase, role_data, step_config]
        config_image: {get_param: DockerCollectdConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/collectd.json:
--- a/docker/services/congress.yaml
+++ b/docker/services/congress.yaml
@ -69,17 +69,16 @@ outputs:
          - get_attr: [CongressBase, role_data, config_settings]
      logging_source: {get_attr: [CongressBase, role_data, logging_source]}
      logging_groups: {get_attr: [CongressBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [CongressBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
      service_config_settings: {get_attr: [CongressBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: congress
        puppet_tags: congress_config
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [CongressBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
        config_image: {get_param: DockerCongressConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/congress_api.json:
--- a/docker/services/database/mongodb.yaml
+++ b/docker/services/database/mongodb.yaml
@ -72,16 +72,15 @@ outputs:
          - mongodb::server::fork: false
      logging_source: {get_attr: [MongodbPuppetBase, role_data, logging_source]}
      logging_groups: {get_attr: [MongodbPuppetBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - "['Mongodb_database', 'Mongodb_user', 'Mongodb_replset'].each |String $val| { noop_resource($val) }"
-            - {get_attr: [MongodbPuppetBase, role_data, step_config]}
      # BEGIN DOCKER SETTINGS #
      puppet_config:
        config_volume: mongodb
        puppet_tags: file # set this even though file is the default
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - "['Mongodb_database', 'Mongodb_user', 'Mongodb_replset'].each |String $val| { noop_resource($val) }"
+              - {get_attr: [MongodbPuppetBase, role_data, step_config]}
        config_image: &mongodb_config_image {get_param: DockerMongodbConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/mongodb.json:
--- a/docker/services/database/mysql.yaml
+++ b/docker/services/database/mysql.yaml
@ -81,16 +81,15 @@ outputs:
                pid-file: /var/lib/mysql/mariadb.pid
      logging_source: {get_attr: [MysqlPuppetBase, role_data, logging_source]}
      logging_groups: {get_attr: [MysqlPuppetBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - "['Mysql_datadir', 'Mysql_user', 'Mysql_database', 'Mysql_grant', 'Mysql_plugin'].each |String $val| { noop_resource($val) }"
-            - {get_attr: [MysqlPuppetBase, role_data, step_config]}
      # BEGIN DOCKER SETTINGS #
      puppet_config:
        config_volume: mysql
        puppet_tags: file # set this even though file is the default
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - "['Mysql_datadir', 'Mysql_user', 'Mysql_database', 'Mysql_grant', 'Mysql_plugin'].each |String $val| { noop_resource($val) }"
+              - {get_attr: [MysqlPuppetBase, role_data, step_config]}
        config_image: &mysql_config_image {get_param: DockerMysqlConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/mysql.json:
--- a/docker/services/database/redis.yaml
+++ b/docker/services/database/redis.yaml
@ -70,8 +70,6 @@ outputs:
            tripleo::stunnel::foreground: 'yes'
      logging_source: {get_attr: [RedisBase, role_data, logging_source]}
      logging_groups: {get_attr: [RedisBase, role_data, logging_groups]}
-      step_config: &step_config
-        get_attr: [RedisBase, role_data, step_config]
      service_config_settings: {get_attr: [RedisBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
@ -80,7 +78,8 @@ outputs:
        # /etc/redis.conf
        # https://github.com/arioch/puppet-redis/commit/1c004143223e660cbd433422ff8194508aab9763
        puppet_tags: 'exec'
-        step_config: *step_config
+        step_config:
+          get_attr: [RedisBase, role_data, step_config]
        config_image: {get_param: DockerRedisConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/redis.json:
--- a/docker/services/ec2-api.yaml
+++ b/docker/services/ec2-api.yaml
@ -62,17 +62,16 @@ outputs:
      config_settings: {get_attr: [Ec2ApiPuppetBase, role_data, config_settings]}
      logging_source: {get_attr: [Ec2ApiPuppetBase, role_data, logging_source]}
      logging_groups: {get_attr: [Ec2ApiPuppetBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [Ec2ApiPuppetBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
      service_config_settings: {get_attr: [Ec2ApiPuppetBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: ec2_api
        puppet_tags: ec2api_api_paste_ini,ec2api_config
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [Ec2ApiPuppetBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
        config_image: {get_param: DockerEc2ApiConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/ec2_api.json:
--- a/docker/services/etcd.yaml
+++ b/docker/services/etcd.yaml
@ -59,11 +59,6 @@ outputs:
      service_name: {get_attr: [EtcdPuppetBase, role_data, service_name]}
      logging_source: {get_attr: [EtcdPuppetBase, role_data, logging_source]}
      logging_groups: {get_attr: [EtcdPuppetBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - "['Etcd_key'].each |String $val| { noop_resource($val) }"
-            - get_attr: [EtcdPuppetBase, role_data, step_config]
      config_settings:
        map_merge:
          - {get_attr: [EtcdPuppetBase, role_data, config_settings]}
@ -71,8 +66,12 @@ outputs:
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: etcd
-        step_config: *step_config
        config_image: &etcd_config_image {get_param: DockerEtcdConfigImage}
+        step_config:
+          list_join:
+            - "\n"
+            - - "['Etcd_key'].each |String $val| { noop_resource($val) }"
+              - get_attr: [EtcdPuppetBase, role_data, step_config]
      kolla_config:
        /var/lib/kolla/config_files/etcd.json:
          command: /usr/bin/etcd --config-file /etc/etcd/etcd.yml
@ -104,7 +103,8 @@ outputs:
        step_2:
          config_volume: 'etcd_init_tasks'
          puppet_tags: 'etcd_key'
-          step_config: 'include ::tripleo::profile::base::etcd'
+          step_config:
+            get_attr: [EtcdPuppetBase, role_data, step_config]
          config_image: *etcd_config_image
          volumes:
            - /var/lib/config-data/etcd/etc/etcd/:/etc/etcd:ro
--- a/docker/services/fluentd-client.yaml
+++ b/docker/services/fluentd-client.yaml
@ -63,13 +63,12 @@ outputs:
          - tripleo::profile::base::logging::fluentd::fluentd_path_transform:
              - /var/log/
              - /var/log/containers/
-      step_config: &step_config
-        get_attr: [FluentdClientBase, role_data, step_config]
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: fluentd
        puppet_tags: config
-        step_config: *step_config
+        step_config:
+          get_attr: [FluentdClientBase, role_data, step_config]
        config_image: {get_param: DockerFluentdConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/fluentd.json:
--- a/docker/services/glance-api.yaml
+++ b/docker/services/glance-api.yaml
@ -106,17 +106,16 @@ outputs:
          - glance::api::sync_db: false
      logging_source: {get_attr: [GlanceApiPuppetBase, role_data, logging_source]}
      logging_groups: {get_attr: [GlanceApiPuppetBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [GlanceApiPuppetBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
      service_config_settings: {get_attr: [GlanceApiPuppetBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS #
      puppet_config:
        config_volume: glance_api
        puppet_tags: glance_api_config,glance_api_paste_ini,glance_swift_config,glance_cache_config
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [GlanceApiPuppetBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
        config_image: {get_param: DockerGlanceApiConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/glance_api.json:
--- a/docker/services/gnocchi-api.yaml
+++ b/docker/services/gnocchi-api.yaml
@ -73,14 +73,13 @@ outputs:
          - apache::default_vhost: false
      logging_source: {get_attr: [GnocchiApiPuppetBase, role_data, logging_source]}
      logging_groups: {get_attr: [GnocchiApiPuppetBase, role_data, logging_groups]}
-      step_config: &step_config
-        get_attr: [GnocchiApiPuppetBase, role_data, step_config]
      service_config_settings: {get_attr: [GnocchiApiPuppetBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: gnocchi
        puppet_tags: gnocchi_api_paste_ini,gnocchi_config
-        step_config: *step_config
+        step_config:
+          get_attr: [GnocchiApiPuppetBase, role_data, step_config]
        config_image: {get_param: DockerGnocchiConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/gnocchi_api.json:
--- a/docker/services/gnocchi-metricd.yaml
+++ b/docker/services/gnocchi-metricd.yaml
@ -63,17 +63,16 @@ outputs:
      config_settings: {get_attr: [GnocchiMetricdBase, role_data, config_settings]}
      logging_source: {get_attr: [GnocchiMetricdBase, role_data, logging_source]}
      logging_groups: {get_attr: [GnocchiMetricdBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [GnocchiMetricdBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
      service_config_settings: {get_attr: [GnocchiMetricdBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: gnocchi
        puppet_tags: gnocchi_config
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [GnocchiMetricdBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
        config_image: {get_param: DockerGnocchiConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/gnocchi_metricd.json:
--- a/docker/services/gnocchi-statsd.yaml
+++ b/docker/services/gnocchi-statsd.yaml
@ -63,17 +63,16 @@ outputs:
      config_settings: {get_attr: [GnocchiStatsdBase, role_data, config_settings]}
      logging_source: {get_attr: [GnocchiStatsdBase, role_data, logging_source]}
      logging_groups: {get_attr: [GnocchiStatsdBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [GnocchiStatsdBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
      service_config_settings: {get_attr: [GnocchiStatsdBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: gnocchi
        puppet_tags: gnocchi_config
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [GnocchiStatsdBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
        config_image: {get_param: DockerGnocchiConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/gnocchi_statsd.json:
--- a/docker/services/haproxy.yaml
+++ b/docker/services/haproxy.yaml
@ -121,8 +121,6 @@ outputs:
            tripleo::haproxy::crl_file: null
      logging_source: {get_attr: [HAProxyBase, role_data, logging_source]}
      logging_groups: {get_attr: [HAProxyBase, role_data, logging_groups]}
-      step_config: &step_config
-        get_attr: [HAProxyBase, role_data, step_config]
      service_config_settings: {get_attr: [HAProxyBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
@ -188,7 +186,8 @@ outputs:
                        - "FACTER_uuid=docker puppet apply --tags TAGS -v -e 'CONFIG'"
                  params:
                    TAGS: 'tripleo::firewall::rule'
-                    CONFIG: *step_config
+                    CONFIG:
+                      get_attr: [HAProxyBase, role_data, step_config]
            volumes:
              list_concat:
                - {get_attr: [ContainersCommon, volumes]}
--- a/docker/services/heat-api-cfn.yaml
+++ b/docker/services/heat-api-cfn.yaml
@ -75,14 +75,13 @@ outputs:
          - apache::default_vhost: false
      logging_source: {get_attr: [HeatBase, role_data, logging_source]}
      logging_groups: {get_attr: [HeatBase, role_data, logging_groups]}
-      step_config: &step_config
-        get_attr: [HeatBase, role_data, step_config]
      service_config_settings: {get_attr: [HeatBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: heat_api_cfn
        puppet_tags: heat_config,file,concat,file_line
-        step_config: *step_config
+        step_config:
+          get_attr: [HeatBase, role_data, step_config]
        config_image: {get_param: DockerHeatApiCfnConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/heat_api_cfn.json:
--- a/docker/services/heat-api.yaml
+++ b/docker/services/heat-api.yaml
@ -73,8 +73,6 @@ outputs:
          - get_attr: [HeatBase, role_data, config_settings]
          - get_attr: [HeatApiLogging, config_settings]
          - apache::default_vhost: false
-      step_config: &step_config
-        get_attr: [HeatBase, role_data, step_config]
      logging_source: {get_attr: [HeatBase, role_data, logging_source]}
      logging_groups: {get_attr: [HeatBase, role_data, logging_groups]}
      service_config_settings: {get_attr: [HeatBase, role_data, service_config_settings]}
@ -82,7 +80,8 @@ outputs:
      puppet_config:
        config_volume: heat_api
        puppet_tags: heat_config,file,concat,file_line
-        step_config: *step_config
+        step_config:
+          get_attr: [HeatBase, role_data, step_config]
        config_image: {get_param: DockerHeatApiConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/heat_api.json:
--- a/docker/services/heat-engine.yaml
+++ b/docker/services/heat-engine.yaml
@ -69,17 +69,16 @@ outputs:
          - apache::default_vhost: false
      logging_source: {get_attr: [HeatBase, role_data, logging_source]}
      logging_groups: {get_attr: [HeatBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [HeatBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
      service_config_settings: {get_attr: [HeatBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: heat
        puppet_tags: heat_config,file,concat,file_line
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [HeatBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
        config_image: {get_param: DockerHeatConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/heat_engine.json:
--- a/docker/services/horizon.yaml
+++ b/docker/services/horizon.yaml
@ -75,7 +75,6 @@ outputs:
          - horizon::secure_cookies: false
      logging_source: {get_attr: [HorizonBase, role_data, logging_source]}
      logging_groups: {get_attr: [HorizonBase, role_data, logging_groups]}
-      step_config: {get_attr: [HorizonBase, role_data, step_config]}
      service_config_settings: {get_attr: [HorizonBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
--- a/docker/services/ironic-api.yaml
+++ b/docker/services/ironic-api.yaml
@ -66,17 +66,16 @@ outputs:
          - apache::default_vhost: false
      logging_source: {get_attr: [IronicApiBase, role_data, logging_source]}
      logging_groups: {get_attr: [IronicApiBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [IronicApiBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
      service_config_settings: {get_attr: [IronicApiBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: ironic_api
        puppet_tags: ironic_config
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [IronicApiBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
        config_image: {get_param: DockerIronicApiConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/ironic_api.json:
--- a/docker/services/ironic-conductor.yaml
+++ b/docker/services/ironic-conductor.yaml
@ -73,17 +73,16 @@ outputs:
          - ironic::conductor::http_root: /var/lib/ironic/httpboot
      logging_source: {get_attr: [IronicConductorBase, role_data, logging_source]}
      logging_groups: {get_attr: [IronicConductorBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [IronicConductorBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
      service_config_settings: {get_attr: [IronicConductorBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: ironic
        puppet_tags: ironic_config
-        step_config: *step_config
+        step_config:
+         list_join:
+            - "\n"
+            - - {get_attr: [IronicConductorBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
        config_image: {get_param: DockerIronicConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/ironic_conductor.json:
--- a/docker/services/ironic-inspector.yaml
+++ b/docker/services/ironic-inspector.yaml
@ -60,11 +60,6 @@ outputs:
    description: Role data for the Ironic Inspector role.
    value:
      service_name: ironic_inspector
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [IronicInspectorBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
      config_settings:
        map_merge:
          - get_attr: [IronicInspectorBase, role_data, config_settings]
@ -76,7 +71,11 @@ outputs:
      puppet_config:
        config_volume: ironic_inspector
        puppet_tags: ironic_inspector_config
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [IronicInspectorBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
        config_image: {get_param: DockerIronicInspectorConfigImage}
        volumes:
          - /var/lib/ironic:/var/lib/ironic
--- a/docker/services/ironic-pxe.yaml
+++ b/docker/services/ironic-pxe.yaml
@ -48,13 +48,12 @@ outputs:
    value:
      service_name: ironic_pxe
      config_settings: {}
-      step_config: &step_config ''
      service_config_settings: {}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: ironic
        puppet_tags: ironic_config
-        step_config: *step_config
+        step_config: ''
        config_image: {get_param: DockerIronicConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/ironic_pxe_http.json:
--- a/docker/services/iscsid.yaml
+++ b/docker/services/iscsid.yaml
@ -59,14 +59,13 @@ outputs:
      config_settings: {get_attr: [IscsidBase, role_data, config_settings]}
      logging_source: {get_attr: [IscsidBase, role_data, logging_source]}
      logging_groups: {get_attr: [IscsidBase, role_data, logging_groups]}
-      step_config: &step_config
-        {get_attr: [IscsidBase, role_data, step_config]}
      service_config_settings: {get_attr: [IscsidBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: iscsid
        puppet_tags: iscsid_config
-        step_config: *step_config
+        step_config:
+          {get_attr: [IscsidBase, role_data, step_config]}
        config_image: {get_param: DockerIscsidConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/iscsid.json:
--- a/docker/services/keystone.yaml
+++ b/docker/services/keystone.yaml
@ -87,18 +87,17 @@ outputs:
          - apache::default_vhost: false
      logging_source: {get_attr: [KeystoneBase, role_data, logging_source]}
      logging_groups: {get_attr: [KeystoneBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - "['Keystone_user', 'Keystone_endpoint', 'Keystone_domain', 'Keystone_tenant', 'Keystone_user_role', 'Keystone_role', 'Keystone_service'].each |String $val| { noop_resource($val) }"
-            - {get_attr: [KeystoneBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
      service_config_settings: {get_attr: [KeystoneBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: keystone
        puppet_tags: keystone_config
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - "['Keystone_user', 'Keystone_endpoint', 'Keystone_domain', 'Keystone_tenant', 'Keystone_user_role', 'Keystone_role', 'Keystone_service'].each |String $val| { noop_resource($val) }"
+              - {get_attr: [KeystoneBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
        config_image: &keystone_config_image {get_param: DockerKeystoneConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/keystone.json:
--- a/docker/services/logrotate-crond.yaml
+++ b/docker/services/logrotate-crond.yaml
@ -49,12 +49,10 @@ outputs:
    value:
      service_name: logrotate_crond
      config_settings: {}
-      step_config: &step_config |
-        include ::tripleo::profile::base::logging::logrotate
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: crond
-        step_config: *step_config
+        step_config: 'include ::tripleo::profile::base::logging::logrotate'
        config_image: {get_param: DockerCrondConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/logrotate-crond.json:
--- a/docker/services/manila-api.yaml
+++ b/docker/services/manila-api.yaml
@ -61,17 +61,16 @@ outputs:
      config_settings: {get_attr: [ManilaApiPuppetBase, role_data, config_settings]}
      logging_source: {get_attr: [ManilaApiPuppetBase, role_data, logging_source]}
      logging_groups: {get_attr: [ManilaApiPuppetBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [ManilaApiPuppetBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
      service_config_settings: {get_attr: [ManilaApiPuppetBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS #
      puppet_config:
        config_volume: manila
        puppet_tags: manila_config,manila_api_paste_ini
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [ManilaApiPuppetBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
        config_image: {get_param: DockerManilaConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/manila_api.json:
--- a/docker/services/manila-scheduler.yaml
+++ b/docker/services/manila-scheduler.yaml
@ -61,17 +61,16 @@ outputs:
      config_settings: {get_attr: [ManilaSchedulerPuppetBase, role_data, config_settings]}
      logging_source: {get_attr: [ManilaSchedulerPuppetBase, role_data, logging_source]}
      logging_groups: {get_attr: [ManilaSchedulerPuppetBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [ManilaSchedulerPuppetBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
      service_config_settings: {get_attr: [ManilaSchedulerPuppetBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS #
      puppet_config:
        config_volume: manila
        puppet_tags: manila_config,manila_scheduler_paste_ini
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [ManilaSchedulerPuppetBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
        config_image: {get_param: DockerManilaConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/manila_scheduler.json:
--- a/docker/services/manila-share.yaml
+++ b/docker/services/manila-share.yaml
@ -63,17 +63,16 @@ outputs:
      config_settings: {get_attr: [ManilaBase, role_data, config_settings]}
      logging_source: {get_attr: [ManilaBase, role_data, logging_source]}
      logging_groups: {get_attr: [ManilaBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [ManilaBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
      service_config_settings: {get_attr: [ManilaBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: manila
        puppet_tags: manila_config
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [ManilaBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
        config_image: {get_param: DockerManilaConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/manila_share.json:
--- a/docker/services/memcached.yaml
+++ b/docker/services/memcached.yaml
@ -60,14 +60,13 @@ outputs:
      config_settings: {get_attr: [MemcachedBase, role_data, config_settings]}
      logging_source: {get_attr: [MemcachedBase, role_data, logging_source]}
      logging_groups: {get_attr: [MemcachedBase, role_data, logging_groups]}
-      step_config: &step_config
-        get_attr: [MemcachedBase, role_data, step_config]
      service_config_settings: {get_attr: [MemcachedBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: 'memcached'
        puppet_tags: 'file'
-        step_config: *step_config
+        step_config:
+          get_attr: [MemcachedBase, role_data, step_config]
        config_image: {get_param: DockerMemcachedConfigImage}
      kolla_config: {}
      docker_config:
--- a/docker/services/mistral-api.yaml
+++ b/docker/services/mistral-api.yaml
@ -99,17 +99,16 @@ outputs:
            mistral_wsgi_enabled: false
      logging_source: {get_attr: [MistralApiBase, role_data, logging_source]}
      logging_groups: {get_attr: [MistralApiBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [MistralApiBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
      service_config_settings: {get_attr: [MistralApiBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: mistral
        puppet_tags: mistral_config
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [MistralApiBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
        config_image: {get_param: DockerMistralConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/mistral_api.json:
--- a/docker/services/mistral-engine.yaml
+++ b/docker/services/mistral-engine.yaml
@ -66,17 +66,16 @@ outputs:
          - get_attr: [MistralBase, role_data, config_settings]
      logging_source: {get_attr: [MistralBase, role_data, logging_source]}
      logging_groups: {get_attr: [MistralBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [MistralBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
      service_config_settings: {get_attr: [MistralBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: mistral
        puppet_tags: mistral_config
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [MistralBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
        config_image: {get_param: DockerMistralConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/mistral_engine.json:
--- a/docker/services/mistral-event-engine.yaml
+++ b/docker/services/mistral-event-engine.yaml
@ -66,17 +66,16 @@ outputs:
          - get_attr: [MistralBase, role_data, config_settings]
      logging_source: {get_attr: [MistralBase, role_data, logging_source]}
      logging_groups: {get_attr: [MistralBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - get_attr: [MistralBase, role_data, step_config]
-            - get_attr: [MySQLClient, role_data, step_config]
      service_config_settings: {get_attr: [MistralBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: mistral
        puppet_tags: mistral_config
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - get_attr: [MistralBase, role_data, step_config]
+              - get_attr: [MySQLClient, role_data, step_config]
        config_image: {get_param: DockerMistralConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/mistral_event_engine.json:
--- a/docker/services/mistral-executor.yaml
+++ b/docker/services/mistral-executor.yaml
@ -66,17 +66,16 @@ outputs:
          - get_attr: [MistralBase, role_data, config_settings]
      logging_source: {get_attr: [MistralBase, role_data, logging_source]}
      logging_groups: {get_attr: [MistralBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [MistralBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
      service_config_settings: {get_attr: [MistralBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: mistral
        puppet_tags: mistral_config
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [MistralBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
        config_image: {get_param: DockerMistralConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/mistral_executor.json:
--- a/docker/services/multipathd.yaml
+++ b/docker/services/multipathd.yaml
@ -48,7 +48,6 @@ outputs:
    value:
      service_name: multipathd
      config_settings: {}
-      step_config: ''
      service_config_settings: {}
      # BEGIN DOCKER SETTINGS
      puppet_config:
--- a/docker/services/neutron-api.yaml
+++ b/docker/services/neutron-api.yaml
@ -80,17 +80,16 @@ outputs:
        map_merge:
          - get_attr: [NeutronBase, role_data, config_settings]
          - get_attr: [NeutronLogging, config_settings]
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [NeutronBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
      service_config_settings: {get_attr: [NeutronBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: neutron
        puppet_tags: neutron_config,neutron_api_config
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [NeutronBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
        config_image: {get_param: DockerNeutronConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/neutron_api.json:
--- a/docker/services/neutron-dhcp.yaml
+++ b/docker/services/neutron-dhcp.yaml
@ -66,14 +66,13 @@ outputs:
          - get_attr: [NeutronLogging, config_settings]
      logging_source: {get_attr: [NeutronBase, role_data, logging_source]}
      logging_groups: {get_attr: [NeutronBase, role_data, logging_groups]}
-      step_config: &step_config
-        get_attr: [NeutronBase, role_data, step_config]
      service_config_settings: {get_attr: [NeutronBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: neutron
        puppet_tags: neutron_config,neutron_dhcp_agent_config
-        step_config: *step_config
+        step_config:
+          get_attr: [NeutronBase, role_data, step_config]
        config_image: {get_param: DockerNeutronConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/neutron_dhcp.json:
--- a/docker/services/neutron-l3.yaml
+++ b/docker/services/neutron-l3.yaml
@ -66,12 +66,11 @@ outputs:
          - get_attr: [NeutronLogging, config_settings]
      logging_source: {get_attr: [NeutronL3Base, role_data, logging_source]}
      logging_groups: {get_attr: [NeutronL3Base, role_data, logging_groups]}
-      step_config: &step_config
-        get_attr: [NeutronL3Base, role_data, step_config]
      puppet_config:
        puppet_tags: neutron_config,neutron_l3_agent_config
        config_volume: neutron
-        step_config: *step_config
+        step_config:
+          get_attr: [NeutronL3Base, role_data, step_config]
        config_image: {get_param: DockerNeutronConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/neutron_l3_agent.json:
--- a/5
+++ b/5