Ignore puppet_config is an empty dict

Previously this was required which lead to folks defining invalid empty
data that actually gets ignored later in the process. Since you don't
have to have a puppet_config, let's say it needs to be defined but skip
validation if it is an empty.

Change-Id: I7310c340a1e2b48cdbc378ab4fe3944bd7e89112
This commit is contained in:
Alex Schultz 2021-05-18 15:20:07 -06:00
parent 2b9b8eed90
commit 45fca9e029
27 changed files with 28 additions and 106 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -95,10 +95,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:

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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: []

View File

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

View File

@ -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: []

View File

@ -99,10 +99,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:

View File

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

View File

@ -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: []

View File

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

View File

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

View File

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

View File

@ -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

View File

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

View File

@ -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)