Skip to content

Various multinode fixes and features #411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Various multinode fixes and features #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba70aa7
support VMs as compute/controllers in multinode
Alex-Welsh Feb 28, 2023
58c6ec5
un-disable monitoring in the multinode environment
Alex-Welsh Feb 28, 2023
aa72bfa
fix VM internet connectivity in multinode
Alex-Welsh Feb 28, 2023
ac6f534
make ci-multinode network MTUs dynamic
Alex-Welsh Mar 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion etc/kayobe/ansible/configure-vxlan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
- name: Configure VXLAN
hosts: controllers,compute,seed,storage
gather_facts: false
gather_facts: true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is potential for some incorrect behaviour here, since facts are gathered as the bootstrap user using the system python interpreter, some facts may be incorrect. In general we disable fact gathering during the user & venv bootstrap phase of host configure to avoid this. I think this is mostly an issue when using fact caching, but I can't remember all the details.

Let's try it like this, but keep an eye out for odd owner/permissions issues.

vars:
ansible_user: "{{ bootstrap_user }}"
# We can't assume that a virtualenv exists at this point, so use the system
Expand Down
2 changes: 1 addition & 1 deletion etc/kayobe/environments/ci-multinode/inventory/group_vars/compute/network-interfaces
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
###############################################################################
# Network interface definitions for the compute group.

admin_oc_interface: "eno1"
admin_oc_interface: "{{ ansible_facts.default_ipv4.interface }}"

internal_interface: "{{ vxlan_interfaces[0].device }}.{{ internal_vlan }}"

Expand Down
2 changes: 1 addition & 1 deletion etc/kayobe/environments/ci-multinode/inventory/group_vars/controllers/network-interfaces
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
###############################################################################
# Network interface definitions for the controller group.

admin_oc_interface: "eno1"
admin_oc_interface: "{{ ansible_facts.default_ipv4.interface }}"

internal_interface: "{{ vxlan_interfaces[0].device }}.{{ internal_vlan }}"

Expand Down
9 changes: 0 additions & 9 deletions etc/kayobe/environments/ci-multinode/kolla.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,3 @@ kolla_enable_cinder_backup: true
kolla_enable_neutron_provider_networks: true
kolla_enable_ovn: true
kolla_enable_octavia: true

# Override these from etc/kayobe/kolla.yml
# These are set to true within etc/kayobe/kolla.yml.
# Leaving them set to true would require additional
# configuration change.
kolla_enable_central_logging: false
kolla_enable_elasticsearch_curator: false
kolla_enable_grafana: false
kolla_enable_prometheus: false
3 changes: 3 additions & 0 deletions etc/kayobe/environments/ci-multinode/kolla/globals.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ nova_backend_ceph: "yes"
neutron_bridge_name: "{{ vxlan_interfaces[0].device }}-ovs"
neutron_external_interface: "{{ vxlan_interfaces[0].device }}"

# Elasticsearch memory tuning
es_heap_size: 1g

# Octavia load balancer configuration
octavia_auto_configure: "no"
octavia_provider_drivers: "ovn:OVN provider"
Expand Down
12 changes: 6 additions & 6 deletions etc/kayobe/environments/ci-multinode/networks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ storage_mgmt_net_name: storage_mgmt

# Internal network
internal_cidr: 192.168.37.0/24
internal_mtu: 1450
internal_mtu: "{{ ansible_facts.default_ipv4.mtu - 50 }}"
internal_allocation_pool_start: 192.168.37.3
internal_allocation_pool_end: 192.168.37.254
internal_vip_address: 192.168.37.2
Expand All @@ -88,36 +88,36 @@ external_vlan: 102

# Public network
public_cidr: 192.168.39.0/24
public_mtu: 1450
public_mtu: "{{ ansible_facts.default_ipv4.mtu - 50 }}"
public_allocation_pool_start: 192.168.39.3
public_allocation_pool_end: 192.168.39.254
public_vip_address: 192.168.39.2
public_vlan: 103

# Tunnel network
tunnel_cidr: 192.168.40.0/24
tunnel_mtu: 1450
tunnel_mtu: "{{ ansible_facts.default_ipv4.mtu - 50 }}"
tunnel_allocation_pool_start: 192.168.40.3
tunnel_allocation_pool_end: 192.168.40.254
tunnel_vlan: 104

# Storage network
storage_cidr: 192.168.41.0/24
storage_mtu: 1450
storage_mtu: "{{ ansible_facts.default_ipv4.mtu - 50 }}"
storage_allocation_pool_start: 192.168.41.3
storage_allocation_pool_end: 192.168.41.254
storage_vlan: 105

# Storage management network
storage_mgmt_cidr: 192.168.42.0/24
storage_mgmt_mtu: 1450
storage_mgmt_mtu: "{{ ansible_facts.default_ipv4.mtu - 50 }}"
storage_mgmt_allocation_pool_start: 192.168.42.3
storage_mgmt_allocation_pool_end: 192.168.42.254
storage_mgmt_vlan: 106

# Provision overcloud network
provision_oc_cidr: 192.168.33.0/24
provision_oc_mtu: 1450
provision_oc_mtu: "{{ ansible_facts.default_ipv4.mtu - 50 }}"
provision_oc_allocation_pool_start: 192.168.33.128
provision_oc_allocation_pool_end: 192.168.33.254
provision_oc_vlan: 107
Expand Down
4 changes: 4 additions & 0 deletions etc/kayobe/environments/ci-multinode/seed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@ seed_lvm_groups:
seed_extra_network_interfaces:
- "external"
- "public"

# Enable IP routing and source NAT on the seed, allowing it to be used as the
# external subnet gateway and provide internet access for VMs in the deployment.
seed_enable_snat: true
5 changes: 5 additions & 0 deletions releasenotes/notes/add-monitoring-to-multinode-958603f026edbc7c.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
features:
- |
Set monitoring services be enabled by default in the ``ci-multinode``
environment.
7 changes: 7 additions & 0 deletions releasenotes/notes/add-vm-overcloud-support-92baa7c2ce87ac1d.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
features:
- |
Adds support for using a VMs as compute and controller nodes in the
``ci-multinode`` environment by dynamically setting the MTU of the networks
in networks.yml and removing the static definition of the network
interfaces for the compute and controller groups.
5 changes: 5 additions & 0 deletions releasenotes/notes/fix-multinode-vm-internet-connectivity-49ab64cd75833f09.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
fixes:
- |
Fixes internet connectivity for VMs deployed in the ``ci-multinode``
environment.