From 6947f51bab301c9e0feef2ec2fbbfcee29efbce0 Mon Sep 17 00:00:00 2001 From: oss-forks-experimental <48138719+oss-forks-experimental@users.noreply.github.com> Date: Fri, 1 Mar 2019 15:53:51 -0600 Subject: [PATCH 01/23] Update f5_bigip_cluster_n_nic_env.yaml --- .../static/f5_bigip_cluster_n_nic_env.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic_env.yaml b/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic_env.yaml index 673ae22..5a48390 100644 --- a/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic_env.yaml +++ b/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic_env.yaml @@ -20,6 +20,7 @@ parameters: bigip_mgmt_nic_mtu: 1400 bigip_servers_dns: mgmt_network: mgmt-dhcp-disabled + mgmt_subnet: mgmt-dhcp-disabled_subnet mgmt_security_group_name: Mgmt_secgroup_2_NIC_cluster bigip_nic_count: 2 network_vlan_names_cluster_index: 1 @@ -41,6 +42,17 @@ parameters: - dev-data3-subnet1 - dev-data4-subnet - dev-data5-subnet + network_vlan_static_self_ips: + - - 10.1.1.10 + - 10.1.2.10 + - 10.1.3.10 + - 10.1.4.10 + - 10.1.5.10 + - - 10.1.1.20 + - 10.1.2.20 + - 10.1.3.20 + - 10.1.4.20 + - 10.1.5.20 network_vlan_security_group_rules: security_group_rules: - rules: From d56eed405e45998c6961618c731cfea9ca03cc57 Mon Sep 17 00:00:00 2001 From: oss-forks-experimental <48138719+oss-forks-experimental@users.noreply.github.com> Date: Fri, 1 Mar 2019 15:57:20 -0600 Subject: [PATCH 02/23] Update f5_bigip_cluster_n_nic_env.yaml --- .../nnic/prod_stack/static/f5_bigip_cluster_n_nic_env.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic_env.yaml b/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic_env.yaml index 5a48390..229c3b9 100644 --- a/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic_env.yaml +++ b/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic_env.yaml @@ -22,6 +22,10 @@ parameters: mgmt_network: mgmt-dhcp-disabled mgmt_subnet: mgmt-dhcp-disabled_subnet mgmt_security_group_name: Mgmt_secgroup_2_NIC_cluster + + bigip1_mgmt_IP: 169.1.2.10 + bigip2_mgmt_IP: 169.1.2.20 + bigip_nic_count: 2 network_vlan_names_cluster_index: 1 network_vlan_subnets_cluster_index: 1 From 37aacb7fd2e9ca36a60e84d8a8f1f270a63136fe Mon Sep 17 00:00:00 2001 From: oss-forks-experimental <48138719+oss-forks-experimental@users.noreply.github.com> Date: Fri, 1 Mar 2019 16:02:40 -0600 Subject: [PATCH 03/23] Update f5_bigip_cluster_n_nic.yaml --- .../nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml b/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml index f4c6bd1..77cc337 100644 --- a/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml +++ b/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml @@ -188,6 +188,12 @@ parameters: description: Network to which the BIG-IP management interface is attached. constraints: - custom_constraint: neutron.network + mgmt_subnet: + type: string + label: Management Network Subnet + description: Network Subnet to which the BIG-IP management interface is attached. + constraints: + - custom_constraint: neutron.subnet mgmt_security_group_name: type: string label: Management Security Group Name @@ -328,10 +334,12 @@ parameter_groups: - label: OS Network parameters: - mgmt_network + - mgmt_subnet - mgmt_security_group_name - network_vlan_security_group_rules - network_vlan_names - network_vlan_subnets + - network_vlan_static_self_ips - network_vlan_subnets_cluster_index - network_vlan_names_cluster_index - label: BIG-IP Network From 48fdc0254e566ee2bbcea8aaa0c0608ab4e65fdd Mon Sep 17 00:00:00 2001 From: oss-forks-experimental <48138719+oss-forks-experimental@users.noreply.github.com> Date: Fri, 1 Mar 2019 16:20:10 -0600 Subject: [PATCH 04/23] Update f5_bigip_cluster_n_nic.yaml --- .../nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml b/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml index 77cc337..a3570b0 100644 --- a/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml +++ b/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml @@ -210,6 +210,12 @@ parameters: type: json label: OS Neutron Port Fixed IPs Subnets description: The list of Neutron Subnets for each Port's Fixed IP with each item in the format . Each item's first IP will be configured as self ip on the BIG-IP VLAN. + network_vlan_static_self_ips: + type: json + label: OS Neutron Port Fixed IPs + description: The list of Neutron Fixed IPs that will be configured as a self ip on the BIG-IP VLAN + default: + - network_vlan_names_cluster_index: type: number label: OS Neutron VLAN Index for Cluster Fixed IP From 34cb773dbab2a2cfb4cfb00722dafad74cf8142e Mon Sep 17 00:00:00 2001 From: oss-forks-experimental <48138719+oss-forks-experimental@users.noreply.github.com> Date: Fri, 1 Mar 2019 16:36:58 -0600 Subject: [PATCH 05/23] Update f5_bigip_cluster_n_nic.yaml --- .../static/f5_bigip_cluster_n_nic.yaml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml b/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml index a3570b0..e5036f2 100644 --- a/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml +++ b/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml @@ -216,6 +216,20 @@ parameters: description: The list of Neutron Fixed IPs that will be configured as a self ip on the BIG-IP VLAN default: - + bigip1_mgmt_IP: + type: string + label: BIG-IP Instance One Management IP + description: Fixed Static IP address for the BIG-IP instance one + default: None + constraints: + - custom_constraint: ip_addr + bigip2_mgmt_IP: + type: string + label: BIG-IP Instance Two Management IP + description: Fixed Static IP address for the BIG-IP instance two + default: None + constraints: + - custom_constraint: ip_addr network_vlan_names_cluster_index: type: number label: OS Neutron VLAN Index for Cluster Fixed IP @@ -460,6 +474,9 @@ resources: type: OS::Neutron::Port properties: network: { get_param: mgmt_network } + fixed_ips: + - subnet_id: {get_param: mgmt_subnet} + ip_address: {get_param: bigip1_mgmt_IP} security_groups: - { get_attr: [mgmt_security_group, mgmt_security_group_id] } bigip_nnic_handler_bigip1: @@ -615,6 +632,9 @@ resources: type: OS::Neutron::Port properties: network: { get_param: mgmt_network } + fixed_ips: + - subnet_id: {get_param: mgmt_subnet} + ip_address: {get_param: bigip2_mgmt_IP} security_groups: - { get_attr: [mgmt_security_group, mgmt_security_group_id] } bigip_nnic_handler_bigip2: From 6b5ac29086ef4f359940f5284a9dddf1f72a2162 Mon Sep 17 00:00:00 2001 From: oss-forks-experimental <48138719+oss-forks-experimental@users.noreply.github.com> Date: Fri, 1 Mar 2019 17:06:02 -0600 Subject: [PATCH 06/23] Update f5_bigip_cluster_n_nic.yaml --- .../cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml b/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml index e5036f2..b0dfcc3 100644 --- a/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml +++ b/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml @@ -485,6 +485,7 @@ resources: bigip_nic_count: { get_param: bigip_nic_count } network_vlan_names: { get_param: network_vlan_names } network_vlan_subnets: { get_param: [network_vlan_subnets, 0] } + network_vlan_static_self_ips: { get_param: [network_vlan_static_self_ips, 0] } network_vlan_security_group_ids: { get_attr: [security_groups, security_group_id] } bigip_vlan_names: { get_param: bigip_vlan_names } bigip_vlan_tags: { get_param: bigip_vlan_tags } @@ -643,6 +644,7 @@ resources: bigip_nic_count: { get_param: bigip_nic_count } network_vlan_names: { get_param: network_vlan_names } network_vlan_subnets: { get_param: [network_vlan_subnets, 1] } + network_vlan_static_self_ips: { get_param: [network_vlan_static_self_ips, 1] } network_vlan_security_group_ids: { get_attr: [security_groups, security_group_id] } bigip_vlan_names: { get_param: bigip_vlan_names } bigip_vlan_tags: { get_param: bigip_vlan_tags } From 6282d4bdbf936da44576162a6f554e26641c39fd Mon Sep 17 00:00:00 2001 From: oss-forks-experimental <48138719+oss-forks-experimental@users.noreply.github.com> Date: Fri, 1 Mar 2019 17:14:18 -0600 Subject: [PATCH 07/23] Update bigip_nnic_handler.yaml --- experimental/networks/bigip_nnic_handler.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/experimental/networks/bigip_nnic_handler.yaml b/experimental/networks/bigip_nnic_handler.yaml index fdd23ad..20788ca 100644 --- a/experimental/networks/bigip_nnic_handler.yaml +++ b/experimental/networks/bigip_nnic_handler.yaml @@ -15,6 +15,12 @@ parameters: type: comma_delimited_list label: OS Neutron Subnets to map to the BIG-IP VLANs description: The Neutron Subnets for the corresponding BIG-IP VLANs. + network_vlan_static_self_ips: + type: comma_delimited_list + label: Fixed IPs to map to the BIG-IP + description: Fixed IPs for the corresponding VLANs. + default: + - network_vlan_security_group_ids: type: comma_delimited_list label: Security Group IDs @@ -63,6 +69,7 @@ resources: count: { get_param: bigip_nic_count } network_names: { get_param: network_vlan_names } network_subnets: { get_param: network_vlan_subnets } + network_static_self_ips: { get_param: network_vlan_static_self_ips } security_group_ids: { get_param: network_vlan_security_group_ids } onboard_network_config: From b81183340b704b11f5106e040f3aa1f0b2dec99e Mon Sep 17 00:00:00 2001 From: oss-forks-experimental <48138719+oss-forks-experimental@users.noreply.github.com> Date: Fri, 1 Mar 2019 17:16:53 -0600 Subject: [PATCH 08/23] Update bigip_neutron_ports.yaml --- experimental/networks/bigip_neutron_ports.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/experimental/networks/bigip_neutron_ports.yaml b/experimental/networks/bigip_neutron_ports.yaml index a9c6aa1..69eb23e 100644 --- a/experimental/networks/bigip_neutron_ports.yaml +++ b/experimental/networks/bigip_neutron_ports.yaml @@ -19,6 +19,12 @@ parameters: type: comma_delimited_list label: Network Subnets description: A list of subnets the ports should be created in + network_static_self_ips: + type: comma_delimited_list + label: Fixed IPs to map to the BIG-IP + description: Fixed IPs for the corresponding VLANs. + default: + - resources: network_vlan_ports: @@ -31,6 +37,7 @@ resources: index: "%index%" network_names: { get_param: network_names } network_subnets: { get_param: network_subnets } + network_static_self_ips: { get_param: network_static_self_ips } security_groups: { get_param: security_group_ids } outputs: From f99c330d001d15dafb8ee5eeadbc9a4d0d7ffca4 Mon Sep 17 00:00:00 2001 From: oss-forks-experimental <48138719+oss-forks-experimental@users.noreply.github.com> Date: Fri, 1 Mar 2019 17:18:14 -0600 Subject: [PATCH 09/23] Update bigip_neutron_port.yaml --- experimental/networks/bigip_neutron_port.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/experimental/networks/bigip_neutron_port.yaml b/experimental/networks/bigip_neutron_port.yaml index 36544e4..98020b2 100644 --- a/experimental/networks/bigip_neutron_port.yaml +++ b/experimental/networks/bigip_neutron_port.yaml @@ -19,6 +19,12 @@ parameters: type: comma_delimited_list label: Network Subnets description: A list of subnets the ports should be created in + network_static_self_ips: + type: comma_delimited_list + label: Fixed Static IPs + description: A list of Fixed IPs + default: + - resources: bigip_neutron_port: @@ -37,8 +43,13 @@ resources: str_split: - ';' - { get_param: [network_subnets, { get_param: index }] } + <%ip_address%>: + str_split: + - ';' + - { get_param: [network_static_self_ips, { get_param: index }] } template: subnet: <%subnet%> + ip_address: <%ip_address%> outputs: neutron_port_id: From 7e8361388e56cdb478ea7cdbed5d583862b6de50 Mon Sep 17 00:00:00 2001 From: oss-forks-experimental <48138719+oss-forks-experimental@users.noreply.github.com> Date: Mon, 4 Mar 2019 02:16:56 -0600 Subject: [PATCH 10/23] Update f5_bigip_cluster_n_nic.yaml --- .../static/f5_bigip_cluster_n_nic.yaml | 53 ++++++++++++++++--- 1 file changed, 46 insertions(+), 7 deletions(-) diff --git a/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml b/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml index b0dfcc3..c08bb04 100644 --- a/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml +++ b/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml @@ -1,4 +1,5 @@ -heat_template_version: 2016-04-08 +heat_template_version: newton +#heat_template_version: 2016-04-08 description: This template deploys standard f5 BIG-IP VE - NNIC instances in a config-sync cluster. parameters: bigip_image: @@ -194,6 +195,7 @@ parameters: description: Network Subnet to which the BIG-IP management interface is attached. constraints: - custom_constraint: neutron.subnet + default: None mgmt_security_group_name: type: string label: Management Security Group Name @@ -310,6 +312,27 @@ parameters: label: Additional Heat Wait Condition Notify Curl Options description: Additional options for the heat wait condition signals sent via curl default: None +conditions: + mgmt_ip1: + not: + equals: + - get_param: bigip1_mgmt_IP + - None + mgmt_ip2: + not: + equals: + - get_param: bigip2_mgmt_IP + - None + other_ips: + not: + equals: + - get_param: network_vlan_static_self_ips + - None + static_IP: + and: + - mgmt_ip1 + - mgmt_ip2 + - other_ips parameter_groups: - label: BIG-IP General Provisioning parameters: @@ -475,8 +498,11 @@ resources: properties: network: { get_param: mgmt_network } fixed_ips: - - subnet_id: {get_param: mgmt_subnet} - ip_address: {get_param: bigip1_mgmt_IP} + if: + - static_IP + - - subnet_id: {get_param: mgmt_subnet} + ip_address: {get_param: bigip1_mgmt_IP} + - - subnet_id: {get_param: mgmt_subnet} security_groups: - { get_attr: [mgmt_security_group, mgmt_security_group_id] } bigip_nnic_handler_bigip1: @@ -485,7 +511,12 @@ resources: bigip_nic_count: { get_param: bigip_nic_count } network_vlan_names: { get_param: network_vlan_names } network_vlan_subnets: { get_param: [network_vlan_subnets, 0] } - network_vlan_static_self_ips: { get_param: [network_vlan_static_self_ips, 0] } + #network_vlan_static_self_ips: { get_param: [network_vlan_static_self_ips, 0] } + network_vlan_static_self_ips: + if: + - static_IP + - get_param: [network_vlan_static_self_ips, 0] + - None network_vlan_security_group_ids: { get_attr: [security_groups, security_group_id] } bigip_vlan_names: { get_param: bigip_vlan_names } bigip_vlan_tags: { get_param: bigip_vlan_tags } @@ -634,8 +665,11 @@ resources: properties: network: { get_param: mgmt_network } fixed_ips: - - subnet_id: {get_param: mgmt_subnet} - ip_address: {get_param: bigip2_mgmt_IP} + if: + - static_IP + - - subnet_id: {get_param: mgmt_subnet} + ip_address: {get_param: bigip2_mgmt_IP} + - - subnet_id: {get_param: mgmt_subnet} security_groups: - { get_attr: [mgmt_security_group, mgmt_security_group_id] } bigip_nnic_handler_bigip2: @@ -644,7 +678,12 @@ resources: bigip_nic_count: { get_param: bigip_nic_count } network_vlan_names: { get_param: network_vlan_names } network_vlan_subnets: { get_param: [network_vlan_subnets, 1] } - network_vlan_static_self_ips: { get_param: [network_vlan_static_self_ips, 1] } + #network_vlan_static_self_ips: { get_param: [network_vlan_static_self_ips, 1] } + network_vlan_static_self_ips: + if: + - static_IP + - get_param: [network_vlan_static_self_ips, 1] + - None network_vlan_security_group_ids: { get_attr: [security_groups, security_group_id] } bigip_vlan_names: { get_param: bigip_vlan_names } bigip_vlan_tags: { get_param: bigip_vlan_tags } From b887265352adee5dba18a10c23d1d37fb5d804eb Mon Sep 17 00:00:00 2001 From: oss-forks-experimental <48138719+oss-forks-experimental@users.noreply.github.com> Date: Mon, 4 Mar 2019 10:41:55 -0600 Subject: [PATCH 11/23] Update bigip_neutron_port.yaml --- experimental/networks/bigip_neutron_port.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/experimental/networks/bigip_neutron_port.yaml b/experimental/networks/bigip_neutron_port.yaml index 98020b2..616460e 100644 --- a/experimental/networks/bigip_neutron_port.yaml +++ b/experimental/networks/bigip_neutron_port.yaml @@ -1,4 +1,5 @@ -heat_template_version: 2016-04-08 +heat_template_version: newton +#heat_template_version: 2016-04-08 description: This template creates a standard neutron port to associate with a Big-IP instance. This template uses an index parameter that enables ports to be created as part of a resource group. From d0be1f224189ced091b0cdbb1fceb0d384e77499 Mon Sep 17 00:00:00 2001 From: oss-forks-experimental <48138719+oss-forks-experimental@users.noreply.github.com> Date: Mon, 4 Mar 2019 10:42:16 -0600 Subject: [PATCH 12/23] Update bigip_neutron_ports.yaml --- experimental/networks/bigip_neutron_ports.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/experimental/networks/bigip_neutron_ports.yaml b/experimental/networks/bigip_neutron_ports.yaml index 69eb23e..27466be 100644 --- a/experimental/networks/bigip_neutron_ports.yaml +++ b/experimental/networks/bigip_neutron_ports.yaml @@ -1,4 +1,5 @@ -heat_template_version: 2016-04-08 +heat_template_version: newton +#heat_template_version: 2016-04-08 description: This template creates a standard neutron port to associate with a Big-IP instance. This template uses an index parameter that enables ports to be created as part of a resource group. From ad2eb9879ec5c2e84f079f3346305e0740f148d6 Mon Sep 17 00:00:00 2001 From: oss-forks-experimental <48138719+oss-forks-experimental@users.noreply.github.com> Date: Mon, 4 Mar 2019 10:42:32 -0600 Subject: [PATCH 13/23] Update bigip_nnic_handler.yaml --- experimental/networks/bigip_nnic_handler.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/experimental/networks/bigip_nnic_handler.yaml b/experimental/networks/bigip_nnic_handler.yaml index 20788ca..535987e 100644 --- a/experimental/networks/bigip_nnic_handler.yaml +++ b/experimental/networks/bigip_nnic_handler.yaml @@ -1,4 +1,5 @@ -heat_template_version: 2016-04-08 +heat_template_version: newton +#heat_template_version: 2016-04-08 description: This template builds components for dynamic number of nics. From 9b9eb7bf08e11274efd57331aa99c497ac59e0a1 Mon Sep 17 00:00:00 2001 From: oss-forks-experimental <48138719+oss-forks-experimental@users.noreply.github.com> Date: Wed, 6 Mar 2019 14:13:44 -0600 Subject: [PATCH 14/23] Update f5_bigip_cluster_n_nic.yaml --- .../static/f5_bigip_cluster_n_nic.yaml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml b/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml index c08bb04..ffcddfc 100644 --- a/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml +++ b/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml @@ -216,22 +216,21 @@ parameters: type: json label: OS Neutron Port Fixed IPs description: The list of Neutron Fixed IPs that will be configured as a self ip on the BIG-IP VLAN - default: - - + default: [] bigip1_mgmt_IP: type: string label: BIG-IP Instance One Management IP description: Fixed Static IP address for the BIG-IP instance one default: None - constraints: - - custom_constraint: ip_addr + #constraints: + #- custom_constraint: ip_addr bigip2_mgmt_IP: type: string label: BIG-IP Instance Two Management IP description: Fixed Static IP address for the BIG-IP instance two default: None - constraints: - - custom_constraint: ip_addr + #constraints: + #- custom_constraint: ip_addr network_vlan_names_cluster_index: type: number label: OS Neutron VLAN Index for Cluster Fixed IP @@ -327,7 +326,7 @@ conditions: not: equals: - get_param: network_vlan_static_self_ips - - None + - [] static_IP: and: - mgmt_ip1 @@ -516,7 +515,7 @@ resources: if: - static_IP - get_param: [network_vlan_static_self_ips, 0] - - None + - "" network_vlan_security_group_ids: { get_attr: [security_groups, security_group_id] } bigip_vlan_names: { get_param: bigip_vlan_names } bigip_vlan_tags: { get_param: bigip_vlan_tags } @@ -683,7 +682,7 @@ resources: if: - static_IP - get_param: [network_vlan_static_self_ips, 1] - - None + - "" network_vlan_security_group_ids: { get_attr: [security_groups, security_group_id] } bigip_vlan_names: { get_param: bigip_vlan_names } bigip_vlan_tags: { get_param: bigip_vlan_tags } From 34b3ef9deb8ef4e5c95da2debeaa6238a735f985 Mon Sep 17 00:00:00 2001 From: oss-forks-experimental <48138719+oss-forks-experimental@users.noreply.github.com> Date: Wed, 6 Mar 2019 14:15:56 -0600 Subject: [PATCH 15/23] Update bigip_nnic_handler.yaml --- experimental/networks/bigip_nnic_handler.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/experimental/networks/bigip_nnic_handler.yaml b/experimental/networks/bigip_nnic_handler.yaml index 535987e..0def51f 100644 --- a/experimental/networks/bigip_nnic_handler.yaml +++ b/experimental/networks/bigip_nnic_handler.yaml @@ -20,8 +20,7 @@ parameters: type: comma_delimited_list label: Fixed IPs to map to the BIG-IP description: Fixed IPs for the corresponding VLANs. - default: - - + default: "" network_vlan_security_group_ids: type: comma_delimited_list label: Security Group IDs From fb0a1cb6bf285a0b2eb3b1b821d95ed8413d5d1c Mon Sep 17 00:00:00 2001 From: oss-forks-experimental <48138719+oss-forks-experimental@users.noreply.github.com> Date: Wed, 6 Mar 2019 14:16:53 -0600 Subject: [PATCH 16/23] Update bigip_neutron_ports.yaml --- experimental/networks/bigip_neutron_ports.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/experimental/networks/bigip_neutron_ports.yaml b/experimental/networks/bigip_neutron_ports.yaml index 27466be..6a96f66 100644 --- a/experimental/networks/bigip_neutron_ports.yaml +++ b/experimental/networks/bigip_neutron_ports.yaml @@ -24,8 +24,7 @@ parameters: type: comma_delimited_list label: Fixed IPs to map to the BIG-IP description: Fixed IPs for the corresponding VLANs. - default: - - + default: "" resources: network_vlan_ports: From bba0dc223545490e7be24310a7b35d1ab64e404c Mon Sep 17 00:00:00 2001 From: oss-forks-experimental <48138719+oss-forks-experimental@users.noreply.github.com> Date: Wed, 6 Mar 2019 14:19:11 -0600 Subject: [PATCH 17/23] Update bigip_neutron_port.yaml --- experimental/networks/bigip_neutron_port.yaml | 61 ++++++++++++++----- 1 file changed, 45 insertions(+), 16 deletions(-) diff --git a/experimental/networks/bigip_neutron_port.yaml b/experimental/networks/bigip_neutron_port.yaml index 616460e..bda4d1e 100644 --- a/experimental/networks/bigip_neutron_port.yaml +++ b/experimental/networks/bigip_neutron_port.yaml @@ -24,8 +24,14 @@ parameters: type: comma_delimited_list label: Fixed Static IPs description: A list of Fixed IPs - default: - - + default: "" + +conditions: + fixed_IP: + not: + equals: + - get_param: network_static_self_ips + - "" resources: bigip_neutron_port: @@ -38,20 +44,43 @@ resources: - ip_address: 0.0.0.0/0 - ip_address: ::/0 fixed_ips: - repeat: - for_each: - <%subnet%>: - str_split: - - ';' - - { get_param: [network_subnets, { get_param: index }] } - <%ip_address%>: - str_split: - - ';' - - { get_param: [network_static_self_ips, { get_param: index }] } - template: - subnet: <%subnet%> - ip_address: <%ip_address%> - + if: + - fixed_IP + - repeat: + for_each: + <%subnet%>: + str_split: + - ';' + - { get_param: [network_subnets, { get_param: index }] } + <%ip_address%>: + str_split: + - ';' + - { get_param: [network_static_self_ips, { get_param: index }] } + template: + subnet: <%subnet%> + ip_address: <%ip_address%> + - repeat: + for_each: + <%subnet%>: + str_split: + - ';' + - { get_param: [network_subnets, { get_param: index }] } + template: + subnet: <%subnet%> +# fixed_ips: +# repeat: +# for_each: +# <%subnet%>: +# str_split: +# - ';' +# - { get_param: [network_subnets, { get_param: index }] } +# <%ip_address%>: +# str_split: +# - ';' +# - { get_param: [network_static_self_ips, { get_param: index }] } +# template: +# subnet: <%subnet%> +# ip_address: <%ip_address%> outputs: neutron_port_id: value: {get_resource: bigip_neutron_port} From b4441684b4e2410a18ec66d6dda67bda671f0368 Mon Sep 17 00:00:00 2001 From: oss-forks-experimental <48138719+oss-forks-experimental@users.noreply.github.com> Date: Fri, 8 Mar 2019 12:46:22 -0600 Subject: [PATCH 18/23] Update bigip_neutron_port.yaml --- experimental/networks/bigip_neutron_port.yaml | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/experimental/networks/bigip_neutron_port.yaml b/experimental/networks/bigip_neutron_port.yaml index bda4d1e..d8733be 100644 --- a/experimental/networks/bigip_neutron_port.yaml +++ b/experimental/networks/bigip_neutron_port.yaml @@ -21,17 +21,17 @@ parameters: label: Network Subnets description: A list of subnets the ports should be created in network_static_self_ips: - type: comma_delimited_list + type: json label: Fixed Static IPs description: A list of Fixed IPs - default: "" + default: [] conditions: fixed_IP: not: equals: - get_param: network_static_self_ips - - "" + - [] resources: bigip_neutron_port: @@ -67,20 +67,6 @@ resources: - { get_param: [network_subnets, { get_param: index }] } template: subnet: <%subnet%> -# fixed_ips: -# repeat: -# for_each: -# <%subnet%>: -# str_split: -# - ';' -# - { get_param: [network_subnets, { get_param: index }] } -# <%ip_address%>: -# str_split: -# - ';' -# - { get_param: [network_static_self_ips, { get_param: index }] } -# template: -# subnet: <%subnet%> -# ip_address: <%ip_address%> outputs: neutron_port_id: value: {get_resource: bigip_neutron_port} From 12e6645073fe69b7f9df31546daf0856d51130d2 Mon Sep 17 00:00:00 2001 From: oss-forks-experimental <48138719+oss-forks-experimental@users.noreply.github.com> Date: Fri, 8 Mar 2019 12:46:55 -0600 Subject: [PATCH 19/23] Update bigip_neutron_port.yaml --- experimental/networks/bigip_neutron_port.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/experimental/networks/bigip_neutron_port.yaml b/experimental/networks/bigip_neutron_port.yaml index d8733be..5124081 100644 --- a/experimental/networks/bigip_neutron_port.yaml +++ b/experimental/networks/bigip_neutron_port.yaml @@ -1,5 +1,4 @@ -heat_template_version: newton -#heat_template_version: 2016-04-08 +heat_template_version: ocata description: This template creates a standard neutron port to associate with a Big-IP instance. This template uses an index parameter that enables ports to be created as part of a resource group. From 9e7cf2e757c4d7c3046ce2e6b0f63009a0fda791 Mon Sep 17 00:00:00 2001 From: oss-forks-experimental <48138719+oss-forks-experimental@users.noreply.github.com> Date: Fri, 8 Mar 2019 12:47:42 -0600 Subject: [PATCH 20/23] Update bigip_neutron_ports.yaml --- experimental/networks/bigip_neutron_ports.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/experimental/networks/bigip_neutron_ports.yaml b/experimental/networks/bigip_neutron_ports.yaml index 6a96f66..e1913eb 100644 --- a/experimental/networks/bigip_neutron_ports.yaml +++ b/experimental/networks/bigip_neutron_ports.yaml @@ -1,5 +1,4 @@ -heat_template_version: newton -#heat_template_version: 2016-04-08 +heat_template_version: ocata description: This template creates a standard neutron port to associate with a Big-IP instance. This template uses an index parameter that enables ports to be created as part of a resource group. @@ -21,10 +20,10 @@ parameters: label: Network Subnets description: A list of subnets the ports should be created in network_static_self_ips: - type: comma_delimited_list + type: json label: Fixed IPs to map to the BIG-IP description: Fixed IPs for the corresponding VLANs. - default: "" + default: [] resources: network_vlan_ports: From 4a346d201346bf0711b6e6e834a4d235e3e846ad Mon Sep 17 00:00:00 2001 From: oss-forks-experimental <48138719+oss-forks-experimental@users.noreply.github.com> Date: Fri, 8 Mar 2019 12:52:32 -0600 Subject: [PATCH 21/23] Update bigip_nnic_handler.yaml --- experimental/networks/bigip_nnic_handler.yaml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/experimental/networks/bigip_nnic_handler.yaml b/experimental/networks/bigip_nnic_handler.yaml index 0def51f..95b2c2e 100644 --- a/experimental/networks/bigip_nnic_handler.yaml +++ b/experimental/networks/bigip_nnic_handler.yaml @@ -1,5 +1,4 @@ -heat_template_version: newton -#heat_template_version: 2016-04-08 +heat_template_version: ocata description: This template builds components for dynamic number of nics. @@ -17,10 +16,10 @@ parameters: label: OS Neutron Subnets to map to the BIG-IP VLANs description: The Neutron Subnets for the corresponding BIG-IP VLANs. network_vlan_static_self_ips: - type: comma_delimited_list + type: json label: Fixed IPs to map to the BIG-IP description: Fixed IPs for the corresponding VLANs. - default: "" + default: [] network_vlan_security_group_ids: type: comma_delimited_list label: Security Group IDs @@ -60,6 +59,12 @@ parameters: description: Additonal options to add to curl_cli value of the WaitConditionHandle that enables status signals to be sent back to Heat default: None +conditions: + static_IP: + not: + equals: + - get_param: network_vlan_static_self_ips + - [] resources: @@ -70,6 +75,10 @@ resources: network_names: { get_param: network_vlan_names } network_subnets: { get_param: network_vlan_subnets } network_static_self_ips: { get_param: network_vlan_static_self_ips } + if: + - static_IP + - get_param: network_vlan_static_self_ips + - [] security_group_ids: { get_param: network_vlan_security_group_ids } onboard_network_config: From 92725ec0f45a69c28e2e67ed0802c006cfaa83d0 Mon Sep 17 00:00:00 2001 From: oss-forks-experimental <48138719+oss-forks-experimental@users.noreply.github.com> Date: Fri, 8 Mar 2019 13:00:18 -0600 Subject: [PATCH 22/23] Update f5_bigip_cluster_n_nic.yaml --- .../nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml b/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml index ffcddfc..339d692 100644 --- a/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml +++ b/experimental/templates/cluster/nnic/prod_stack/static/f5_bigip_cluster_n_nic.yaml @@ -1,5 +1,4 @@ -heat_template_version: newton -#heat_template_version: 2016-04-08 +heat_template_version: ocata description: This template deploys standard f5 BIG-IP VE - NNIC instances in a config-sync cluster. parameters: bigip_image: @@ -510,12 +509,11 @@ resources: bigip_nic_count: { get_param: bigip_nic_count } network_vlan_names: { get_param: network_vlan_names } network_vlan_subnets: { get_param: [network_vlan_subnets, 0] } - #network_vlan_static_self_ips: { get_param: [network_vlan_static_self_ips, 0] } network_vlan_static_self_ips: if: - static_IP - get_param: [network_vlan_static_self_ips, 0] - - "" + - [] network_vlan_security_group_ids: { get_attr: [security_groups, security_group_id] } bigip_vlan_names: { get_param: bigip_vlan_names } bigip_vlan_tags: { get_param: bigip_vlan_tags } @@ -677,12 +675,11 @@ resources: bigip_nic_count: { get_param: bigip_nic_count } network_vlan_names: { get_param: network_vlan_names } network_vlan_subnets: { get_param: [network_vlan_subnets, 1] } - #network_vlan_static_self_ips: { get_param: [network_vlan_static_self_ips, 1] } network_vlan_static_self_ips: if: - static_IP - get_param: [network_vlan_static_self_ips, 1] - - "" + - [] network_vlan_security_group_ids: { get_attr: [security_groups, security_group_id] } bigip_vlan_names: { get_param: bigip_vlan_names } bigip_vlan_tags: { get_param: bigip_vlan_tags } From a4e5133837a24b007fb1689f2a5489aa5fa19037 Mon Sep 17 00:00:00 2001 From: oss-forks-experimental <48138719+oss-forks-experimental@users.noreply.github.com> Date: Mon, 11 Mar 2019 22:28:24 -0500 Subject: [PATCH 23/23] Update bigip_nnic_handler.yaml --- experimental/networks/bigip_nnic_handler.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/experimental/networks/bigip_nnic_handler.yaml b/experimental/networks/bigip_nnic_handler.yaml index 95b2c2e..fcb8581 100644 --- a/experimental/networks/bigip_nnic_handler.yaml +++ b/experimental/networks/bigip_nnic_handler.yaml @@ -74,7 +74,7 @@ resources: count: { get_param: bigip_nic_count } network_names: { get_param: network_vlan_names } network_subnets: { get_param: network_vlan_subnets } - network_static_self_ips: { get_param: network_vlan_static_self_ips } + network_static_self_ips: if: - static_IP - get_param: network_vlan_static_self_ips