forked from openstack-k8s-operators/dataplane-operator
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for ovn-controller and neutron-metadata-agent split
This depends on the edpm-ansible PR that split the roles Depends-On: openstack-k8s-operators/edpm-ansible#382
- Loading branch information
Showing
25 changed files
with
257 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1868,6 +1868,7 @@ spec: | |
| - configure-os | ||
| - run-os | ||
| - ovn | ||
| - neutron-metadata | ||
| - libvirt | ||
| - nova | ||
| - telemetry | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1868,6 +1868,7 @@ spec: | |
| - configure-os | ||
| - run-os | ||
| - ovn | ||
| - neutron-metadata | ||
| - libvirt | ||
| - nova | ||
| - telemetry | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -195,5 +195,6 @@ spec: | |
| - run-os | ||
| - ceph-client | ||
| - ovn | ||
| - neutron-metadata | ||
| - libvirt | ||
| - nova-custom-ceph | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,7 @@ spec: | |
| - configure-os | ||
| - run-os | ||
| - ovn | ||
| - neutron-metadata | ||
| - libvirt | ||
| - nova | ||
| - telemetry | ||
|
|
||
136 changes: 136 additions & 0 deletions
136
config/samples/dataplane_v1beta1_openstackdataplanenodeset_networker.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| apiVersion: dataplane.openstack.org/v1beta1 | ||
| kind: OpenStackDataPlaneNodeSet | ||
| metadata: | ||
| name: openstack-edpm | ||
| spec: | ||
| env: | ||
| - name: ANSIBLE_FORCE_COLOR | ||
| value: "True" | ||
| - name: ANSIBLE_ENABLE_TASK_DEBUGGER | ||
| value: "True" | ||
| services: | ||
| - download-cache | ||
| - configure-network | ||
| - validate-network | ||
| - install-os | ||
| - configure-os | ||
| - run-os | ||
| - ovn | ||
| - telemetry | ||
| preProvisioned: true | ||
| nodes: | ||
| edpm-compute-0: | ||
| hostName: edpm-compute-0 | ||
| ansible: | ||
| ansibleHost: 192.168.122.100 | ||
| ansibleVars: | ||
| ctlplane_ip: 192.168.122.100 | ||
| internal_api_ip: 172.17.0.100 | ||
| storage_ip: 172.18.0.100 | ||
| tenant_ip: 172.19.0.100 | ||
| fqdn_internal_api: edpm-compute-0.example.com | ||
| networkAttachments: | ||
| - ctlplane | ||
| nodeTemplate: | ||
| ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret | ||
| managementNetwork: ctlplane | ||
| ansible: | ||
| ansibleUser: cloud-admin | ||
| ansiblePort: 22 | ||
| ansibleVars: | ||
| service_net_map: | ||
| nova_api_network: internal_api | ||
| nova_libvirt_network: internal_api | ||
| edpm_chrony_ntp_servers: | ||
| - 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: 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_subnet_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 | ||
| ctlplane_mtu: 1500 | ||
| ctlplane_subnet_cidr: 24 | ||
| ctlplane_gateway_ip: 192.168.122.1 | ||
| ctlplane_host_routes: | ||
| - ip_netmask: 0.0.0.0/0 | ||
| next_hop: 192.168.122.1 | ||
| external_mtu: 1500 | ||
| external_vlan_id: 44 | ||
| external_cidr: '24' | ||
| external_host_routes: [] | ||
| internal_api_mtu: 1500 | ||
| internal_api_vlan_id: 20 | ||
| internal_api_cidr: '24' | ||
| internal_api_host_routes: [] | ||
| storage_mtu: 1500 | ||
| storage_vlan_id: 21 | ||
| storage_cidr: '24' | ||
| storage_host_routes: [] | ||
| tenant_mtu: 1500 | ||
| tenant_vlan_id: 22 | ||
| tenant_cidr: '24' | ||
| tenant_host_routes: [] | ||
| role_networks: | ||
| - InternalApi | ||
| - Storage | ||
| - Tenant | ||
| networks_lower: | ||
| External: external | ||
| InternalApi: internal_api | ||
| Storage: storage | ||
| Tenant: tenant | ||
| # 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: [] | ||
| registry_url: quay.io/podified-antelope-centos9 | ||
| image_tag: current-podified | ||
| edpm_ovn_controller_agent_image: "{{ registry_url }}/openstack-ovn-controller:{{ image_tag }}" | ||
| edpm_iscsid_image: "{{ registry_url }}/openstack-iscsid:{{ image_tag }}" | ||
| edpm_logrotate_crond_image: "{{ registry_url }}/openstack-cron:{{ image_tag }}" | ||
| 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
config/services/dataplane_v1beta1_openstackdataplaneservice_neutron_metadata.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| apiVersion: dataplane.openstack.org/v1beta1 | ||
| kind: OpenStackDataPlaneService | ||
| metadata: | ||
| name: neutron-metadata | ||
| spec: | ||
| label: dataplane-deployment-neutron-metadata | ||
| playbook: osp.edpm.neutron_metadata | ||
| secrets: | ||
| - neutron-ovn-metadata-agent-neutron-config | ||
| - nova-metadata-neutron-config |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.