36569be28d
Allow undercloud installations/upgrades from custom t-h-t, similarly to overcloud_templates_* et al. Unify and share custom t-h-t install script for OC and UC and mixed update/upgrade cases via new shared role tht-prep-config. To diverge undercloud from overcloud install/update/upgrade cases, use the following shared mappings (vars on the right correspond to UC cases): * tht_templates_path: undercloud_templates_path (defaults to RPM dir) * tht_templates_repo: undercloud_templates_repo * tht_templates_branch: undercloud_templates_branch * tht_templates_refspec: undercloud_templates_refspec and a 2nd group (defaults set to do nothing, but only disable the t-h-t prepare script's code blocks under control of those): * composable_scenario: undercloud_composable_scenario * upgrade_composable_scenario: undercloud_upgrade_composable_scenario * prep_post_hook_script: undercloud_prep_post_hook_script * download_templates_rpm: download_undercloud_templates_rpm * tht_rpm_url: undercloud_tht_rpm_url Those in group 2 may be customized to mimic the overcloud mixed upgrades logic for underclouds/all-in-one for future use. And for overclouds respectively, use mappings: * composable_scenario: remains unchanged * upgrade_composable_scenario: remains unchanged * prep_post_hook_script: overcloud_prep_post_hook_script * download_templates_rpm: download_overcloud_templates_rpm * tht_rpm_url: remains unchanged * tht_templates_path: overcloud_templates_path ... Related-bug: #1691467 Closes-bug: #1781227 Change-Id: I4e0dcf24b93b8e4afb8359cb5108c4b7b5ba3d55 Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
44 lines
1.7 KiB
YAML
44 lines
1.7 KiB
YAML
---
|
|
|
|
network_isolation: true
|
|
network_isolation_type: single-nic-vlans # multiple-nics, bond-with-vlans, public-bond
|
|
network_environment_file: network-environment.yaml.j2
|
|
|
|
external_network_cidr: 192.168.23.0/24
|
|
undercloud_external_network_cidr: >-
|
|
{%- if overcloud_ipv6|bool %}2001:db8:fd00:1000::/64{% else %}10.0.0.1/24{% endif -%}
|
|
overcloud_dns_servers: [ '{{ external_network_cidr|nthhost(1) }}' ]
|
|
|
|
overcloud_public_vip: "{{ undercloud_external_network_cidr|nthhost(5) }}"
|
|
ssl_overcloud: false
|
|
|
|
network_environment_args:
|
|
ExternalNetCidr: "{{ undercloud_external_network_cidr }}"
|
|
ExternalInterfaceDefaultRoute: "{{ undercloud_external_network_cidr|nthhost(1) }}"
|
|
ExternalAllocationPools: >
|
|
[{'start': '{{ undercloud_external_network_cidr|nthhost(4) }}',
|
|
'end': '{{ undercloud_external_network_cidr|nthhost(250) }}'}]
|
|
NeutronExternalNetworkBridge: ""
|
|
ControlPlaneSubnetCidr: "{{ undercloud_network_cidr|ipaddr('prefix') }}"
|
|
ControlPlaneDefaultRoute: "{{ undercloud_network_cidr|nthhost(1) }}"
|
|
EC2MetadataIp: "{{ undercloud_network_cidr|nthhost(1) }}"
|
|
DnsServers: "{{ overcloud_dns_servers }}"
|
|
|
|
public_virtual_fixed_ips:
|
|
PublicVirtualFixedIPs: >
|
|
[{'ip_address':'{{ overcloud_public_vip }}'}]
|
|
|
|
undercloud_type: virtual
|
|
baremetal_instackenv: "{{ working_dir }}/instackenv.json"
|
|
baremetal_network_environment: "{{ working_dir }}/network-isolation.yml"
|
|
|
|
overcloud_custom_tht_script: custom-tht-script.sh.j2
|
|
overcloud_custom_tht_log: overcloud_custom_tht_script.log
|
|
|
|
bond_with_vlans_copy_nic_configs_script: bond-with-vlans-copy-nic-configs.sh.j2
|
|
bond_with_vlans_nic_configs_log: bond_with_vlans_nic_configs_script_log
|
|
|
|
tht_rpm_url: https://trunk.rdoproject.org/centos7-{{ release }}/current/
|
|
|
|
overcloud_prep_post_hook_script: ""
|