Browse Source

Merge "Drop use of config_container var in config-download playbooks"

changes/74/770674/57
Zuul 3 months ago
committed by Gerrit Code Review
parent
commit
a9ad178842
3 changed files with 2 additions and 13 deletions
  1. +1
    -9
      tripleo_ansible/ansible_plugins/modules/tripleo_config_download.py
  2. +0
    -1
      tripleo_ansible/playbooks/cli-config-download-export.yaml
  3. +1
    -3
      tripleo_ansible/playbooks/cli-config-download.yaml

+ 1
- 9
tripleo_ansible/ansible_plugins/modules/tripleo_config_download.py View File

@ -48,11 +48,6 @@ options:
- Overcloud plan name
type: str
default: overcloud
config_container:
description:
- Config container name
type: str
default: overcloud-config
work_dir:
description:
- Work dir
@ -75,7 +70,6 @@ EXAMPLES = '''
- name: Download config
tripleo_config_download:
plan: overcloud
config_container: overcloud-config
work_dir: /home/stack/config-downloa
'''
@ -99,7 +93,6 @@ def run_module():
try:
plan = module.params.get('plan')
config_container = module.params.get('config_container')
work_dir = module.params.get('work_dir')
config_type = module.params.get('config_type')
download = module.params.get('download')
@ -109,10 +102,9 @@ def run_module():
heat = tripleo.get_orchestration_client()
ooo_config.get_overcloud_config(
swift=False,
swift=None,
heat=heat,
container=plan,
container_config=config_container,
config_dir=work_dir,
config_type=config_type,
preserve_config=download)


+ 0
- 1
tripleo_ansible/playbooks/cli-config-download-export.yaml View File

@ -51,7 +51,6 @@
- name: Get config
tripleo_config_download:
plan: "{{ plan }}"
config_container: "{{ config_container }}"
config_type: "{{ config_type }}"
work_dir: "{{ work_dir }}"
download: true

+ 1
- 3
tripleo_ansible/playbooks/cli-config-download.yaml View File

@ -33,16 +33,14 @@
output_dir: "{{ lookup('env', 'HOME')~'/config-download'}}"
when: output_dir is not defined
- name: Set work_dir and config_container
- name: Set work_dir
set_fact:
config_container: "{{ plan ~ '-config' }}"
work_dir: "{{ output_dir ~ '/' ~ plan }}"
- name: Download config
tripleo_config_download:
plan: "{{ plan }}"
work_dir: "{{ work_dir }}"
config_container: "{{ config_container }}"
download: true
- name: Generate ansible inventory


Loading…
Cancel
Save