Merge "Ignore puppet_config is an empty dict"

2021-06-08 21:35:28 +00:00 · 2021-06-08 21:35:28 +00:00 · 776d375ff0
parent 5e7ed965c6 45fca9e029
commit 776d375ff0
27 changed files with 28 additions and 106 deletions
--- a/deployment/ceph-ansible/ceph-base.yaml
+++ b/deployment/ceph-ansible/ceph-base.yaml
@ -538,10 +538,7 @@ outputs:
    value:
      service_name: ceph_base
      upgrade_tasks: []
-      puppet_config:
-        config_image: ''
-        config_volume: ''
-        step_config: ''
+      puppet_config: {}
      docker_config: {}
      config_settings: {}
      external_deploy_tasks:
--- a/deployment/ceph-ansible/ceph-client.yaml
+++ b/deployment/ceph-ansible/ceph-client.yaml
@ -44,10 +44,7 @@ outputs:
    value:
      service_name: ceph_client
      upgrade_tasks: []
-      puppet_config:
-        config_image: ''
-        config_volume: ''
-        step_config: ''
+      puppet_config: {}
      docker_config: {}
      external_deploy_tasks:
        list_concat:
--- a/deployment/ceph-ansible/ceph-external.yaml
+++ b/deployment/ceph-ansible/ceph-external.yaml
@ -48,10 +48,7 @@ outputs:
    value:
      service_name: ceph_client
      upgrade_tasks: []
-      puppet_config:
-        config_image: ''
-        config_volume: ''
-        step_config: ''
+      puppet_config: {}
      docker_config: {}
      config_settings: {}
      external_deploy_tasks:
--- a/deployment/ceph-ansible/ceph-grafana.yaml
+++ b/deployment/ceph-ansible/ceph-grafana.yaml
@ -116,10 +116,7 @@ outputs:
          - 9100
          - 9283
      upgrade_tasks: []
-      puppet_config:
-        config_image: ''
-        config_volume: ''
-        step_config: ''
+      puppet_config: {}
      docker_config: {}
      external_deploy_tasks:
        list_concat:
--- a/deployment/ceph-ansible/ceph-mds.yaml
+++ b/deployment/ceph-ansible/ceph-mds.yaml
@ -58,10 +58,7 @@ outputs:
                - []
      upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]}
      post_upgrade_tasks: {get_attr: [CephBase, role_data, post_upgrade_tasks]}
-      puppet_config:
-        config_image: ''
-        config_volume: ''
-        step_config: ''
+      puppet_config: {}
      docker_config: {}
      external_deploy_tasks:
        list_concat:
--- a/deployment/ceph-ansible/ceph-mgr.yaml
+++ b/deployment/ceph-ansible/ceph-mgr.yaml
@ -109,10 +109,7 @@ outputs:
                - {get_param: CephEnableDashboard}
                - - {get_param: CephDashboardPort}
      upgrade_tasks: []
-      puppet_config:
-        config_image: ''
-        config_volume: ''
-        step_config: ''
+      puppet_config: {}
      docker_config: {}
      external_deploy_tasks:
        list_concat:
--- a/deployment/ceph-ansible/ceph-mon.yaml
+++ b/deployment/ceph-ansible/ceph-mon.yaml
@ -80,10 +80,7 @@ outputs:
          collectd::plugin::ceph::daemons: []
      upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]}
      post_upgrade_tasks: {get_attr: [CephBase, role_data, post_upgrade_tasks]}
-      puppet_config:
-        config_image: ''
-        config_volume: ''
-        step_config: ''
+      puppet_config: {}
      docker_config: {}
      external_deploy_tasks:
        list_concat:
--- a/deployment/ceph-ansible/ceph-nfs.yaml
+++ b/deployment/ceph-ansible/ceph-nfs.yaml
@ -102,10 +102,7 @@ outputs:
                tripleo_upgrade_key: ceph_nfs_short_node_names_override
              when: ceph_nfs_short_node_names_upgraded | length == ceph_nfs_short_node_names | length
      step_config: 'include tripleo::profile::pacemaker::ceph_nfs'
-      puppet_config:
-        config_image: ''
-        config_volume: ''
-        step_config: ''
+      puppet_config: {}
      # step_config seems to be ignored if docker_config is present
      #docker_config: {}
      external_deploy_tasks:
--- a/deployment/ceph-ansible/ceph-osd.yaml
+++ b/deployment/ceph-ansible/ceph-osd.yaml
@ -114,10 +114,7 @@ outputs:
            when: step|int == 2
            become: true
            delegate_to: "{{ ceph_mon_short_bootstrap_node_name }}"
