Merge "[Ussuri and older] Set python_cmd where we need it" into stable/train
This commit is contained in:
commit
9a202b49e1
|
@ -272,21 +272,6 @@
|
||||||
tags:
|
tags:
|
||||||
- container_startup_configs
|
- container_startup_configs
|
||||||
|
|
||||||
- name: gather facts needed by role
|
|
||||||
setup:
|
|
||||||
gather_subset: "!min,python"
|
|
||||||
when: ansible_facts['python'] is not defined
|
|
||||||
tags:
|
|
||||||
- container_config_tasks
|
|
||||||
|
|
||||||
- name: set python_cmd
|
|
||||||
set_fact:
|
|
||||||
python_cmd: "python{{ ansible_facts['python']['version']['major'] }}"
|
|
||||||
cacheable: true
|
|
||||||
when: python_cmd is not defined
|
|
||||||
tags:
|
|
||||||
- container_config_tasks
|
|
||||||
|
|
||||||
- name: Set host puppet debugging fact string
|
- name: Set host puppet debugging fact string
|
||||||
set_fact:
|
set_fact:
|
||||||
host_puppet_config_debug: "--debug --verbose"
|
host_puppet_config_debug: "--debug --verbose"
|
||||||
|
|
|
@ -1,3 +1,18 @@
|
||||||
|
- name: Gather facts needed by role if necessary
|
||||||
|
setup:
|
||||||
|
gather_subset: "!min,python"
|
||||||
|
when: ansible_python is not defined
|
||||||
|
tags:
|
||||||
|
- container_config_tasks
|
||||||
|
|
||||||
|
- name: set python_cmd if necessary
|
||||||
|
set_fact:
|
||||||
|
python_cmd: "python{{ ansible_python.version.major }}"
|
||||||
|
cacheable: true
|
||||||
|
when: python_cmd is not defined
|
||||||
|
tags:
|
||||||
|
- container_config_tasks
|
||||||
|
|
||||||
- name: Block for container-puppet tasks (generate config) during step 1 with paunch
|
- name: Block for container-puppet tasks (generate config) during step 1 with paunch
|
||||||
when:
|
when:
|
||||||
- enable_paunch|bool
|
- enable_paunch|bool
|
||||||
|
|
|
@ -9,6 +9,21 @@
|
||||||
tags:
|
tags:
|
||||||
- container_config_tasks
|
- container_config_tasks
|
||||||
|
|
||||||
|
- name: Gather ansible facts if necessary
|
||||||
|
setup:
|
||||||
|
gather_subset: "!min,python"
|
||||||
|
when: ansible_python is not defined
|
||||||
|
tags:
|
||||||
|
- container_config_tasks
|
||||||
|
|
||||||
|
- name: Set python_cmd if necessary
|
||||||
|
set_fact:
|
||||||
|
python_cmd: "python{{ ansible_python.version.major }}"
|
||||||
|
cacheable: true
|
||||||
|
when: python_cmd is not defined
|
||||||
|
tags:
|
||||||
|
- container_config_tasks
|
||||||
|
|
||||||
- name: Block for container-puppet tasks (bootstrap tasks) for step {{ step }} with paunch
|
- name: Block for container-puppet tasks (bootstrap tasks) for step {{ step }} with paunch
|
||||||
when:
|
when:
|
||||||
- enable_paunch|bool
|
- enable_paunch|bool
|
||||||
|
|
Loading…
Reference in New Issue