Browse Source

Merge "[Ussuri and older] Set python_cmd where we need it" into stable/train

changes/89/767589/6
Zuul 1 month ago
committed by Gerrit Code Review
parent
commit
9a202b49e1
3 changed files with 30 additions and 15 deletions
  1. +0
    -15
      common/deploy-steps-tasks-step-1.yaml
  2. +15
    -0
      common/generate-config-tasks.yaml
  3. +15
    -0
      common/host-container-puppet-tasks.yaml

+ 0
- 15
common/deploy-steps-tasks-step-1.yaml View File

@ -272,21 +272,6 @@
tags:
- 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
set_fact:
host_puppet_config_debug: "--debug --verbose"


+ 15
- 0
common/generate-config-tasks.yaml View File

@ -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
when:
- enable_paunch|bool


+ 15
- 0
common/host-container-puppet-tasks.yaml View File

@ -9,6 +9,21 @@
tags:
- 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
when:
- enable_paunch|bool


Loading…
Cancel
Save