openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Ignore puppet_config is an empty dict"

This commit is contained in:
Zuul 2021-06-08 21:35:28 +00:00 committed by Gerrit Code Review
parent 5e7ed965c6 45fca9e029
commit 776d375ff0
27 changed files with 28 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deployment/ceph-ansible/ceph-base.yaml
View File

@ -538,10 +538,7 @@ outputs:
value: value:
service_name: ceph_base service_name: ceph_base
upgrade_tasks: [] upgrade_tasks: []
puppet_config: puppet_config: {}
config_image: ''
config_volume: ''
step_config: ''
docker_config: {} docker_config: {}
config_settings: {} config_settings: {}
external_deploy_tasks: external_deploy_tasks:

5
deployment/ceph-ansible/ceph-client.yaml
View File

@ -44,10 +44,7 @@ outputs:
value: value:
service_name: ceph_client service_name: ceph_client
upgrade_tasks: [] upgrade_tasks: []
puppet_config: puppet_config: {}
config_image: ''
config_volume: ''
step_config: ''
docker_config: {} docker_config: {}
external_deploy_tasks: external_deploy_tasks:
list_concat: list_concat:

5
deployment/ceph-ansible/ceph-external.yaml
View File

@ -48,10 +48,7 @@ outputs:
value: value:
service_name: ceph_client service_name: ceph_client
upgrade_tasks: [] upgrade_tasks: []
puppet_config: puppet_config: {}
config_image: ''
config_volume: ''
step_config: ''
docker_config: {} docker_config: {}
config_settings: {} config_settings: {}
external_deploy_tasks: external_deploy_tasks:

5
deployment/ceph-ansible/ceph-grafana.yaml
View File

@ -116,10 +116,7 @@ outputs:
- 9100 - 9100
- 9283 - 9283
upgrade_tasks: [] upgrade_tasks: []
puppet_config: puppet_config: {}
config_image: ''
config_volume: ''
step_config: ''
docker_config: {} docker_config: {}
external_deploy_tasks: external_deploy_tasks:
list_concat: list_concat:

5
deployment/ceph-ansible/ceph-mds.yaml
View File

@ -58,10 +58,7 @@ outputs:
- [] - []
upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]} upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]}
post_upgrade_tasks: {get_attr: [CephBase, role_data, post_upgrade_tasks]} post_upgrade_tasks: {get_attr: [CephBase, role_data, post_upgrade_tasks]}
puppet_config: puppet_config: {}
config_image: ''
config_volume: ''
step_config: ''
docker_config: {} docker_config: {}
external_deploy_tasks: external_deploy_tasks:
list_concat: list_concat:

5
deployment/ceph-ansible/ceph-mgr.yaml
View File

@ -109,10 +109,7 @@ outputs:
- {get_param: CephEnableDashboard} - {get_param: CephEnableDashboard}
- - {get_param: CephDashboardPort} - - {get_param: CephDashboardPort}
upgrade_tasks: [] upgrade_tasks: []
puppet_config: puppet_config: {}
config_image: ''
config_volume: ''
step_config: ''
docker_config: {} docker_config: {}
external_deploy_tasks: external_deploy_tasks:
list_concat: list_concat:

5
deployment/ceph-ansible/ceph-mon.yaml
View File

@ -80,10 +80,7 @@ outputs:
collectd::plugin::ceph::daemons: [] collectd::plugin::ceph::daemons: []
upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]} upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]}
post_upgrade_tasks: {get_attr: [CephBase, role_data, post_upgrade_tasks]} post_upgrade_tasks: {get_attr: [CephBase, role_data, post_upgrade_tasks]}
puppet_config: puppet_config: {}
config_image: ''
config_volume: ''
step_config: ''
docker_config: {} docker_config: {}
external_deploy_tasks: external_deploy_tasks:
list_concat: list_concat:

5
deployment/ceph-ansible/ceph-nfs.yaml
View File

@ -102,10 +102,7 @@ outputs:
tripleo_upgrade_key: ceph_nfs_short_node_names_override tripleo_upgrade_key: ceph_nfs_short_node_names_override
when: ceph_nfs_short_node_names_upgraded | length == ceph_nfs_short_node_names | length when: ceph_nfs_short_node_names_upgraded | length == ceph_nfs_short_node_names | length
step_config: 'include tripleo::profile::pacemaker::ceph_nfs' step_config: 'include tripleo::profile::pacemaker::ceph_nfs'
puppet_config: puppet_config: {}
config_image: ''
config_volume: ''
step_config: ''
# step_config seems to be ignored if docker_config is present # step_config seems to be ignored if docker_config is present
#docker_config: {} #docker_config: {}
external_deploy_tasks: external_deploy_tasks:

5
deployment/ceph-ansible/ceph-osd.yaml
View File

