Parametrize overcloud-prep-containers script name.

Upgrading from P->Q will imply running the
overcloud-prep-containers role twice. As the
name used in the script is fix, the second
time the role will run will overwrite the
previous script file, which could be useful
for debugging purposes.

This patch adds a new parameter
'overcloud_prep_containers_script' which sets
the name of the script used to configure the
docker containers.

Change-Id: I7952872b110b25f67d66de0c5ea4610bfb0f0cb1
This commit is contained in:
Jose Luis Franco Arza 2018-02-28 07:52:15 +01:00
parent 3478139e95
commit 6366ff5e38
3 changed files with 6 additions and 6 deletions

View File

@ -1,9 +1,9 @@
---
tripleo_common_dir: /usr/share/openstack-tripleo-common
containerized_overcloud: false
overcloud_prep_containers_script: overcloud-prep-containers.sh.j2
overcloud_prep_containers_log: overcloud_prep_containers.log
overcloud_prep_containers_template: overcloud-prep-containers.sh.j2
overcloud_prep_containers_script: "overcloud-prep-containers.sh"
overcloud_prep_containers_log: "overcloud_prep_containers.log"
prepare_service_env_args: -e {{ overcloud_templates_path }}/environments/docker.yaml
update_containers: false
container_process_count: 8

View File

@ -9,6 +9,6 @@
- name: Create overcloud prep-containers script
template:
src: "{{ overcloud_prep_containers_script }}"
dest: "{{ working_dir }}/overcloud-prep-containers.sh"
src: "{{ overcloud_prep_containers_template }}"
dest: "{{ working_dir }}/{{ overcloud_prep_containers_script }}"
mode: 0755

View File

@ -28,6 +28,6 @@
- name: Prepare for the containerized deployment
shell: >
set -o pipefail &&
{{ working_dir }}/overcloud-prep-containers.sh 2>&1 {{ timestamper_cmd }} >
{{ working_dir }}/{{ overcloud_prep_containers_script }} 2>&1 {{ timestamper_cmd }} >
{{ overcloud_prep_containers_log }}
when: containerized_overcloud|bool