Merge "Drop step_config as top level docker requirement"

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

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:

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:

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:

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:

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:

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:

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:

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:

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:

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: ''

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: ''

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}

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: ''

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: ''

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}

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: ''

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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

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:

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:

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:

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:

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:

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]}

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:

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:

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:

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:

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:

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:

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

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

docker/services/neutron-metadata.yaml

@@ -66,12 +66,11 @@ outputs:
           - get_attr: [NeutronLogging, config_settings]
       logging_source: {get_attr: [NeutronMetadataBase, role_data, logging_source]}
       logging_groups: {get_attr: [NeutronMetadataBase, role_data, logging_groups]}
-      step_config: &step_config
-        get_attr: [NeutronMetadataBase, role_data, step_config]
       puppet_config:
         puppet_tags: neutron_config,neutron_metadata_agent_config
         config_volume: neutron
-        step_config: *step_config
+        step_config:
+          get_attr: [NeutronMetadataBase, role_data, step_config]
         config_image: {get_param: DockerNeutronConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/neutron_metadata_agent.json:

docker/services/neutron-ovs-agent.yaml

@@ -70,12 +70,11 @@ outputs:
           - get_attr: [NeutronLogging, config_settings]
       logging_source: {get_attr: [NeutronOvsAgentBase, role_data, logging_source]}
       logging_groups: {get_attr: [NeutronOvsAgentBase, role_data, logging_groups]}
-      step_config: &step_config
-        get_attr: [NeutronOvsAgentBase, role_data, step_config]
       puppet_config:
         config_volume: neutron
         puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2
-        step_config: *step_config
+        step_config:
+          get_attr: [NeutronOvsAgentBase, role_data, step_config]
         config_image: {get_param: DockerNeutronConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/neutron_ovs_agent.json:

docker/services/neutron-plugin-ml2.yaml

@@ -55,14 +55,13 @@ outputs:
           - get_attr: [NeutronBase, role_data, 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_plugin_ml2
-        step_config: *step_config
+        step_config:
+          get_attr: [NeutronBase, role_data, step_config]
         config_image: {get_param: DockerNeutronConfigImage}
       kolla_config: {}
       docker_config: {}

docker/services/neutron-sriov-agent.yaml

@@ -64,12 +64,11 @@ outputs:
         map_merge:
           - get_attr: [NeutronSriovAgentBase, role_data, config_settings]
           - get_attr: [NeutronLogging, config_settings]
-      step_config: &step_config
-        get_attr: [NeutronSriovAgentBase, role_data, step_config]
       puppet_config:
         config_volume: neutron
         puppet_tags: neutron_config,neutron_agent_sriov_numvfs,neutron_sriov_agent_config
-        step_config: *step_config
+        step_config:
+          get_attr: [NeutronSriovAgentBase, role_data, step_config]
         config_image: {get_param: DockerNeutronConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/neutron_sriov_agent.json:

docker/services/nova-api.yaml

@@ -81,18 +81,17 @@ outputs:
           - apache::default_vhost: false
       logging_source: {get_attr: [NovaApiBase, role_data, logging_source]}
       logging_groups: {get_attr: [NovaApiBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - "['Nova_cell_v2'].each |String $val| { noop_resource($val) }"
-            - {get_attr: [NovaApiBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
       service_config_settings: {get_attr: [NovaApiBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: nova
         puppet_tags: nova_config
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - "['Nova_cell_v2'].each |String $val| { noop_resource($val) }"
+              - {get_attr: [NovaApiBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
         config_image: {get_param: DockerNovaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/nova_api.json:

docker/services/nova-compute.yaml

@@ -86,15 +86,14 @@ outputs:
           - get_attr: [NovaLogging, config_settings]
       logging_source: {get_attr: [NovaComputeBase, role_data, logging_source]}
       logging_groups: {get_attr: [NovaComputeBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [NovaComputeBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
       puppet_config:
         config_volume: nova_libvirt
         puppet_tags: nova_config,nova_paste_api_ini
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [NovaComputeBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
         config_image: {get_param: DockerNovaLibvirtConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/nova_compute.json:

docker/services/nova-conductor.yaml

@@ -81,17 +81,16 @@ outputs:
           - {get_attr: [NovaLogging, config_settings]}
       logging_source: {get_attr: [NovaConductorBase, role_data, logging_source]}
       logging_groups: {get_attr: [NovaConductorBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [NovaConductorBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
       service_config_settings: {get_attr: [NovaConductorBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: nova
         puppet_tags: nova_config
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [NovaConductorBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
         config_image: {get_param: DockerNovaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/nova_conductor.json:

docker/services/nova-consoleauth.yaml

@@ -76,17 +76,16 @@ outputs:
           - {get_attr: [NovaLogging, config_settings]}
       logging_source: {get_attr: [NovaConsoleauthPuppetBase, role_data, logging_source]}
       logging_groups: {get_attr: [NovaConsoleauthPuppetBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [NovaConsoleauthPuppetBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
       service_config_settings: {get_attr: [NovaConsoleauthPuppetBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: nova
         puppet_tags: nova_config
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [NovaConsoleauthPuppetBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
         config_image: {get_param: DockerNovaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/nova_consoleauth.json:

docker/services/nova-ironic.yaml

@@ -63,15 +63,14 @@ outputs:
       config_settings: {get_attr: [NovaIronicBase, role_data, config_settings]}
       logging_source: {get_attr: [NovaIronicBase, role_data, logging_source]}
       logging_groups: {get_attr: [NovaIronicBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [NovaIronicBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
       puppet_config:
         config_volume: nova
         puppet_tags: nova_config,nova_paste_api_ini
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [NovaIronicBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
         config_image: {get_param: DockerNovaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/nova_ironic.json:

docker/services/nova-libvirt.yaml

@@ -123,15 +123,14 @@ outputs:
 
       logging_source: {get_attr: [NovaLibvirtBase, role_data, logging_source]}
       logging_groups: {get_attr: [NovaLibvirtBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [NovaLibvirtBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
       puppet_config:
         config_volume: nova_libvirt
         puppet_tags: libvirtd_config,nova_config,file
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [NovaLibvirtBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
         config_image: {get_param: DockerNovaLibvirtConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/nova_libvirt.json:

docker/services/nova-metadata.yaml

@@ -69,14 +69,13 @@ outputs:
           - {get_attr: [NovaLogging, config_settings]}
       logging_source: {get_attr: [NovaMetadataBase, role_data, logging_source]}
       logging_groups: {get_attr: [NovaMetadataBase, role_data, logging_groups]}
-      step_config: &step_config
-        get_attr: [NovaMetadataBase, role_data, step_config]
       service_config_settings: {get_attr: [NovaMetadataBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: nova
         puppet_tags: nova_config
-        step_config: *step_config
+        step_config:
+          get_attr: [NovaMetadataBase, role_data, step_config]
         config_image: {get_param: DockerNovaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/nova_metadata.json:

docker/services/nova-migration-target.yaml

@@ -108,14 +108,13 @@ outputs:
             - {}
       logging_source: {get_attr: [NovaMigrationTargetBase, role_data, logging_source]}
       logging_groups: {get_attr: [NovaMigrationTargetBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - get_attr: [SshdBase, role_data, step_config]
-            - get_attr: [NovaMigrationTargetBase, role_data, step_config]
       puppet_config:
         config_volume: nova_libvirt
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - get_attr: [SshdBase, role_data, step_config]
+              - get_attr: [NovaMigrationTargetBase, role_data, step_config]
         config_image: {get_param: DockerNovaLibvirtConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/nova-migration-target.json:

docker/services/nova-placement.yaml

@@ -81,17 +81,16 @@ outputs:
           - apache::default_vhost: false
       logging_source: {get_attr: [NovaPlacementBase, role_data, logging_source]}
       logging_groups: {get_attr: [NovaPlacementBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [NovaPlacementBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
       service_config_settings: {get_attr: [NovaPlacementBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: nova_placement
         puppet_tags: nova_config
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [NovaPlacementBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
         config_image: {get_param: DockerNovaPlacementConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/nova_placement.json:

docker/services/nova-scheduler.yaml

@@ -76,17 +76,16 @@ outputs:
           - {get_attr: [NovaLogging, config_settings]}
       logging_source: {get_attr: [NovaSchedulerBase, role_data, logging_source]}
       logging_groups: {get_attr: [NovaSchedulerBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [NovaSchedulerBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
       service_config_settings: {get_attr: [NovaSchedulerBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: nova
         puppet_tags: nova_config
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [NovaSchedulerBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
         config_image: {get_param: DockerNovaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/nova_scheduler.json:

docker/services/nova-vnc-proxy.yaml

@@ -76,17 +76,16 @@ outputs:
           - {get_attr: [NovaLogging, config_settings]}
       logging_source: {get_attr: [NovaVncProxyPuppetBase, role_data, logging_source]}
       logging_groups: {get_attr: [NovaVncProxyPuppetBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [NovaVncProxyPuppetBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
       service_config_settings: {get_attr: [NovaVncProxyPuppetBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: nova
         puppet_tags: nova_config
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [NovaVncProxyPuppetBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
         config_image: {get_param: DockerNovaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/nova_vnc_proxy.json:

docker/services/octavia-api.yaml

@@ -71,17 +71,16 @@ outputs:
       config_settings: {get_attr: [OctaviaApiPuppetBase, role_data, config_settings]}
       logging_source: {get_attr: [OctaviaApiPuppetBase, role_data, logging_source]}
       logging_groups: {get_attr: [OctaviaApiPuppetBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [OctaviaApiPuppetBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
       service_config_settings: {get_attr: [OctaviaApiPuppetBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS #
       puppet_config:
         config_volume: octavia
         puppet_tags: octavia_config
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [OctaviaApiPuppetBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
         config_image: {get_param: DockerOctaviaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/octavia_api.json:

docker/services/octavia-health-manager.yaml

@@ -64,14 +64,13 @@ outputs:
       config_settings: {get_attr: [OctaviaHealthManagerPuppetBase, role_data, config_settings]}
       logging_source: {get_attr: [OctaviaHealthManagerPuppetBase, role_data, logging_source]}
       logging_groups: {get_attr: [OctaviaHealthManagerPuppetBase, role_data, logging_groups]}
-      step_config: &step_config
-        get_attr: [OctaviaHealthManagerPuppetBase, role_data, step_config]
       service_config_settings: {get_attr: [OctaviaHealthManagerPuppetBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS #
       puppet_config:
         config_volume: octavia
         puppet_tags: octavia_config
-        step_config: *step_config
+        step_config:
+          get_attr: [OctaviaHealthManagerPuppetBase, role_data, step_config]
         config_image: {get_param: DockerOctaviaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/octavia_health_manager.json:

docker/services/octavia-housekeeping.yaml

@@ -60,14 +60,13 @@ outputs:
       config_settings: {get_attr: [OctaviaHousekeepingPuppetBase, role_data, config_settings]}
       logging_source: {get_attr: [OctaviaHousekeepingPuppetBase, role_data, logging_source]}
       logging_groups: {get_attr: [OctaviaHousekeepingPuppetBase, role_data, logging_groups]}
-      step_config: &step_config
-        get_attr: [OctaviaHousekeepingPuppetBase, role_data, step_config]
       service_config_settings: {get_attr: [OctaviaHousekeepingPuppetBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS #
       puppet_config:
         config_volume: octavia
         puppet_tags: octavia_config
-        step_config: *step_config
+        step_config:
+          get_attr: [OctaviaHousekeepingPuppetBase, role_data, step_config]
         config_image: {get_param: DockerOctaviaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/octavia_housekeeping.json:

docker/services/octavia-worker.yaml

@@ -60,14 +60,13 @@ outputs:
       config_settings: {get_attr: [OctaviaWorkerPuppetBase, role_data, config_settings]}
       logging_source: {get_attr: [OctaviaWorkerPuppetBase, role_data, logging_source]}
       logging_groups: {get_attr: [OctaviaWorkerPuppetBase, role_data, logging_groups]}
-      step_config: &step_config
-        get_attr: [OctaviaWorkerPuppetBase, role_data, step_config]
       service_config_settings: {get_attr: [OctaviaWorkerPuppetBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS #
       puppet_config:
         config_volume: octavia
         puppet_tags: octavia_config
-        step_config: *step_config
+        step_config:
+          get_attr: [OctaviaWorkerPuppetBase, role_data, step_config]
         config_image: {get_param: DockerOctaviaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/octavia_worker.json:

docker/services/opendaylight-api.yaml

@@ -62,14 +62,13 @@ outputs:
           - get_attr: [OpenDaylightBase, role_data, config_settings]
       logging_source: {get_attr: [OpenDaylightBase, role_data, logging_source]}
       logging_groups: {get_attr: [OpenDaylightBase, role_data, logging_groups]}
-      step_config: &step_config
-        get_attr: [OpenDaylightBase, role_data, step_config]
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: opendaylight
         # 'file,concat,file_line,augeas' are included by default
         puppet_tags: odl_user
-        step_config: *step_config
+        step_config:
+          get_attr: [OpenDaylightBase, role_data, step_config]
         config_image: {get_param: DockerOpendaylightConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/opendaylight_api.json:

docker/services/ovn-controller.yaml

@@ -62,14 +62,13 @@ outputs:
           - get_attr: [OvnControllerBase, role_data, config_settings]
       logging_source: {get_attr: [OvnControllerBase, role_data, logging_source]}
       logging_groups: {get_attr: [OvnControllerBase, role_data, logging_groups]}
-      step_config: &step_config
-        get_attr: [OvnControllerBase, role_data, step_config]
       service_config_settings: {get_attr: [OvnControllerBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         puppet_tags: vs_config
         config_volume: ovn_controller
-        step_config: *step_config
+        step_config:
+          get_attr: [OvnControllerBase, role_data, step_config]
         config_image: {get_param: DockerOvnControllerConfigImage}
         # We need to mount /run for puppet_config step. This is because
         # puppet-vswitch runs the commands "ovs-vsctl set open_vswitch . external_ids:..."

docker/services/ovn-dbs.yaml

@@ -65,8 +65,6 @@ outputs:
           - get_attr: [OVNDbsBase, role_data, config_settings]
       logging_source: {get_attr: [OVNDbsBase, role_data, logging_source]}
       logging_groups: {get_attr: [OVNDbsBase, role_data, logging_groups]}
-      step_config: &step_config
-        get_attr: [OVNDbsBase, role_data, step_config]
       # BEGIN DOCKER SETTINGS
       # puppet_config is not required for this service since we configure
       # the NB and SB DB servers to listen on the proper IP address/port
@@ -75,7 +73,8 @@ outputs:
       puppet_config:
         config_volume: ''
         config_image: ''
-        step_config: *step_config
+        step_config:
+          get_attr: [OVNDbsBase, role_data, step_config]
       kolla_config:
         /var/lib/kolla/config_files/ovn_north_db_server.json:
           command:

docker/services/pacemaker/cinder-backup.yaml

@@ -87,17 +87,16 @@ outputs:
             cinder::backup::enabled: false
       logging_source: {get_attr: [CinderBackupBase, role_data, logging_source]}
       logging_groups: {get_attr: [CinderBackupBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [CinderBackupBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
       service_config_settings: {get_attr: [CinderBackupBase, 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: [CinderBackupBase, 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:

docker/services/pacemaker/cinder-volume.yaml

@@ -82,18 +82,17 @@ outputs:
             cinder::host: hostgroup
       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:

docker/services/pacemaker/clustercheck.yaml

@@ -65,7 +65,6 @@ outputs:
       config_settings: {get_attr: [MysqlPuppetBase, role_data, config_settings]}
       logging_source: {get_attr: [MysqlPuppetBase, role_data, logging_source]}
       logging_groups: {get_attr: [MysqlPuppetBase, role_data, logging_groups]}
-      step_config: "include ::tripleo::profile::pacemaker::clustercheck"
       # BEGIN DOCKER SETTINGS #
       puppet_config:
         config_volume: clustercheck

docker/services/pacemaker/database/mysql.yaml

@@ -112,7 +112,6 @@ outputs:
             - {}
       logging_source: {get_attr: [MysqlPuppetBase, role_data, logging_source]}
       logging_groups: {get_attr: [MysqlPuppetBase, role_data, logging_groups]}
-      step_config: ""
       # BEGIN DOCKER SETTINGS #
       puppet_config:
         config_volume: mysql

docker/services/pacemaker/database/redis.yaml

@@ -88,7 +88,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: ""
       service_config_settings: {get_attr: [RedisBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/pacemaker/haproxy.yaml

@@ -101,7 +101,6 @@ outputs:
                   - 'pcmklatest'
       logging_source: {get_attr: [HAProxyBase, role_data, logging_source]}
       logging_groups: {get_attr: [HAProxyBase, role_data, logging_groups]}
-      step_config: ""
       service_config_settings: {get_attr: [HAProxyBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/pacemaker/manila-share.yaml

@@ -71,7 +71,6 @@ outputs:
             manila::host: hostgroup
       logging_source: {get_attr: [ManilaBase, role_data, logging_source]}
       logging_groups: {get_attr: [ManilaBase, role_data, logging_groups]}
-      step_config: ""
       service_config_settings: {get_attr: [ManilaBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/pacemaker/ovn-dbs.yaml

@@ -75,7 +75,6 @@ outputs:
           - tripleo::profile::pacemaker::ovn_dbs_bundle::sb_db_port: {get_param: OVNSouthboundServerPort}
       logging_source: {get_attr: [OVNDbsBase, role_data, logging_source]}
       logging_groups: {get_attr: [OVNDbsBase, role_data, logging_groups]}
-      step_config: ''
       service_config_settings: {get_attr: [OVNDbsBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:

docker/services/pacemaker/rabbitmq.yaml

@@ -79,14 +79,13 @@ outputs:
                   - 25672
       logging_source: {get_attr: [RabbitmqBase, role_data, logging_source]}
       logging_groups: {get_attr: [RabbitmqBase, role_data, logging_groups]}
-      step_config: &step_config
-        get_attr: [RabbitmqBase, role_data, step_config]
       service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: rabbitmq
         puppet_tags: file
-        step_config: *step_config
+        step_config:
+          get_attr: [RabbitmqBase, role_data, step_config]
         config_image: {get_param: DockerRabbitmqConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/rabbitmq.json:

docker/services/panko-api.yaml

@@ -79,17 +79,16 @@ outputs:
           - apache::default_vhost: false
       logging_source: {get_attr: [PankoApiPuppetBase, role_data, logging_source]}
       logging_groups: {get_attr: [PankoApiPuppetBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [PankoApiPuppetBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
       service_config_settings: {get_attr: [PankoApiPuppetBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS #
       puppet_config:
         config_volume: panko
         puppet_tags: panko_api_paste_ini,panko_config
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [PankoApiPuppetBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
         config_image: {get_param: DockerPankoConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/panko_api.json:

docker/services/qdrouterd.yaml

@@ -59,13 +59,12 @@ outputs:
       service_name: {get_attr: [QdrouterdBase, role_data, service_name]}
       global_config_settings: {get_attr: [QdrouterdBase, role_data, global_config_settings]}
       config_settings: {get_attr: [QdrouterdBase, role_data, config_settings]}
-      step_config: &step_config
-        get_attr: [QdrouterdBase, role_data, step_config]
       service_config_settings: {get_attr: [QdrouterdBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: qdrouterd
-        step_config: *step_config
+        step_config:
+          get_attr: [QdrouterdBase, role_data, step_config]
         config_image: {get_param: DockerQdrouterdConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/qdrouterd.json:

docker/services/rabbitmq.yaml

@@ -84,16 +84,15 @@ outputs:
             - {}
       logging_source: {get_attr: [RabbitmqBase, role_data, logging_source]}
       logging_groups: {get_attr: [RabbitmqBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - "['Rabbitmq_policy', 'Rabbitmq_user'].each |String $val| { noop_resource($val) }"
-            - get_attr: [RabbitmqBase, role_data, step_config]
       service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: rabbitmq
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - "['Rabbitmq_policy', 'Rabbitmq_user'].each |String $val| { noop_resource($val) }"
+              - get_attr: [RabbitmqBase, role_data, step_config]
         config_image: &rabbitmq_config_image {get_param: DockerRabbitmqConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/rabbitmq.json:

docker/services/sahara-api.yaml

@@ -68,17 +68,16 @@ outputs:
           - sahara::sync_db: false
       logging_source: {get_attr: [SaharaApiPuppetBase, role_data, logging_source]}
       logging_groups: {get_attr: [SaharaApiPuppetBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [SaharaApiPuppetBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
       service_config_settings: {get_attr: [SaharaApiPuppetBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS #
       puppet_config:
         config_volume: sahara
         puppet_tags: sahara_api_paste_ini,sahara_cluster_template,sahara_config,sahara_node_group_template
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [SaharaApiPuppetBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
         config_image: {get_param: DockerSaharaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/sahara-api.json:

docker/services/sahara-engine.yaml

@@ -68,17 +68,16 @@ outputs:
           - sahara::sync_db: false
       logging_source: {get_attr: [SaharaEnginePuppetBase, role_data, logging_source]}
       logging_groups: {get_attr: [SaharaEnginePuppetBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [SaharaEnginePuppetBase, role_data, step_config]}
-            - {get_attr: [MySQLClient, role_data, step_config]}
       service_config_settings: {get_attr: [SaharaEnginePuppetBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS #
       puppet_config:
         config_volume: sahara
         puppet_tags: sahara_engine_paste_ini,sahara_cluster_template,sahara_config,sahara_node_group_template
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [SaharaEnginePuppetBase, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
         config_image: {get_param: DockerSaharaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/sahara-engine.json:

docker/services/sensu-client.yaml

@@ -97,14 +97,13 @@ outputs:
                 handlers: {get_param: SensuDockerCheckHandlers}
                 occurrences: {get_param: SensuDockerCheckOccurrences}
                 refresh: {get_param: SensuDockerCheckRefresh}
-      step_config: &step_config
-        get_attr: [SensuClientBase, role_data, step_config]
       service_config_settings: {get_attr: [SensuClientBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: sensu
         puppet_tags:  sensu_rabbitmq_config,sensu_client_config,sensu_check_config,sensu_check
-        step_config: *step_config
+        step_config:
+          get_attr: [SensuClientBase, role_data, step_config]
         config_image: {get_param: DockerSensuConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/sensu-client.json:

docker/services/skydive/skydive-agent.yaml

@@ -53,7 +53,6 @@ outputs:
     value:
       service_name: skydive_agent
       upgrade_tasks: []
-      step_config: ''
       puppet_config:
         config_image: ''
         config_volume: ''

docker/services/skydive/skydive-analyzer.yaml

@@ -53,7 +53,6 @@ outputs:
     value:
       service_name: skydive_analyzer
       upgrade_tasks: []
-      step_config: ''
       puppet_config:
         config_image: ''
         config_volume: ''

docker/services/skydive/skydive-base.yaml

@@ -87,7 +87,6 @@ outputs:
     value:
       service_name: skydive_base
       upgrade_tasks: []
-      step_config: ''
       puppet_config:
         config_image: ''
         config_volume: ''

docker/services/swift-proxy.yaml

@@ -69,8 +69,6 @@ outputs:
     value:
       service_name: {get_attr: [SwiftProxyBase, role_data, service_name]}
       config_settings: {get_attr: [SwiftProxyBase, role_data, config_settings]}
-      step_config: &step_config
-        get_attr: [SwiftProxyBase, role_data, step_config]
       logging_source: {get_attr: [SwiftProxyBase, role_data, logging_source]}
       logging_groups: {get_attr: [SwiftProxyBase, role_data, logging_groups]}
       service_config_settings: {get_attr: [SwiftProxyBase, role_data, service_config_settings]}
@@ -78,7 +76,8 @@ outputs:
       puppet_config:
         config_volume: swift
         puppet_tags: swift_proxy_config
-        step_config: *step_config
+        step_config:
+          get_attr: [SwiftProxyBase, role_data, step_config]
         config_image: {get_param: DockerSwiftConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/swift_proxy.json:

docker/services/swift-ringbuilder.yaml

@@ -93,14 +93,13 @@ outputs:
           - tripleo::profile::base::swift::ringbuilder:skip_consistency_check: true
       logging_source: {get_attr: [SwiftRingbuilderBase, role_data, logging_source]}
       logging_groups: {get_attr: [SwiftRingbuilderBase, role_data, logging_groups]}
-      step_config: &step_config
-        get_attr: [SwiftRingbuilderBase, role_data, step_config]
       service_config_settings: {get_attr: [SwiftRingbuilderBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: 'swift_ringbuilder'
         puppet_tags: exec,fetch_swift_ring_tarball,extract_swift_ring_tarball,ring_object_device,swift::ringbuilder::create,tripleo::profile::base::swift::add_devices,swift::ringbuilder::rebalance,create_swift_ring_tarball,upload_swift_ring_tarball
-        step_config: *step_config
+        step_config:
+          get_attr: [SwiftRingbuilderBase, role_data, step_config]
         config_image: &swift_ringbuilder_image {get_param: DockerSwiftConfigImage}
       kolla_config: {}
       docker_config:

docker/services/swift-storage.yaml

@@ -82,17 +82,16 @@ outputs:
           - swift::storage::all::mount_check: false
       logging_source: {get_attr: [SwiftStorageBase, role_data, logging_source]}
       logging_groups: {get_attr: [SwiftStorageBase, role_data, logging_groups]}
-      step_config: &step_config
-        list_join:
-          - "\n"
-          - - {get_attr: [SwiftStorageBase, role_data, step_config]}
-            - "class xinetd() {}"
       service_config_settings: {get_attr: [SwiftStorageBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: swift
         puppet_tags: swift_config,swift_container_config,swift_container_sync_realms_config,swift_account_config,swift_object_config,swift_object_expirer_config,rsync::server
-        step_config: *step_config
+        step_config:
+          list_join:
+            - "\n"
+            - - {get_attr: [SwiftStorageBase, role_data, step_config]}
+              - "class xinetd() {}"
         config_image: {get_param: DockerSwiftConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/swift_account_auditor.json: