aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-22 03:27:55 +0000
committerGerrit Code Review <review@openstack.org>2017-03-22 03:27:55 +0000
commitf642324cafe3581e78c4bceed594c2818268271e (patch)
tree32eea6a31e3c7f1274c379535662dadaf14aff8e
parente0bd63c826e687d9019b76297e9375f3b0608c2e (diff)
parent7661d1f0085c2cc43dc78f4d783b45b1d17193f5 (diff)
Merge "Change kolla_config from required to optional in pep8."
-rwxr-xr-xtools/yaml-validate.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index c6e51858..5ff6f134 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -23,11 +23,11 @@ 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'
-REQUIRED_DOCKER_SECTIONS = ['service_name', 'docker_config', 'kolla_config',
- 'puppet_config', 'config_settings', 'step_config']
+REQUIRED_DOCKER_SECTIONS = ['service_name', 'docker_config', 'puppet_config',
+ 'config_settings', 'step_config']
OPTIONAL_DOCKER_SECTIONS = ['docker_puppet_tasks', 'upgrade_tasks',
'service_config_settings', 'host_prep_tasks',
- 'metadata_settings']
+ 'metadata_settings', 'kolla_config']
DOCKER_PUPPET_CONFIG_SECTIONS = ['config_volume', 'puppet_tags', 'step_config',
'config_image']