openstack/kolla-ansible
Code Issues Proposed changes

Merge "CI: test interface names with dashes"

Browse Source
This commit is contained in:
Zuul 2024-08-16 15:10:34 +00:00 committed by Gerrit Code Review
commit b9af83bb68
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/cephadm/templates/cephadm.yml.j2
View File

@ -2,7 +2,7 @@
--- ---
service_type: host service_type: host
hostname: {{ hostvars[host]['ansible_hostname'] }} hostname: {{ hostvars[host]['ansible_hostname'] }}
addr: {{ hostvars[host]['ansible_vxlan0']['ipv4']['address'] }} addr: {{ hostvars[host]['ansible_vxlan_0']['ipv4']['address'] }}
labels: labels:
- _admin - _admin
- mon - mon

2
tests/templates/neutron-server-overrides.j2
View File

@ -1,2 +1,2 @@
[DEFAULT] [DEFAULT]
global_physnet_mtu={{ ansible_vxlan0.mtu }} global_physnet_mtu={{ ansible_vxlan_1.mtu }}

7
zuul.d/base.yaml
View File

@ -18,7 +18,8 @@
ansible_version_slurp: "==7.*" ansible_version_slurp: "==7.*"
ansible_version_min: "==8.*" ansible_version_min: "==8.*"
ansible_version_max: "==9.*" ansible_version_max: "==9.*"
api_interface_name: vxlan0 # NOTE(mgoddard): Test the use of interface names with dashes.
api_interface_name: "vxlan-0"
api_network_prefix: "192.0.2." api_network_prefix: "192.0.2."
api_network_prefix_length: "24" api_network_prefix_length: "24"
configure_swap_size: 0 configure_swap_size: 0
@ -27,11 +28,11 @@
is_slurp: false is_slurp: false
kolla_internal_vip_address: "192.0.2.10" kolla_internal_vip_address: "192.0.2.10"
le_enabled: false le_enabled: false
neutron_external_bridge_name: br0 neutron_external_bridge_name: br-0
neutron_external_interface_name: "veth-{{ neutron_external_bridge_name }}-ext" neutron_external_interface_name: "veth-{{ neutron_external_bridge_name }}-ext"
neutron_external_network_prefix: "198.51.100." neutron_external_network_prefix: "198.51.100."
neutron_external_network_prefix_length: "24" neutron_external_network_prefix_length: "24"
neutron_external_vxlan_interface_name: vxlan1 neutron_external_vxlan_interface_name: "vxlan-1"
neutron_tenant_network_dns_server: "8.8.8.8" neutron_tenant_network_dns_server: "8.8.8.8"
neutron_tenant_network_prefix: "203.0.113." neutron_tenant_network_prefix: "203.0.113."
neutron_tenant_network_prefix_length: "24" neutron_tenant_network_prefix_length: "24"