Merge "Only concatenate default_templates_dir when necessary"
This commit is contained in:
commit
6d165d1af6
|
@ -89,12 +89,18 @@
|
||||||
|
|
||||||
when: use_default_templates or source_url is not none
|
when: use_default_templates or source_url is not none
|
||||||
|
|
||||||
- name: Create plan environment if does not exit
|
# If plan_environment is an absolute path, then
|
||||||
|
# don't prepend the templates dir. Else prepend it.
|
||||||
|
- name: Create plan environment if does not exist
|
||||||
os_object:
|
os_object:
|
||||||
container: "{{ container }}"
|
container: "{{ container }}"
|
||||||
name: plan-environment.yaml
|
name: plan-environment.yaml
|
||||||
filename: "{{ default_templates_dir + plan_environment }}"
|
|
||||||
state: present
|
state: present
|
||||||
|
filename: >-
|
||||||
|
{{ plan_environment.startswith('/')
|
||||||
|
| ternary(plan_environment,
|
||||||
|
default_templates_dir.rstrip('/')
|
||||||
|
+ '/' + plan_environment) }}
|
||||||
|
|
||||||
- name: Generate passwords and update plan
|
- name: Generate passwords and update plan
|
||||||
tripleo_passwords_rotate:
|
tripleo_passwords_rotate:
|
||||||
|
|
Loading…
Reference in New Issue