diff options
author | Giulio Fidente <gfidente@redhat.com> | 2017-05-26 01:35:53 +0200 |
---|---|---|
committer | John Fulton <fulton@redhat.com> | 2017-07-26 17:37:35 -0400 |
commit | d11e256eedac1e1fb7e5b21baebf585924c95353 (patch) | |
tree | bf4753d25c082adf805ecb74fd87134c529a86b5 /tools | |
parent | ed0b77ff93a1a1e071d32f6a758e04c6d0b041ef (diff) |
Deploy Ceph in containers using ceph-ansible via external workflow
Add docker profiles to deploy Ceph in containers via ceph-ansible. This is
implemented by triggering a Mistral workflow during one of the overcloud
deployment steps, as provided by [1].
Some new service-specific parameters are available to determine the workflow to
execute and the ansible playbook to use. A new `CephAnsibleExtraConfig`
parameter can be used to provide arbitrary config variables consumed by `ceph-ansible`.
The pre-existing template params consumed up until the Pike release to
drive `puppet-ceph` continue to work and are translated, when possible, into
the equivalent `ceph-ansible` variable.
A new environment file is added to enable use of ceph-ansible;
the pre-existing puppet-ceph implementation remains unchanged and usable
for non-containerized deployments.
1. https://review.openstack.org/#/c/463324/
Change-Id: I81d44a1e198c83a4ef8b109b4eb6c611555dcdc5
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/yaml-validate.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py index 33d12eec..b6fe8e93 100755 --- a/tools/yaml-validate.py +++ b/tools/yaml-validate.py @@ -31,6 +31,7 @@ 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 = ['service_workflow_tasks'] REQUIRED_DOCKER_SECTIONS = ['service_name', 'docker_config', 'puppet_config', 'config_settings', 'step_config'] OPTIONAL_DOCKER_SECTIONS = ['docker_puppet_tasks', 'upgrade_tasks', @@ -271,6 +272,8 @@ def validate_docker_service(filename, tpl): else: if section_name in OPTIONAL_DOCKER_SECTIONS: continue + elif section_name in OPTIONAL_SECTIONS: + continue else: print('ERROR: %s is extra in role_data for %s.' % (section_name, filename)) |