From feec966f8bde2d67d2ab01ef3ee04c308b580bba Mon Sep 17 00:00:00 2001 From: Fabricio Aguiar Date: Tue, 5 Mar 2024 17:27:50 +0000 Subject: [PATCH] Delete samples in favor of kustomize examples Signed-off-by: Fabricio Aguiar --- ...taplanedeployment_baremetal_with_ipam.yaml | 7 - ...penstackdataplanedeployment_networker.yaml | 7 - ...kdataplanenodeset_baremetal_with_ipam.yaml | 88 ----------- ...v1beta1_openstackdataplanenodeset_bgp.yaml | 118 --------------- ...stackdataplanenodeset_bgp_ovn_cluster.yaml | 141 ------------------ ...1_openstackdataplanenodeset_networker.yaml | 99 ------------ 6 files changed, 460 deletions(-) delete mode 100644 config/samples/dataplane_v1beta1_openstackdataplanedeployment_baremetal_with_ipam.yaml delete mode 100644 config/samples/dataplane_v1beta1_openstackdataplanedeployment_networker.yaml delete mode 100644 config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal_with_ipam.yaml delete mode 100644 config/samples/dataplane_v1beta1_openstackdataplanenodeset_bgp.yaml delete mode 100644 config/samples/dataplane_v1beta1_openstackdataplanenodeset_bgp_ovn_cluster.yaml delete mode 100644 config/samples/dataplane_v1beta1_openstackdataplanenodeset_networker.yaml diff --git a/config/samples/dataplane_v1beta1_openstackdataplanedeployment_baremetal_with_ipam.yaml b/config/samples/dataplane_v1beta1_openstackdataplanedeployment_baremetal_with_ipam.yaml deleted file mode 100644 index a88134791..000000000 --- a/config/samples/dataplane_v1beta1_openstackdataplanedeployment_baremetal_with_ipam.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneDeployment -metadata: - name: openstack-edpm-ipam -spec: - nodeSets: - - openstack-edpm-ipam diff --git a/config/samples/dataplane_v1beta1_openstackdataplanedeployment_networker.yaml b/config/samples/dataplane_v1beta1_openstackdataplanedeployment_networker.yaml deleted file mode 100644 index d74821e05..000000000 --- a/config/samples/dataplane_v1beta1_openstackdataplanedeployment_networker.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneDeployment -metadata: - name: openstack-edpm-networker -spec: - nodeSets: - - openstack-edpm-networker diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal_with_ipam.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal_with_ipam.yaml deleted file mode 100644 index 664ddeafe..000000000 --- a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal_with_ipam.yaml +++ /dev/null @@ -1,88 +0,0 @@ -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: openstack-edpm-ipam -spec: - services: - - download-cache - - bootstrap - - configure-network - - validate-network - - install-os - - configure-os - - run-os - - reboot-os - - install-certs - - ovn - - neutron-metadata - - libvirt - - nova - - telemetry - baremetalSetTemplate: - bmhLabelSelector: - app: openstack - ctlplaneInterface: enp1s0 - cloudUserName: cloud-admin - nodes: - edpm-compute-0: - hostName: edpm-compute-0 - networkAttachments: - - ctlplane - nodeTemplate: - networks: - - name: ctlplane - subnetName: subnet1 - defaultRoute: true - - name: internalapi - subnetName: subnet1 - - name: storage - subnetName: subnet1 - - name: tenant - subnetName: subnet1 - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret - managementNetwork: ctlplane - ansible: - ansibleVars: - edpm_network_config_template: | - --- - {% set mtu_list = [ctlplane_mtu] %} - {% for network in role_networks %} - {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} - {%- endfor %} - {% set min_viable_mtu = mtu_list | max %} - network_config: - - type: ovs_bridge - name: {{ neutron_physical_bridge_name }} - mtu: {{ min_viable_mtu }} - use_dhcp: false - dns_servers: {{ ctlplane_dns_nameservers }} - domain: {{ dns_search_domains }} - addresses: - - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }} - routes: {{ ctlplane_host_routes }} - members: - - type: interface - name: nic1 - mtu: {{ min_viable_mtu }} - # force the MAC address of the bridge to this interface - primary: true - {% for network in role_networks %} - - type: vlan - mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }} - vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }} - addresses: - - ip_netmask: - {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }} - routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }} - {% endfor %} - # These vars are for the network config templates themselves and are - # considered EDPM network defaults. - neutron_physical_bridge_name: br-ex - neutron_public_interface_name: eth0 - # edpm_nodes_validation - edpm_nodes_validation_validate_controllers_icmp: false - edpm_nodes_validation_validate_gateway_icmp: false - gather_facts: false - enable_debug: false - # edpm firewall, change the allowed CIDR if needed - edpm_sshd_allowed_ranges: ['192.168.111.0/24'] diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_bgp.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_bgp.yaml deleted file mode 100644 index ac4621418..000000000 --- a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_bgp.yaml +++ /dev/null @@ -1,118 +0,0 @@ -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: openstack-edpm -spec: - services: - - download-cache - - bootstrap - - configure-network - - validate-network - - frr - - install-os - - configure-os - - run-os - - reboot-os - - install-certs - - ovn - - neutron-metadata - - ovn-bgp-agent - - libvirt - - nova - - telemetry - preProvisioned: true - nodes: - edpm-compute-0: - hostName: edpm-compute-0 - ansible: - ansibleHost: 192.168.122.100 - networks: - - name: ctlplane - subnetName: subnet1 - defaultRoute: true - fixedIP: 192.168.122.100 - - name: internalapi - subnetName: subnet1 - - name: storage - subnetName: subnet1 - - name: tenant - subnetName: subnet1 - networkAttachments: - - ctlplane - nodeTemplate: - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret - managementNetwork: ctlplane - ansible: - ansibleUser: cloud-admin - ansiblePort: 22 - ansibleVars: - timesync_ntp_servers: - - hostname: pool.ntp.org - # edpm_network_config - # Default nic config template for a EDPM compute node - # These vars are edpm_network_config role vars - edpm_network_config_hide_sensitive_logs: false - edpm_network_config_template: | - --- - {% set mtu_list = [ctlplane_mtu] %} - {% for network in role_networks %} - {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} - {%- endfor %} - {% set min_viable_mtu = mtu_list | max %} - network_config: - - type: interface - name: nic1 - mtu: {{ ctlplane_mtu }} - dns_servers: {{ ctlplane_dns_nameservers }} - domain: {{ dns_search_domains }} - use_dhcp: false - addresses: - - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }} - {% for network in role_networks %} - {% if lookup('vars', networks_lower[network] ~ '_vlan_id', default='') %} - - type: vlan - device: nic1 - mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }} - vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }} - addresses: - - ip_netmask: - {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }} - routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }} - {% endif %} - {%- endfor %} - - type: ovs_bridge - name: {{ neutron_physical_bridge_name }} - use_dhcp: false - - type: interface - name: nic2 - use_dhcp: false - addresses: - - ip_netmask: {{ lookup('vars', 'bgpnet1_ip') }}/30 - - type: interface - name: nic3 - use_dhcp: false - addresses: - - ip_netmask: {{ lookup('vars', 'bgpnet2_ip') }}/30 - - type: interface - name: lo - addresses: - - ip_netmask: {{ lookup('vars', 'bgpmainnet_ip') }}/32 - - ip_netmask: {{ lookup('vars', 'bgpmainnet6_ip') }}/128 - - # These vars are for the network config templates themselves and are - # considered EDPM network defaults. - neutron_physical_bridge_name: br-ex - neutron_public_interface_name: eth0 - # edpm_nodes_validation - edpm_nodes_validation_validate_controllers_icmp: false - edpm_nodes_validation_validate_gateway_icmp: false - ctlplane_dns_nameservers: - - 192.168.122.1 - dns_search_domains: [] - # edpm firewall, change the allowed CIDR if needed - edpm_sshd_allowed_ranges: ['192.168.122.0/24'] - edpm_frr_bgp_uplinks: ['nic2', 'nic3'] - edpm_frr_bgp_neighbor_password: f00barZ - edpm_frr_bgp_ipv4_src_network: bgpmainnet - edpm_frr_bgp_ipv6_src_network: bgpmainnet6 - edpm_ovn_bgp_agent_expose_tenant_networks: true diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_bgp_ovn_cluster.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_bgp_ovn_cluster.yaml deleted file mode 100644 index 95836413b..000000000 --- a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_bgp_ovn_cluster.yaml +++ /dev/null @@ -1,141 +0,0 @@ -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: openstack-edpm -spec: - services: - - download-cache - - bootstrap - - configure-network - - validate-network - - frr - - install-os - - configure-os - - run-os - - install-certs - - ovn - - neutron-metadata - - ovn-bgp-agent - - libvirt - - nova - - telemetry - preProvisioned: true - nodes: - edpm-compute-0: - hostName: edpm-compute-0 - ansible: - ansibleHost: 192.168.122.100 - networks: - - name: ctlplane - subnetName: subnet1 - defaultRoute: true - fixedIP: 192.168.122.100 - - name: internalapi - subnetName: subnet1 - - name: storage - subnetName: subnet1 - - name: tenant - subnetName: subnet1 - networkAttachments: - - ctlplane - nodeTemplate: - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret - managementNetwork: ctlplane - ansible: - ansibleUser: cloud-admin - ansiblePort: 22 - ansibleVars: - timesync_ntp_servers: - - hostname: pool.ntp.org - # edpm_network_config - # Default nic config template for a EDPM compute node - # These vars are edpm_network_config role vars - edpm_network_config_hide_sensitive_logs: false - edpm_network_config_template: | - --- - {% set mtu_list = [ctlplane_mtu] %} - {% for network in role_networks %} - {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} - {%- endfor %} - {% set min_viable_mtu = mtu_list | max %} - network_config: - - type: interface - name: nic1 - mtu: {{ ctlplane_mtu }} - dns_servers: {{ ctlplane_dns_nameservers }} - domain: {{ dns_search_domains }} - use_dhcp: false - addresses: - - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }} - {% for network in role_networks %} - {% if lookup('vars', networks_lower[network] ~ '_vlan_id', default='') %} - - type: vlan - device: nic1 - mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }} - vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }} - addresses: - - ip_netmask: - {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }} - routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }} - {% endif %} - {%- endfor %} - - type: ovs_bridge - name: br-provider - use_dhcp: false - - type: ovs_bridge - name: {{ neutron_physical_bridge_name }} - mtu: {{ min_viable_mtu }} - use_dhcp: false - addresses: - - ip_netmask: {{ lookup('vars', 'bgpnet1_ip') }}/30 - members: - - type: interface - name: nic2 - mtu: {{ min_viable_mtu }} - # force the MAC address of the bridge to this interface - primary: true - - type: ovs_bridge - name: {{ neutron_physical_bridge_name }}-2 - mtu: {{ min_viable_mtu }} - use_dhcp: false - addresses: - - ip_netmask: {{ lookup('vars', 'bgpnet2_ip') }}/30 - members: - - type: interface - name: nic3 - mtu: {{ min_viable_mtu }} - # force the MAC address of the bridge to this interface - primary: true - - type: interface - name: lo - addresses: - - ip_netmask: {{ lookup('vars', 'bgpmainnet_ip') }}/32 - - ip_netmask: {{ lookup('vars', 'bgpmainnet6_ip') }}/128 - - # These vars are for the network config templates themselves and are - # considered EDPM network defaults. - neutron_physical_bridge_name: br-ex - neutron_public_interface_name: eth0 - # edpm_nodes_validation - edpm_nodes_validation_validate_controllers_icmp: false - edpm_nodes_validation_validate_gateway_icmp: false - ctlplane_dns_nameservers: - - 192.168.122.1 - dns_search_domains: [] - gather_facts: false - enable_debug: false - # edpm firewall, change the allowed CIDR if needed - edpm_sshd_configure_firewall: true - edpm_sshd_allowed_ranges: ['192.168.122.0/24'] - edpm_frr_bgp_uplinks: ['nic2', 'nic3'] - edpm_frr_bgp_neighbor_password: f00barZ - edpm_frr_bgp_ipv4_src_network: bgpmainnet - edpm_frr_bgp_ipv6_src_network: bgpmainnet6 - edpm_frr_bgp_peers: ['100.64.1.5', '100.65.1.5'] - edpm_ovn_bgp_agent_expose_tenant_networks: true - edpm_ovn_bgp_agent_local_ovn_routing: true - edpm_ovn_bridge_mappings: ['bgp:br-provider'] - edpm_ovn_bgp_agent_local_ovn_external_nics: ['eth1', 'eth2'] - edpm_ovn_bgp_agent_local_ovn_peer_ips: ['100.64.1.5', '100.65.1.5'] - edpm_ovn_bgp_agent_exposing_method: ovn - edpm_ovn_bgp_agent_provider_networks_pool_prefixes: '172.16.0.0/16' diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_networker.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_networker.yaml deleted file mode 100644 index 975f45119..000000000 --- a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_networker.yaml +++ /dev/null @@ -1,99 +0,0 @@ -apiVersion: dataplane.openstack.org/v1beta1 -kind: OpenStackDataPlaneNodeSet -metadata: - name: openstack-edpm-networker -spec: - services: - - download-cache - - bootstrap - - configure-network - - validate-network - - install-os - - configure-os - - run-os - - reboot-os - - install-certs - - ovn - preProvisioned: true - nodes: - edpm-networker-0: - hostName: edpm-networker-0 - ansible: - ansibleHost: 192.168.122.100 - networks: - - name: ctlplane - subnetName: subnet1 - defaultRoute: true - fixedIP: 192.168.122.100 - - name: internalapi - subnetName: subnet1 - - name: storage - subnetName: subnet1 - - name: tenant - subnetName: subnet1 - networkAttachments: - - ctlplane - nodeTemplate: - ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret - managementNetwork: ctlplane - ansible: - ansibleUser: cloud-admin - ansiblePort: 22 - ansibleVars: - timesync_ntp_servers: - - hostname: pool.ntp.org - # edpm_network_config - # Default nic config template for a EDPM networker node - # These vars are edpm_network_config role vars - edpm_network_config_hide_sensitive_logs: false - edpm_network_config_template: | - --- - {% set mtu_list = [ctlplane_mtu] %} - {% for network in role_networks %} - {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} - {%- endfor %} - {% set min_viable_mtu = mtu_list | max %} - network_config: - - type: ovs_bridge - name: {{ neutron_physical_bridge_name }} - mtu: {{ min_viable_mtu }} - use_dhcp: false - dns_servers: {{ ctlplane_dns_nameservers }} - domain: {{ dns_search_domains }} - addresses: - - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }} - routes: {{ ctlplane_host_routes }} - members: - - type: interface - name: nic1 - mtu: {{ min_viable_mtu }} - # force the MAC address of the bridge to this interface - primary: true - {% for network in role_networks %} - - type: vlan - mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }} - vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }} - addresses: - - ip_netmask: - {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }} - routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }} - {% endfor %} - - # These vars are for the network config templates themselves and are - # considered EDPM network defaults. - neutron_physical_bridge_name: br-ex - neutron_public_interface_name: eth0 - # edpm_nodes_validation - edpm_nodes_validation_validate_controllers_icmp: false - edpm_nodes_validation_validate_gateway_icmp: false - ctlplane_dns_nameservers: - - 192.168.122.1 - dns_search_domains: [] - edpm_enable_chassis_gw: true - gather_facts: false - enable_debug: false - # edpm firewall, change the allowed CIDR if needed - edpm_sshd_configure_firewall: true - edpm_sshd_allowed_ranges: ['192.168.122.0/24'] - # SELinux module - edpm_selinux_mode: enforcing