Merge "Drop step_config as top level docker requirement"

2017-11-17 08:33:29 +00:00
parent 6bae8ba2a5 a307fe7ffc
commit 6a72a9f1b4
103 changed files with 323 additions and 429 deletions
--- 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: ''