From 1aa0af05983f4db20731280f45bbce3355777b8d Mon Sep 17 00:00:00 2001 From: James Slagle Date: Thu, 8 Jul 2021 10:33:59 -0400 Subject: [PATCH] Remove network/ports/vip[_v6].yaml network/ports/vip.yaml and network/ports/vip_v6.yaml are no longer used due to 23cdf4dd1717c892535664b353f80ad9ff4a3975. Signed-off-by: James Slagle Change-Id: I04a37f437e4a74dd0cd82800d820e7191714da37 --- network/ports/vip.yaml | 122 -------------------------------------- network/ports/vip_v6.yaml | 112 ---------------------------------- 2 files changed, 234 deletions(-) delete mode 100644 network/ports/vip.yaml delete mode 100644 network/ports/vip_v6.yaml diff --git a/network/ports/vip.yaml b/network/ports/vip.yaml deleted file mode 100644 index f63c621c99..0000000000 --- a/network/ports/vip.yaml +++ /dev/null @@ -1,122 +0,0 @@ -heat_template_version: wallaby - -description: > - Creates a port for a VIP on the isolated network NetworkName. - The IP address will be chosen automatically if FixedIPs is empty. - -parameters: - RootStackName: - description: The name of the stack/plan. - type: string - ServiceName: # Here for compatibility with from_service.yaml - description: Name of the service to lookup - default: '' - type: string - NetworkName: - description: Name of the network where the VIP will be created - default: ctlplane - type: string - PortName: - description: Name of the port - default: '' - type: string - DnsName: - description: DNS name of the port - default: '' - type: string - ControlPlaneIP: # Here for compatibility with noop.yaml - description: IP address on the control plane - default: '' - type: string - ControlPlaneSubnetCidr: # Here for compatibility with noop.yaml - default: '' - description: > - The subnet CIDR of the control plane network. (The parameter is - automatically resolved from the ctlplane subnet's cidr attribute.) - type: string - ControlPlaneNetwork: - description: The name of the undercloud Neutron control plane - default: ctlplane - type: string - ControlPlaneSubnet: - description: The name of the undercloud Neutron control plane subnet - default: ctlplane-subnet - type: string - FixedIPs: - description: > - Control the IP allocation for the VIP port. E.g. - [{'ip_address':'1.2.3.4'}] - default: [] - type: json - PortDeletionPolicy: - description: > - Whether to retain or delete the neutron port resource on deletion of the - stack - type: string - default: delete - constraints: - - allowed_values: [delete, retain] - IsVirtualIP: # Here for compatibility - type: boolean - default: false - -conditions: - network_is_ctlplane: - equals: - - get_param: NetworkName - - ctlplane - fixed_ip_not_set: - equals: - - yaql: - expression: $.data.where($.get('ip_address')) - data: {get_param: FixedIPs} - - [] - net_is_ctlplane_and_fixed_ip_not_set: - and: - - network_is_ctlplane - - fixed_ip_not_set - -resources: - VipPort: - type: OS::Neutron::Port - deletion_policy: {get_param: PortDeletionPolicy} - properties: - network: {get_param: NetworkName} - name: {get_param: PortName} - fixed_ips: - if: - - net_is_ctlplane_and_fixed_ip_not_set - - [{subnet: {get_param: ControlPlaneSubnet}}] - - get_param: FixedIPs - replacement_policy: AUTO - tags: - - str_replace: - template: tripleo_service_vip=$SERVICE_NAME - params: - $SERVICE_NAME: {get_param: ServiceName} - - str_replace: - template: tripleo_stack_name=$STACK_NAME - params: - $STACK_NAME: {get_param: RootStackName} - -outputs: - ip_address: - description: Virtual IP network IP - value: {get_attr: [VipPort, fixed_ips, 0, ip_address]} - ip_address_uri: - description: Virtual IP network IP (for compatibility with vip.yaml) - value: - str_replace: - template: - make_url: - host: {get_attr: [VipPort, fixed_ips, 0, ip_address]} - params: - //: '' - ip_subnet: - description: IP/Subnet CIDR for the network associated with this IP - value: - list_join: - - '' - - - {get_attr: [VipPort, fixed_ips, 0, ip_address]} - - '/' - - {str_split: ['/', {get_attr: [VipPort, subnets, 0, cidr]}, 1]} diff --git a/network/ports/vip_v6.yaml b/network/ports/vip_v6.yaml deleted file mode 100644 index 92bf47e804..0000000000 --- a/network/ports/vip_v6.yaml +++ /dev/null @@ -1,112 +0,0 @@ -heat_template_version: wallaby - -description: > - Creates a port for a VIP on the isolated network NetworkName. - The IP address will be chosen automatically if FixedIPs is empty. - -parameters: - RootStackName: - description: The name of the stack/plan. - type: string - ServiceName: # Here for compatibility with from_service.yaml - description: Name of the service to lookup - default: '' - type: string - NetworkName: - description: Name of the network where the VIP will be created - default: ctlplane - type: string - PortName: - description: Name of the port - default: '' - type: string - DnsName: - description: DNS name of the port - default: '' - type: string - ControlPlaneIP: # Here for compatability with noop.yaml - description: IP address on the control plane - default: '' - type: string - ControlPlaneSubnetCidr: # Here for compatibility with noop.yaml - default: '' - description: > - The subnet CIDR of the control plane network. (The parameter is - automatically resolved from the ctlplane subnet's cidr attribute.) - type: string - ControlPlaneNetwork: - description: The name of the undercloud Neutron control plane - default: ctlplane - type: string - ControlPlaneSubnet: - description: The name of the undercloud Neutron control plane subnet - default: ctlplane-subnet - type: string - FixedIPs: - description: > - Control the IP allocation for the VIP port. E.g. - [{'ip_address':'1.2.3.4'}] - default: [] - type: json - IsVirtualIP: # Here for compatibility - type: boolean - default: false - -conditions: - network_is_ctlplane: - equals: - - get_param: NetworkName - - ctlplane - fixed_ip_not_set: - equals: - - yaql: - expression: $.data.where($.get('ip_address')) - data: {get_param: FixedIPs} - - [] - net_is_ctlplane_and_fixed_ip_not_set: - and: - - network_is_ctlplane - - fixed_ip_not_set - -resources: - VipPort: - type: OS::Neutron::Port - properties: - network: {get_param: NetworkName} - name: {get_param: PortName} - fixed_ips: - if: - - net_is_ctlplane_and_fixed_ip_not_set - - [{subnet: {get_param: ControlPlaneSubnet}}] - - get_param: FixedIPs - replacement_policy: AUTO - tags: - - str_replace: - template: tripleo_service_vip=$SERVICE_NAME - params: - $SERVICE_NAME: {get_param: ServiceName} - - str_replace: - template: tripleo_stack_name=$STACK_NAME - params: - $STACK_NAME: {get_param: RootStackName} -outputs: - ip_address: - description: Virtual IP network IP - value: {get_attr: [VipPort, fixed_ips, 0, ip_address]} - ip_address_uri: - description: Virtual IP network IP (for compatibility with vip.yaml) - value: - str_replace: - template: - make_url: - host: {get_attr: [VipPort, fixed_ips, 0, ip_address]} - params: - //: '' - ip_subnet: - description: IP/Subnet CIDR for the network associated with this IP - value: - list_join: - - '' - - - {get_attr: [VipPort, fixed_ips, 0, ip_address]} - - '/' - - {str_split: ['/', {get_attr: [VipPort, subnets, 0, cidr]}, 1]}