Move 'extra_tht_configs' tasks to overcloud-deploy role
'extra_tht_configs' parameter is used to pass extra tht configs to overcloud deploy command(using 'extra_tht_config_args' fact), this parameter is used to modify overcloud-deploy command, so this patch moves the tasks associated with it to overcloud-deploy role. Closes-Bug: #1806328 Change-Id: I4367bd554bfc06b2416fee792b5b2a91ff8f7ff8
This commit is contained in:
parent
366634808a
commit
4666dc02a0
@ -46,7 +46,8 @@ A description of the settable variables for this role should go here, including
|
||||
* `virt_type`: qemu|kvm default is qemu. kvm is only enabled when kvm-{intel|amd}
|
||||
kernel module can be loaded.
|
||||
* `topology_map`: undefined - a dictionary of roles with their scale (count) and flavor names. Example: topology_map: { 'Controller': { 'scale': 3, 'flavor': 'baremetal' } }
|
||||
|
||||
* `extra_tht_configs`: -- a list of files to copy to the undercloud and add as
|
||||
extra config to the overcloud-deployment command.
|
||||
|
||||
Dependencies
|
||||
------------
|
||||
|
@ -1,4 +1,19 @@
|
||||
---
|
||||
- name: Copy extra THT config files on the undercloud
|
||||
copy:
|
||||
src: "{{ item }}"
|
||||
dest: "{{ working_dir }}"
|
||||
with_items: "{{ extra_tht_configs|default([]) }}"
|
||||
|
||||
- name: Add extra THT config file to the deploy command
|
||||
set_fact:
|
||||
extra_tht_config_args: >-
|
||||
{{ extra_tht_config_args|default('') }}
|
||||
{% if extra_tht_configs|default([])|length > 0 %}
|
||||
-e {{ extra_tht_configs | default([]) | map('basename') | map('regex_replace', '(.*)', "{{ working_dir }}/\1") | join (' -e ') }}
|
||||
{% endif %}
|
||||
cacheable: true
|
||||
|
||||
# Generate a number of scripts from templates. These are scripts
|
||||
# rather than additional ansible tasks so that they can be run
|
||||
# manually from the undercloud host.
|
||||
|
@ -23,8 +23,6 @@ Role Variables
|
||||
-- location of network-environment file to copy over
|
||||
- `undercloud_type`: <virtual> -- can be overwritten with values like
|
||||
'baremetal' or 'ovb'
|
||||
- `extra_tht_configs`: -- a list of files to copy to the overcloud and add as
|
||||
extra config to the overcloud-deployment command
|
||||
- `network_isolation_type`: single-nic-vlans, multiple-nics, bond-with-vlans, public-bond -
|
||||
type of network isolation to use (default: single-nic-vlans) [1]
|
||||
deprecated types - single_nic_vlans, bond_with_vlans, multi-nic
|
||||
|
@ -73,16 +73,3 @@
|
||||
when:
|
||||
- overcloud_templates_refspec is defined or overcloud_templates_branch is defined
|
||||
- overcloud_templates_repo is defined
|
||||
|
||||
- name: Copy extra THT config files on the undercloud
|
||||
copy:
|
||||
src: "{{ item }}"
|
||||
dest: "{{ working_dir }}"
|
||||
with_items: "{{ extra_tht_configs|default([]) }}"
|
||||
|
||||
- name: Add extra THT config file to the deploy command
|
||||
set_fact:
|
||||
extra_tht_config_args: >-
|
||||
{{ extra_tht_config_args|default('') }}
|
||||
-e {{ working_dir }}/{{ item | basename }}
|
||||
with_items: "{{ extra_tht_configs|default([]) }}"
|
||||
|
Loading…
x
Reference in New Issue
Block a user