@ -114,10 +114,7 @@ outputs:
when: step|int == 2 when: step|int == 2
become: true become: true
delegate_to: "{{ ceph_mon_short_bootstrap_node_name }}" delegate_to: "{{ ceph_mon_short_bootstrap_node_name }}"
puppet_config: puppet_config: {}
config_image: ''
config_volume: ''
step_config: ''
docker_config: {} docker_config: {}
external_deploy_tasks: external_deploy_tasks:
list_concat: list_concat:

5
deployment/ceph-ansible/ceph-rbdmirror.yaml
View File

@ -71,10 +71,7 @@ outputs:
dport: dport:
- '6800-7300' - '6800-7300'
upgrade_tasks: [] upgrade_tasks: []
puppet_config: puppet_config: {}
config_image: ''
config_volume: ''
step_config: ''
docker_config: {} docker_config: {}
external_deploy_tasks: external_deploy_tasks:
list_concat: list_concat:

5
deployment/ceph-ansible/ceph-rgw.yaml
View File

@ -110,10 +110,7 @@ outputs:
- swiftoperator - swiftoperator
upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]} upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]}
post_upgrade_tasks: {get_attr: [CephBase, role_data, post_upgrade_tasks]} post_upgrade_tasks: {get_attr: [CephBase, role_data, post_upgrade_tasks]}
puppet_config: puppet_config: {}
config_image: ''
config_volume: ''
step_config: ''
docker_config: {} docker_config: {}
external_deploy_tasks: external_deploy_tasks:
list_concat: list_concat:

5
deployment/cephadm/ceph-base.yaml
View File

@ -493,10 +493,7 @@ outputs:
value: value:
service_name: ceph_base service_name: ceph_base
upgrade_tasks: [] upgrade_tasks: []
puppet_config: puppet_config: {}
config_image: ''
config_volume: ''
step_config: ''
docker_config: {} docker_config: {}
config_settings: {} config_settings: {}
external_deploy_tasks: external_deploy_tasks:

5
deployment/cephadm/ceph-client.yaml
View File

@ -85,10 +85,7 @@ outputs:
value: value:
service_name: ceph_client service_name: ceph_client
upgrade_tasks: [] upgrade_tasks: []
puppet_config: puppet_config: {}
config_image: ''
config_volume: ''
step_config: ''
docker_config: {} docker_config: {}
external_deploy_tasks: external_deploy_tasks:
list_concat: list_concat:

5
deployment/cephadm/ceph-external.yaml
View File

@ -52,10 +52,7 @@ outputs:
value: value:
service_name: ceph_client service_name: ceph_client
upgrade_tasks: [] upgrade_tasks: []
puppet_config: puppet_config: {}
config_image: ''
config_volume: ''
step_config: ''
docker_config: {} docker_config: {}
config_settings: {} config_settings: {}
external_deploy_tasks: external_deploy_tasks:

5
deployment/cephadm/ceph-grafana.yaml
View File

@ -136,10 +136,7 @@ outputs:
- 9100 - 9100
- 9283 - 9283
upgrade_tasks: [] upgrade_tasks: []
puppet_config: puppet_config: {}
config_image: ''
config_volume: ''
step_config: ''
docker_config: {} docker_config: {}
external_deploy_tasks: external_deploy_tasks:
list_concat: list_concat:

5
deployment/cephadm/ceph-mds.yaml
View File

@ -48,10 +48,7 @@ outputs:
- if: - if:
- {get_param: CephEnableDashboard} - {get_param: CephEnableDashboard}
- - '9100' - - '9100'
puppet_config: puppet_config: {}
config_image: ''
config_volume: ''
step_config: ''
docker_config: {} docker_config: {}
external_deploy_tasks: [] external_deploy_tasks: []
external_update_tasks: [] external_update_tasks: []

5
deployment/cephadm/ceph-mgr.yaml
View File

@ -113,10 +113,7 @@ outputs:
- {get_param: CephEnableDashboard} - {get_param: CephEnableDashboard}
- - {get_param: CephDashboardPort} - - {get_param: CephDashboardPort}
upgrade_tasks: [] upgrade_tasks: []
puppet_config: puppet_config: {}
config_image: ''
config_volume: ''
step_config: ''
docker_config: {} docker_config: {}
external_deploy_tasks: external_deploy_tasks:
list_concat: list_concat:

5
deployment/cephadm/ceph-mon.yaml
View File

@ -77,9 +77,6 @@ outputs:
- ceph - ceph
collectd::plugin::ceph::daemons: [] collectd::plugin::ceph::daemons: []
upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]} upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]}
puppet_config: puppet_config: {}
config_image: ''
config_volume: ''
step_config: ''
docker_config: {} docker_config: {}
external_deploy_tasks: [] external_deploy_tasks: []

5
deployment/cephadm/ceph-nfs.yaml
View File

@ -106,10 +106,7 @@ outputs:
tripleo_upgrade_key: ceph_nfs_short_node_names_override tripleo_upgrade_key: ceph_nfs_short_node_names_override
when: ceph_nfs_short_node_names_upgraded | length == ceph_nfs_short_node_names | length when: ceph_nfs_short_node_names_upgraded | length == ceph_nfs_short_node_names | length
step_config: 'include tripleo::profile::pacemaker::ceph_nfs' step_config: 'include tripleo::profile::pacemaker::ceph_nfs'
puppet_config: puppet_config: {}
config_image: ''
config_volume: ''
step_config: ''
# step_config seems to be ignored if docker_config is present # step_config seems to be ignored if docker_config is present
#docker_config: {} #docker_config: {}
external_deploy_tasks: external_deploy_tasks:

5
deployment/cephadm/ceph-osd.yaml
View File

@ -103,10 +103,7 @@ outputs:
tripleo.collectd.plugins.ceph_osd: tripleo.collectd.plugins.ceph_osd:
- ceph - ceph
collectd::plugin::ceph::daemons: [] collectd::plugin::ceph::daemons: []
puppet_config: puppet_config: {}
config_image: ''
config_volume: ''
step_config: ''
docker_config: {} docker_config: {}
external_deploy_tasks: external_deploy_tasks:
list_concat: list_concat:

5
deployment/cephadm/ceph-rbdmirror.yaml
View File

@ -64,9 +64,6 @@ outputs:
dport: dport:
- '6800-7300' - '6800-7300'
upgrade_tasks: [] upgrade_tasks: []
puppet_config: puppet_config: {}
config_image: ''
config_volume: ''
step_config: ''
docker_config: {} docker_config: {}
external_deploy_tasks: [] external_deploy_tasks: []

5
deployment/cephadm/ceph-rgw.yaml
View File

@ -121,10 +121,7 @@ outputs:
- swiftoperator - swiftoperator
upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]} upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]}
post_upgrade_tasks: {get_attr: [CephBase, role_data, post_upgrade_tasks]} post_upgrade_tasks: {get_attr: [CephBase, role_data, post_upgrade_tasks]}
puppet_config: puppet_config: {}
config_image: ''
config_volume: ''
step_config: ''
docker_config: {} docker_config: {}
external_deploy_tasks: external_deploy_tasks:
list_concat: list_concat:

5
deployment/logging/rsyslog-baremetal-ansible.yaml
View File

@ -37,10 +37,7 @@ outputs:
deploy_steps_tasks: [] deploy_steps_tasks: []
docker_config: {} docker_config: {}
kolla_config: {} kolla_config: {}
puppet_config: puppet_config: {}
config_volume: ''
step_config: ''
config_image: ''
host_prep_tasks: host_prep_tasks:
- name: Ensure rsyslog is installed - name: Ensure rsyslog is installed
package: package:

5
deployment/octavia/octavia-deployment-config.j2.yaml
View File

@ -214,10 +214,7 @@ outputs:
value: value:
service_name: octavia_deployment_config service_name: octavia_deployment_config
upgrade_tasks: [] upgrade_tasks: []
puppet_config: puppet_config: {}
config_image: ''
config_volume: ''
step_config: ''
docker_config: {} docker_config: {}
config_settings: {} config_settings: {}
external_post_deploy_tasks: external_post_deploy_tasks:

6
deployment/ovn/ovn-dbs-container-puppet.yaml
View File

@ -99,11 +99,7 @@ outputs:
# the NB and SB DB servers to listen on the proper IP address/port # the NB and SB DB servers to listen on the proper IP address/port
# in the docker_config section. # in the docker_config section.
# puppet_config is defined to satisfy the pep8 validations. # puppet_config is defined to satisfy the pep8 validations.
puppet_config: puppet_config: {}
config_volume: ''
config_image: ''
step_config: |
include tripleo::profile::base::neutron::ovn_northd #unused
kolla_config: kolla_config:
/var/lib/kolla/config_files/ovn_north_db_server.json: /var/lib/kolla/config_files/ovn_north_db_server.json:
command: /usr/local/bin/start-nb-db-server command: /usr/local/bin/start-nb-db-server

5
deployment/undercloud/undercloud-upgrade.yaml
View File

@ -50,10 +50,7 @@ outputs:
deploy_steps_tasks: [] deploy_steps_tasks: []
docker_config: {} docker_config: {}
kolla_config: {} kolla_config: {}
puppet_config: puppet_config: {}
config_volume: ''
step_config: ''
config_image: ''
upgrade_tasks: upgrade_tasks:
- name: Enforce RHOSP rules regarding subscription. - name: Enforce RHOSP rules regarding subscription.
include_role: include_role:

3
tools/yaml-validate.py
View File

@ -759,7 +759,8 @@ def validate_docker_service(filename, tpl):
return 1 return 1
if 'puppet_config' in role_data and \ 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): if validate_docker_service_mysql_usage(filename, tpl):
print('ERROR: could not validate use of mysql service for %s.' print('ERROR: could not validate use of mysql service for %s.'
% filename) % filename)