diff options
| author | Zuul <zuul@review.opendev.org> | 2024-08-16 15:10:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-08-16 15:10:34 +0000 |
| commit | b9af83bb68ceb6f1ea7ebf38655a7ec23290c94f (patch) | |
| tree | 04cebd056cf3c3aac6af92191c0861f1f51c7cc8 | |
| parent | 76f9516af8fc0130ef80f9063f2a15439532572c (diff) | |
| parent | a42b0b5ed1c428ba1795eedac40239e56008b258 (diff) | |
| download | kolla-ansible-b9af83bb68ceb6f1ea7ebf38655a7ec23290c94f.tar.gz kolla-ansible-b9af83bb68ceb6f1ea7ebf38655a7ec23290c94f.zip | |
Merge "CI: test interface names with dashes"
| -rw-r--r-- | roles/cephadm/templates/cephadm.yml.j2 | 4 | ||||
| -rw-r--r-- | tests/templates/neutron-server-overrides.j2 | 2 | ||||
| -rw-r--r-- | zuul.d/base.yaml | 7 |
3 files changed, 7 insertions, 6 deletions
diff --git a/roles/cephadm/templates/cephadm.yml.j2 b/roles/cephadm/templates/cephadm.yml.j2 index 2aee3f819..b56466c4f 100644 --- a/roles/cephadm/templates/cephadm.yml.j2 +++ b/roles/cephadm/templates/cephadm.yml.j2 @@ -2,8 +2,8 @@ --- service_type: host hostname: {{ hostvars[host]['ansible_hostname'] }} -addr: {{ hostvars[host]['ansible_vxlan0']['ipv4']['address'] }} -labels: +addr: {{ hostvars[host]['ansible_vxlan_0']['ipv4']['address'] }} +labels: - _admin - mon - mgr diff --git a/tests/templates/neutron-server-overrides.j2 b/tests/templates/neutron-server-overrides.j2 index ca84372fd..f5af5e97a 100644 --- a/tests/templates/neutron-server-overrides.j2 +++ b/tests/templates/neutron-server-overrides.j2 @@ -1,2 +1,2 @@ [DEFAULT] -global_physnet_mtu={{ ansible_vxlan0.mtu }} +global_physnet_mtu={{ ansible_vxlan_1.mtu }} diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index b6b3d043d..a852f05e3 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -18,7 +18,8 @@ ansible_version_slurp: "==7.*" ansible_version_min: "==8.*" 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_length: "24" configure_swap_size: 0 @@ -27,11 +28,11 @@ is_slurp: false kolla_internal_vip_address: "192.0.2.10" 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_network_prefix: "198.51.100." 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_prefix: "203.0.113." neutron_tenant_network_prefix_length: "24" |