Containerized deployment with pacemaker via OOOQ

When deploying containerized and enable_pacemaker is set to true, make
sure to include the docker-ha.yaml file.

Also this cleans up the `when` conditional, which allows to remove the
docker.yaml file from network_args, which prevents network_args from
unwantedly overriding docker-ha.yaml contents from container_args.

Change-Id: I5f28d2f784b9cd381ba370c9635300fe0ed79845
Partial-Bug: #1712070
This commit is contained in:
Jiri Stransky 2017-08-21 14:51:29 +02:00
parent 3b89cd0b3c
commit c44fc11c56
1 changed files with 5 additions and 2 deletions

View File

@ -73,7 +73,6 @@
- name: set network_args fact for containers
set_fact:
network_args: >-
-e {{ overcloud_templates_path }}/environments/docker.yaml
{{ network_isolation_args }}
-e {{ working_dir }}/containers-default-parameters.yaml
when:
@ -178,11 +177,15 @@
set_fact:
container_args: >-
-e {{ overcloud_templates_path }}/environments/docker.yaml
{% if enable_pacemaker|bool %}
-e {{ overcloud_templates_path }}/environments/docker-ha.yaml
{% endif %}
{% if not network_isolation|bool %}
-e {{ overcloud_templates_path }}/environments/docker-network.yaml
{% endif %}
-e {{ working_dir }}/containers-default-parameters.yaml
when:
- containerized_overcloud|bool
- not network_isolation|bool
- name: set composable roles args fact
set_fact: