diff options
| author |   Oliver Walsh <owalsh@redhat.com> | 2017-10-20 23:27:15 +0100 |
|---|---|---|
| committer | Oliver Walsh <owalsh@redhat.com> | 2017-11-10 09:25:25 +0000 |
| commit | 4217767d8782abae02b11f553fc14daf7cd72916 (patch) | |
| tree | 40a20fb6bd90c57faed62de6192d3b208a6a0194 /tools/yaml-validate.py | |
| parent | 690b938c58af1446bd27c34b17fa45e865241e99 (diff) | |
Refactor cellv2 host discovery logic to avoid races
The compute service list is polled until all expected hosts are reported or a
timeout occurs (600s).
Adds a cellv2_discovery flag to puppet services. Used to generate a list of
hosts that should have cellv2 host mappings.
Adds a canonical fqdn and that should match the fqdn reported by a host.
Adds the ability to upload a config script for docker config instead of using
complex bash on-liners.
Closes-bug: 1720821
Change-Id: I33e2f296526c957cb5f96dff19682a4e60c6a0f0
(cherry picked from commit 61fcfca045aeb5be1ee280d8dd9c260fb39b9084)
Diffstat (limited to 'tools/yaml-validate.py')
| -rwxr-xr-x | tools/yaml-validate.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py index 76f856db..9279f1db 100755 --- a/tools/yaml-validate.py +++ b/tools/yaml-validate.py @@ -31,14 +31,15 @@ envs_containing_endpoint_map = ['tls-endpoints-public-dns.yaml', 'tls-endpoints-public-ip.yaml', 'tls-everywhere-endpoints-dns.yaml'] ENDPOINT_MAP_FILE = 'endpoint_map.yaml' -OPTIONAL_SECTIONS = ['workflow_tasks'] +OPTIONAL_SECTIONS = ['workflow_tasks', 'cellv2_discovery'] REQUIRED_DOCKER_SECTIONS = ['service_name', 'docker_config', 'puppet_config', 'config_settings', 'step_config'] OPTIONAL_DOCKER_SECTIONS = ['docker_puppet_tasks', 'upgrade_tasks', 'post_upgrade_tasks', 'update_tasks', 'service_config_settings', 'host_prep_tasks', 'metadata_settings', - 'kolla_config', 'logging_source', 'logging_groups'] + 'kolla_config', 'logging_source', + 'logging_groups', 'docker_config_scripts'] REQUIRED_DOCKER_PUPPET_CONFIG_SECTIONS = ['config_volume', 'step_config', 'config_image'] OPTIONAL_DOCKER_PUPPET_CONFIG_SECTIONS = [ 'puppet_tags', 'volumes' ] |