-      puppet_config:
-        config_image: ''
-        config_volume: ''
-        step_config: ''
+      puppet_config: {}
      docker_config: {}
      external_deploy_tasks:
        list_concat:
--- a/deployment/ceph-ansible/ceph-rbdmirror.yaml
+++ b/deployment/ceph-ansible/ceph-rbdmirror.yaml
@ -71,10 +71,7 @@ outputs:
          dport:
            - '6800-7300'
      upgrade_tasks: []
-      puppet_config:
-        config_image: ''
-        config_volume: ''
-        step_config: ''
+      puppet_config: {}
      docker_config: {}
      external_deploy_tasks:
        list_concat:
--- a/deployment/ceph-ansible/ceph-rgw.yaml
+++ b/deployment/ceph-ansible/ceph-rgw.yaml
@ -110,10 +110,7 @@ outputs:
            - swiftoperator
      upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]}
      post_upgrade_tasks: {get_attr: [CephBase, role_data, post_upgrade_tasks]}
-      puppet_config:
-        config_image: ''
-        config_volume: ''
-        step_config: ''
+      puppet_config: {}
      docker_config: {}
      external_deploy_tasks:
        list_concat:
--- a/deployment/cephadm/ceph-base.yaml
+++ b/deployment/cephadm/ceph-base.yaml
@ -493,10 +493,7 @@ outputs:
    value:
      service_name: ceph_base
      upgrade_tasks: []
-      puppet_config:
-        config_image: ''
-        config_volume: ''
-        step_config: ''
+      puppet_config: {}
      docker_config: {}
      config_settings: {}
      external_deploy_tasks:
--- a/deployment/cephadm/ceph-client.yaml
+++ b/deployment/cephadm/ceph-client.yaml
@ -85,10 +85,7 @@ outputs:
    value:
      service_name: ceph_client
      upgrade_tasks: []
-      puppet_config:
-        config_image: ''
-        config_volume: ''
-        step_config: ''
+      puppet_config: {}
      docker_config: {}
      external_deploy_tasks:
        list_concat:
--- a/deployment/cephadm/ceph-external.yaml
+++ b/deployment/cephadm/ceph-external.yaml
@ -52,10 +52,7 @@ outputs:
    value:
      service_name: ceph_client
      upgrade_tasks: []
-      puppet_config:
-        config_image: ''
-        config_volume: ''
-        step_config: ''
+      puppet_config: {}
      docker_config: {}
      config_settings: {}
      external_deploy_tasks:
--- a/deployment/cephadm/ceph-grafana.yaml
+++ b/deployment/cephadm/ceph-grafana.yaml
@ -136,10 +136,7 @@ outputs:
          - 9100
          - 9283
      upgrade_tasks: []
-      puppet_config:
-        config_image: ''
-        config_volume: ''
-        step_config: ''
+      puppet_config: {}
      docker_config: {}
      external_deploy_tasks:
        list_concat:
--- a/deployment/cephadm/ceph-mds.yaml
+++ b/deployment/cephadm/ceph-mds.yaml
@ -48,10 +48,7 @@ outputs:
              - if:
                - {get_param: CephEnableDashboard}
                - - '9100'
-      puppet_config:
-        config_image: ''
-        config_volume: ''
-        step_config: ''
+      puppet_config: {}
      docker_config: {}
      external_deploy_tasks: []
      external_update_tasks: []
--- a/deployment/cephadm/ceph-mgr.yaml
+++ b/deployment/cephadm/ceph-mgr.yaml
@ -113,10 +113,7 @@ outputs:
                - {get_param: CephEnableDashboard}
                - - {get_param: CephDashboardPort}
      upgrade_tasks: []
-      puppet_config:
-        config_image: ''
-        config_volume: ''
-        step_config: ''
+      puppet_config: {}
      docker_config: {}
      external_deploy_tasks:
        list_concat:
--- a/deployment/cephadm/ceph-mon.yaml
+++ b/deployment/cephadm/ceph-mon.yaml
@ -77,9 +77,6 @@ outputs:
            - ceph
          collectd::plugin::ceph::daemons: []
      upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]}
-      puppet_config:
-        config_image: ''
-        config_volume: ''
-        step_config: ''
+      puppet_config: {}
      docker_config: {}
      external_deploy_tasks: []
--- a/deployment/cephadm/ceph-nfs.yaml
+++ b/deployment/cephadm/ceph-nfs.yaml
@ -106,10 +106,7 @@ outputs:
                tripleo_upgrade_key: ceph_nfs_short_node_names_override
              when: ceph_nfs_short_node_names_upgraded | length == ceph_nfs_short_node_names | length
      step_config: 'include tripleo::profile::pacemaker::ceph_nfs'
