openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Simplify network_args"

This commit is contained in:
Zuul 2017-11-08 08:13:48 +00:00 committed by Gerrit Code Review
parent 0899f84f13 13e889c1ab
commit 75ae474e85
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
roles/overcloud-deploy/tasks/pre-deploy.yml
View File

@ -63,33 +63,24 @@
- network_isolation_type == "public-bond"
- not overcloud_ipv6|bool
- name: set network_args fact
- name: set network_args fact for non-containerized
set_fact:
network_args: >-
{% if network_isolation|bool %}{{ network_isolation_args }}{% endif %}
{{ network_isolation_args }}
when:
- network_isolation|bool
- not containerized_overcloud|bool
- name: set network_args fact for containers
set_fact:
network_args: >-
{{ network_isolation_args }}
-e {{ working_dir }}/containers-default-parameters.yaml
when:
- containerized_overcloud|bool
- network_isolation|bool
- not enable_tls_everywhere|bool
- name: set network_args fact for TLS containers
set_fact:
network_args: >-
{% if enable_tls_everywhere|bool %}
-e {{ overcloud_templates_path }}/environments/docker-services-tls-everywhere.yaml
{% endif %}
{{ network_isolation_args }}
-e {{ working_dir }}/containers-default-parameters.yaml
when:
- containerized_overcloud|bool
- network_isolation|bool
- enable_tls_everywhere|bool
- containerized_overcloud|bool
- name: enable pacemaker
set_fact: