Adds net_cidr_map variable to allow cidr lists
This patch exposes the net_cidr_map variable so that tasks can access the list of CIDRs that are valid for a network as opposed to attempting to build the CIDRs from the network definitions. In spine-leaf or edge use cases the networks may have multiple subnets assigned to a given network. The new Unbound service will use these maps to build lists of CIDRs allowed to make queries. Change-Id: I6004519e8b2317d19356c4a2b8bea416b4d94c22
This commit is contained in:
parent
1e7e79eab8
commit
fe53162e35
|
@ -228,6 +228,10 @@ parameters:
|
||||||
RootStackName:
|
RootStackName:
|
||||||
description: The name of the stack/plan.
|
description: The name of the stack/plan.
|
||||||
type: string
|
type: string
|
||||||
|
NetCidrMap:
|
||||||
|
description: Mapping of CIDRs to network name
|
||||||
|
type: json
|
||||||
|
default: {}
|
||||||
|
|
||||||
parameter_groups:
|
parameter_groups:
|
||||||
- label: deprecated
|
- label: deprecated
|
||||||
|
@ -410,6 +414,7 @@ outputs:
|
||||||
extra_hosts_entries: {get_param: ExtraHostsEntries}
|
extra_hosts_entries: {get_param: ExtraHostsEntries}
|
||||||
vip_hosts_entries: {get_param: VipHostsEntries}
|
vip_hosts_entries: {get_param: VipHostsEntries}
|
||||||
keystone_resources: {get_param: KeystoneResourcesConfigs}
|
keystone_resources: {get_param: KeystoneResourcesConfigs}
|
||||||
|
net_cidr_map: {get_param: NetCidrMap}
|
||||||
common_deploy_steps_playbooks: {get_file: deploy-steps-playbooks-common.yaml}
|
common_deploy_steps_playbooks: {get_file: deploy-steps-playbooks-common.yaml}
|
||||||
common_deploy_steps_tasks: {get_file: deploy-steps-tasks.yaml}
|
common_deploy_steps_tasks: {get_file: deploy-steps-tasks.yaml}
|
||||||
common_container_config_scripts: {get_file: common-container-config-scripts.yaml}
|
common_container_config_scripts: {get_file: common-container-config-scripts.yaml}
|
||||||
|
|
|
@ -1301,6 +1301,7 @@ resources:
|
||||||
{% for role in roles %}
|
{% for role in roles %}
|
||||||
- get_attr: [{{role.name}}ServiceChainRoleData, value, keystone_resources]
|
- get_attr: [{{role.name}}ServiceChainRoleData, value, keystone_resources]
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
NetCidrMap: {get_attr: [NetCidrMapValue, value]}
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
ManagedEndpoints:
|
ManagedEndpoints:
|
||||||
|
|
Loading…
Reference in New Issue