-      puppet_config:
-        config_image: ''
-        config_volume: ''
-        step_config: ''
+      puppet_config: {}
      # step_config seems to be ignored if docker_config is present
      #docker_config: {}
      external_deploy_tasks:
--- a/deployment/cephadm/ceph-osd.yaml
+++ b/deployment/cephadm/ceph-osd.yaml
@ -103,10 +103,7 @@ outputs:
          tripleo.collectd.plugins.ceph_osd:
            - ceph
          collectd::plugin::ceph::daemons: []
-      puppet_config:
-        config_image: ''
-        config_volume: ''
-        step_config: ''
+      puppet_config: {}
      docker_config: {}
      external_deploy_tasks:
        list_concat:
--- a/deployment/cephadm/ceph-rbdmirror.yaml
+++ b/deployment/cephadm/ceph-rbdmirror.yaml
@ -64,9 +64,6 @@ outputs:
          dport:
            - '6800-7300'
      upgrade_tasks: []
-      puppet_config:
-        config_image: ''
-        config_volume: ''
-        step_config: ''
+      puppet_config: {}
      docker_config: {}
      external_deploy_tasks: []
--- a/deployment/cephadm/ceph-rgw.yaml
+++ b/deployment/cephadm/ceph-rgw.yaml
@ -121,10 +121,7 @@ outputs:
            - swiftoperator
      upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]}
      post_upgrade_tasks: {get_attr: [CephBase, role_data, post_upgrade_tasks]}
-      puppet_config:
-        config_image: ''
-        config_volume: ''
-        step_config: ''
+      puppet_config: {}
      docker_config: {}
      external_deploy_tasks:
        list_concat:
--- a/deployment/logging/rsyslog-baremetal-ansible.yaml
+++ b/deployment/logging/rsyslog-baremetal-ansible.yaml
@ -37,10 +37,7 @@ outputs:
      deploy_steps_tasks: []
      docker_config: {}
      kolla_config: {}
-      puppet_config:
-        config_volume: ''
-        step_config: ''
-        config_image: ''
+      puppet_config: {}
      host_prep_tasks:
        - name: Ensure rsyslog is installed
          package:
--- a/deployment/octavia/octavia-deployment-config.j2.yaml
+++ b/deployment/octavia/octavia-deployment-config.j2.yaml
@ -214,10 +214,7 @@ outputs:
    value:
      service_name: octavia_deployment_config
      upgrade_tasks: []
-      puppet_config:
-        config_image: ''
-        config_volume: ''
-        step_config: ''
+      puppet_config: {}
      docker_config: {}
      config_settings: {}
      external_post_deploy_tasks:
--- a/deployment/ovn/ovn-dbs-container-puppet.yaml
+++ b/deployment/ovn/ovn-dbs-container-puppet.yaml
@ -99,11 +99,7 @@ outputs:
      # the NB and SB DB servers to listen on the proper IP address/port
      # in the docker_config section.
      # puppet_config is defined to satisfy the pep8 validations.
-      puppet_config:
-        config_volume: ''
-        config_image: ''
-        step_config: |
-          include tripleo::profile::base::neutron::ovn_northd #unused
+      puppet_config: {}
      kolla_config:
        /var/lib/kolla/config_files/ovn_north_db_server.json:
          command: /usr/local/bin/start-nb-db-server
--- a/deployment/undercloud/undercloud-upgrade.yaml
+++ b/deployment/undercloud/undercloud-upgrade.yaml
@ -50,10 +50,7 @@ outputs:
      deploy_steps_tasks: []
      docker_config: {}
      kolla_config: {}
-      puppet_config:
-        config_volume: ''
-        step_config: ''
-        config_image: ''
+      puppet_config: {}
      upgrade_tasks:
        - name: Enforce RHOSP rules regarding subscription.
          include_role:
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@ -759,7 +759,8 @@ def validate_docker_service(filename, tpl):
                    return 1

        if 'puppet_config' in role_data and \
-                VALIDATE_DOCKER_PUPPET_CONFIG_OVERRIDE.get(filename, True):
+                VALIDATE_DOCKER_PUPPET_CONFIG_OVERRIDE.get(filename, True) and \
+                role_data.get('puppet_config', {}) != {}:
            if validate_docker_service_mysql_usage(filename, tpl):
                print('ERROR: could not validate use of mysql service for %s.'
                      % filename)