Merge "Address allocation option for cluster-host network"
This commit is contained in:
commit
c0bffb22c0
@ -75,7 +75,10 @@ management_multicast_subnet: 239.1.1.0/28
|
||||
# management_multicast_end_address:
|
||||
|
||||
# Management network address allocation (true = dynamic, false = static)
|
||||
dynamic_address_allocation: true
|
||||
management_dynamic_address_allocation: true
|
||||
|
||||
# Cluster-host network address allocation (true = dynamic, false = static)
|
||||
cluster_host_dynamic_address_allocation: true
|
||||
|
||||
# DOCKER PROXIES
|
||||
# ==============
|
||||
|
@ -137,7 +137,8 @@
|
||||
- "prev_system_mode: {{ system_mode }}"
|
||||
- "prev_timezone: {{ timezone }}"
|
||||
- "prev_distributed_cloud_role: {{ distributed_cloud_role }}"
|
||||
- "prev_dynamic_address_allocation: {{ dynamic_address_allocation }}"
|
||||
- "prev_management_dynamic_address_allocation: {{ management_dynamic_address_allocation }}"
|
||||
- "prev_cluster_host_dynamic_address_allocation: {{ cluster_host_dynamic_address_allocation }}"
|
||||
- "prev_pxeboot_subnet: {{ pxeboot_subnet }}"
|
||||
- "prev_management_subnet: {{ management_subnet }}"
|
||||
- "prev_cluster_host_subnet: {{ cluster_host_subnet }}"
|
||||
|
@ -215,7 +215,7 @@ def populate_mgmt_network(client):
|
||||
end_address = CONF.get('BOOTSTRAP_CONFIG',
|
||||
'MANAGEMENT_END_ADDRESS')
|
||||
dynamic_allocation = CONF.getboolean(
|
||||
'BOOTSTRAP_CONFIG', 'DYNAMIC_ADDRESS_ALLOCATION')
|
||||
'BOOTSTRAP_CONFIG', 'MANAGEMENT_DYNAMIC_ADDRESS_ALLOCATION')
|
||||
network_name = 'mgmt'
|
||||
|
||||
if RECONFIGURE_NETWORK:
|
||||
@ -366,6 +366,8 @@ def populate_cluster_host_network(client):
|
||||
'CLUSTER_HOST_START_ADDRESS')
|
||||
end_address = CONF.get('BOOTSTRAP_CONFIG',
|
||||
'CLUSTER_HOST_END_ADDRESS')
|
||||
dynamic_allocation = CONF.getboolean(
|
||||
'BOOTSTRAP_CONFIG', 'CLUSTER_HOST_DYNAMIC_ADDRESS_ALLOCATION')
|
||||
network_name = 'cluster-host'
|
||||
|
||||
if RECONFIGURE_NETWORK:
|
||||
@ -387,7 +389,7 @@ def populate_cluster_host_network(client):
|
||||
values = {
|
||||
'type': sysinv_constants.NETWORK_TYPE_CLUSTER_HOST,
|
||||
'name': sysinv_constants.NETWORK_TYPE_CLUSTER_HOST,
|
||||
'dynamic': True,
|
||||
'dynamic': dynamic_allocation,
|
||||
'pool_uuid': pool.uuid,
|
||||
}
|
||||
create_network(client, values, network_name)
|
||||
|
@ -181,13 +181,13 @@
|
||||
set_fact:
|
||||
pxe_default: pxelinux.cfg.files/default
|
||||
pxe_grub_cfg: pxelinux.cfg.files/grub.cfg
|
||||
when: dynamic_address_allocation
|
||||
when: management_dynamic_address_allocation
|
||||
|
||||
- name: Set pxeboot files source if address allocation is static
|
||||
set_fact:
|
||||
pxe_default: pxelinux.cfg.files/default.static
|
||||
pxe_grub_cfg: pxelinux.cfg.files/grub.cfg.static
|
||||
when: not dynamic_address_allocation
|
||||
when: not management_dynamic_address_allocation
|
||||
|
||||
- name: Set pxeboot files symlinks
|
||||
file:
|
||||
|
@ -130,7 +130,8 @@
|
||||
- external_oam_gateway_address
|
||||
- external_oam_floating_address
|
||||
- management_multicast_subnet
|
||||
- dynamic_address_allocation
|
||||
- management_dynamic_address_allocation
|
||||
- cluster_host_dynamic_address_allocation
|
||||
- dns_servers
|
||||
- docker_registries
|
||||
- admin_username
|
||||
@ -433,7 +434,8 @@
|
||||
set_fact:
|
||||
network_config_update: true
|
||||
when: reconfigure_endpoints or
|
||||
(prev_dynamic_address_allocation != dynamic_address_allocation) or
|
||||
(prev_management_dynamic_address_allocation != management_dynamic_address_allocation) or
|
||||
(prev_cluster_host_dynamic_address_allocation != cluster_host_dynamic_address_allocation) or
|
||||
(prev_management_end_address != management_end_address) or
|
||||
(prev_pxeboot_subnet != pxeboot_subnet) or
|
||||
(prev_pxeboot_start_address != pxeboot_start_address) or
|
||||
|
@ -23,7 +23,8 @@
|
||||
- OAM subnet is {{ external_oam_subnet }}
|
||||
- OAM gateway is {{ external_oam_gateway_address }}
|
||||
- OAM floating ip is {{ external_oam_floating_address }}
|
||||
- Dynamic address allocation is {{ dynamic_address_allocation }}
|
||||
- Management dynamic address allocation is {{ management_dynamic_address_allocation }}
|
||||
- Cluster host dynamic address allocation is {{ cluster_host_dynamic_address_allocation }}
|
||||
- Docker registries is {{ docker_registries }}
|
||||
- Docker HTTP proxy is {{ docker_http_proxy }}
|
||||
- Docker HTTPS proxy is {{ docker_https_proxy }}
|
||||
@ -177,10 +178,15 @@
|
||||
|
||||
when: ipv6_addressing != False
|
||||
|
||||
- name: Fail if address allocation is misconfigured
|
||||
- name: Fail if management address allocation is misconfigured
|
||||
fail:
|
||||
msg: "dynamic_address_allocation is misconfigured. Valid value is either 'True' or 'False'."
|
||||
when: not dynamic_address_allocation | type_debug == 'bool'
|
||||
msg: "management_dynamic_address_allocation is misconfigured. Valid value is either 'True' or 'False'."
|
||||
when: not management_dynamic_address_allocation | type_debug == 'bool'
|
||||
|
||||
- name: Fail if cluster-host address allocation is misconfigured
|
||||
fail:
|
||||
msg: "cluster_host_dynamic_address_allocation is misconfigured. Valid value is either 'True' or 'False'."
|
||||
when: not cluster_host_dynamic_address_allocation | type_debug == 'bool'
|
||||
|
||||
- name: Fail if management start or end address is not configured for System Controller
|
||||
fail:
|
||||
@ -549,12 +555,13 @@
|
||||
- "MANAGEMENT_SUBNET={{ management_subnet }}"
|
||||
- "MANAGEMENT_START_ADDRESS={{ address_pairs['management']['start'] }}"
|
||||
- "MANAGEMENT_END_ADDRESS={{ address_pairs['management']['end'] }}"
|
||||
- "DYNAMIC_ADDRESS_ALLOCATION={{ dynamic_address_allocation }}"
|
||||
- "MANAGEMENT_DYNAMIC_ADDRESS_ALLOCATION={{ management_dynamic_address_allocation }}"
|
||||
- "MANAGEMENT_INTERFACE=lo"
|
||||
- "CONTROLLER_0_ADDRESS={{ derived_network_params.controller_0_address }}"
|
||||
- "CLUSTER_HOST_SUBNET={{ cluster_host_subnet }}"
|
||||
- "CLUSTER_HOST_START_ADDRESS={{ address_pairs['cluster_host']['start'] }}"
|
||||
- "CLUSTER_HOST_END_ADDRESS={{ address_pairs['cluster_host']['end'] }}"
|
||||
- "CLUSTER_HOST_DYNAMIC_ADDRESS_ALLOCATION={{ cluster_host_dynamic_address_allocation }}"
|
||||
- "CLUSTER_POD_SUBNET={{ cluster_pod_subnet }}"
|
||||
- "CLUSTER_POD_START_ADDRESS={{ address_pairs['cluster_pod']['start'] }}"
|
||||
- "CLUSTER_POD_END_ADDRESS={{ address_pairs['cluster_pod']['end'] }}"
|
||||
|
Loading…
Reference in New Issue
Block a user