Sagely/toallab-openstack
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to use control node on storage as VM

Browse Source
This commit is contained in:
Patrick Toal
2023-07-04 21:18:38 -04:00
parent d2019bfb33
commit c0031066d7
7 changed files with 107 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Home_OSP_Network.drawio Normal file
View File

File diff suppressed because one or more lines are too long

8
devstack_setup.yml
View File

@@ -15,12 +15,20 @@
name: '*' name: '*'
state: latest state: latest
- name: Install full curl package with allowerasing
ansible.builtin.dnf:
name: curl
state: present
allowerasing: true
- name: Packages installed - name: Packages installed
ansible.builtin.dnf: ansible.builtin.dnf:
name: "{{ install_packages }}" name: "{{ install_packages }}"
state: present state: present
allowerasing: true allowerasing: true
# TODO: Properly handle getting kmod from centos-kmod-rebuild
# TODO: Restart NetworkManager service if NetworkManager-ovs package is updated # TODO: Restart NetworkManager service if NetworkManager-ovs package is updated
- name: Create stack user for admin - name: Create stack user for admin

87
files/openstack_user_config.yml
View File

@@ -13,10 +13,15 @@ global_overrides:
external_lb_vip_address: 172.29.236.10 external_lb_vip_address: 172.29.236.10
management_bridge: "br-mgmt" management_bridge: "br-mgmt"
tunnel_bridge: "br-vxlan" tunnel_bridge: "br-vxlan"
neutron_provider_networks:
network_types: "geneve"
network_geneve_ranges: "1:1000"
network_vlan_ranges: "public"
network_mappings: "public:br-publicnet"
network_interface_mappings: "br-publicnet:bond1"
provider_networks: provider_networks:
- network: - network:
container_bridge: "br-mgmt" container_bridge: "br-mgmt"
container_bridge_type: openvswitch
container_type: "veth" container_type: "veth"
container_interface: "eth1" container_interface: "eth1"
ip_from_q: "container" ip_from_q: "container"
@@ -26,33 +31,8 @@ global_overrides:
- hosts - hosts
is_management_address: true is_management_address: true
is_container_address: true is_container_address: true
- network:
container_bridge: "br-vxlan"
container_bridge_type: openvswitch
container_type: "veth"
container_interface: "eth10"
container_mtu: "9000"
ip_from_q: "tunnel"
type: "vxlan"
range: "1:1000"
group_binds:
- neutron_openvswitch_agent
# - network:
# container_bridge: "br-vlan"
# container_bridge_type: openvswitch
# container_type: "veth"
# container_interface: "eth11"
# container_mtu: "9000"
# type: "vlan"
# range: "701:800,801:900"
# net_name: "vlan"
# group_binds:
# - neutron_openvswitch_agent
# host_bind_override:
# -
- network: - network:
container_bridge: "br-storage" container_bridge: "br-storage"
container_bridge_type: openvswitch
container_type: "veth" container_type: "veth"
container_interface: "eth2" container_interface: "eth2"
container_mtu: "9000" container_mtu: "9000"
@@ -64,13 +44,44 @@ global_overrides:
- cinder_volume - cinder_volume
- nova_compute - nova_compute
- repo_container - repo_container
- neutron_openvswitch_agent - network:
container_bridge: "br-tunnel"
container_type: "veth"
container_interface: "eth10"
container_mtu: "9000"
ip_from_q: "tunnel"
type: "geneve"
range: "1:1000"
group_binds:
- neutron_ovn_controller
# - network:
# container_bridge: "br-vlan"
# container_type: "veth"
# container_interface: "eth11"
# container_mtu: "9000"
# type: "vlan"
# range: "700:899"
# net_name: "vlan"
# network_interface: "br-ex"
# group_binds:
# - neutron_ovn_controller
neutron_plugin_type: ml2.ovs # Workaround for https://github.com/eventlet/eventlet/issues/781
venv_default_pip_packages:
- eventlet==0.33.3
neutron_plugin_type: ml2.ovn
neutron_ml2_drivers_type: "flat,vlan,vxlan"
neutron_plugin_base: neutron_plugin_base:
- router - ovn-router
neutron_ml2_drivers_type: "vlan,local,geneve"
# neutron_plugin_type: ml2.ovs
# neutron_ml2_drivers_type: "flat,vlan,vxlan"
# neutron_plugin_base:
# - router
### ###
### Infrastructure ### Infrastructure
@@ -135,6 +146,22 @@ network_hosts:
infra1: infra1:
ip: 172.29.236.11 ip: 172.29.236.11
neutron_ovn_northd:
infra1:
ip: 172.29.236.11
network_gateway_hosts:
infra1:
ip: 172.29.236.11
neutron_ovn_controller:
infra1:
ip: 172.29.236.11
neutron_ovn_gateway:
infra1:
ip: 172.29.236.11
# nova hypervisors # nova hypervisors
compute_hosts: compute_hosts:
compute1: compute1:

2
files/user_variables.yml
View File

@@ -37,7 +37,7 @@ debug: false
# Default option (source) is to install the OpenStack services using PIP # Default option (source) is to install the OpenStack services using PIP
# packages. An alternative method (distro) is to use the distribution cloud # packages. An alternative method (distro) is to use the distribution cloud
# repositories to install OpenStack using distribution packages # repositories to install OpenStack using distribution packages
install_method: distro install_method: source
## Common Glance Overrides ## Common Glance Overrides
# Set glance_default_store to "swift" if using Cloud Files backend # Set glance_default_store to "swift" if using Cloud Files backend

10
inventory/group_vars/compute.yaml
View File

@@ -6,6 +6,14 @@ install_packages:
- sudo - sudo
- tcpdump - tcpdump
- python3 - python3
- curl-minimal - curl
- rdo-openvswitch - rdo-openvswitch
- NetworkManager-ovs - NetworkManager-ovs
- centos-release-kmods # For be2net driver
neutron_provider_networks:
network_types: "geneve"
network_geneve_ranges: "1:1000"
network_vlan_ranges: "public:700:899"
network_mappings: "public:br-publicnet"
network_interface_mappings: "br-publicnet:bond1"

57
inventory/host_vars/compute1.lab.toal.ca/networking.yml
View File

@@ -8,11 +8,18 @@ network_state:
routes: routes:
config: config:
- destination: 0.0.0.0/0 - destination: 0.0.0.0/0
next-hop-interface: ens2f1.6 next-hop-interface: enp3s0f0
next-hop-address: 192.168.90.1 next-hop-address: 192.168.90.1
metric: 400 metric: 400
table-id: 254 table-id: 254
interfaces: interfaces:
- name: enp3s0f0
type: ethernet
state: up
mtu: 9000
ipv4:
enabled: true
dhcp: true
- name: ens2f1 - name: ens2f1
type: ethernet type: ethernet
state: up state: up
@@ -24,24 +31,6 @@ network_state:
enabled: false enabled: false
dhcp: false dhcp: false
autoconf: false autoconf: false
- name: ens2f1.6
type: vlan
state: up
mtu: 1500
ipv4:
enabled: true
dhcp: false
address:
- ip: 192.168.90.18
prefix-length: 24
ipv6:
enabled: true
dhcp: false
autoconf: false
vlan:
base-iface: ens2f1
id: 6
protocol: 802.1q
- name: ens2f1.236 - name: ens2f1.236
type: vlan type: vlan
state: up state: up
@@ -76,16 +65,11 @@ network_state:
id: 244 id: 244
protocol: 802.1q protocol: 802.1q
- name: br-mgmt - name: br-mgmt
type: ovs-bridge type: linux-bridge
state: up state: up
mtu: 9000
bridge: bridge:
port: port:
- name: ens2f1.236 - name: ens2f1.236
- name: br-mgmt
- name: br-mgmt
type: ovs-interface
state: up
ipv4: ipv4:
enabled: true enabled: true
dhcp: false dhcp: false
@@ -96,17 +80,13 @@ network_state:
enabled: true enabled: true
dhcp: false dhcp: false
autoconf: false autoconf: false
- name: br-vxlan - name: br-tunnel
type: ovs-bridge type: linux-bridge
state: up
mtu: 9000 mtu: 9000
state: up
bridge: bridge:
port: port:
- name: ens2f1.240 - name: ens2f1.240
- name: br-vxlan
- name: br-vxlan
type: ovs-interface
state: up
ipv4: ipv4:
enabled: true enabled: true
dhcp: false dhcp: false
@@ -117,24 +97,13 @@ network_state:
enabled: true enabled: true
dhcp: false dhcp: false
autoconf: false autoconf: false
# - name: br-vlan
# type: ovs-bridge
# state: up
# mtu: 9000
# bridge:
# port:
# - name: ens2f1
- name: br-storage - name: br-storage
type: ovs-bridge type: linux-bridge
state: up state: up
mtu: 9000 mtu: 9000
bridge: bridge:
port: port:
- name: ens2f1.244 - name: ens2f1.244
- name: br-storage
- name: br-storage
type: ovs-interface
state: up
ipv4: ipv4:
enabled: true enabled: true
dhcp: false dhcp: false

57
inventory/host_vars/ospc.lab.toal.ca/networking.yml
View File

@@ -8,12 +8,12 @@ network_state:
routes: routes:
config: config:
- destination: 0.0.0.0/0 - destination: 0.0.0.0/0
next-hop-interface: enp2s0 next-hop-interface: ens4
next-hop-address: 192.168.90.1 next-hop-address: 192.168.90.1
metric: 400 metric: 400
table-id: 254 table-id: 254
interfaces: interfaces:
- name: enp2s0 - name: ens4
type: ethernet type: ethernet
state: up state: up
mtu: 1500 mtu: 1500
@@ -29,8 +29,7 @@ network_state:
autoconf: false autoconf: false
# lldp: # lldp:
# enabled: true # enabled: true
- name: ens3
- name: enp3s0
type: ethernet type: ethernet
state: up state: up
mtu: 9000 mtu: 9000
@@ -43,7 +42,7 @@ network_state:
autoconf: false autoconf: false
# lldp: # lldp:
# enabled: true # enabled: true
- name: enp3s0.236 - name: ens3.236
type: vlan type: vlan
state: up state: up
mtu: 9000 mtu: 9000
@@ -51,10 +50,10 @@ network_state:
enabled: false enabled: false
dhcp: false dhcp: false
vlan: vlan:
base-iface: enp3s0 base-iface: ens3
id: 236 id: 236
protocol: 802.1q protocol: 802.1q
- name: enp3s0.240 - name: ens3.240
type: vlan type: vlan
state: up state: up
mtu: 9000 mtu: 9000
@@ -62,30 +61,22 @@ network_state:
enabled: false enabled: false
dhcp: false dhcp: false
vlan: vlan:
base-iface: enp3s0 base-iface: ens3
id: 240 id: 240
protocol: 802.1q protocol: 802.1q
- name: enp3s0.244 - name: ens5
type: vlan type: ethernet
state: up state: up
mtu: 9000 mtu: 9000
ipv4: ipv4:
enabled: false enabled: false
dhcp: false dhcp: false
vlan:
base-iface: enp3s0
id: 244
protocol: 802.1q
- name: br-mgmt - name: br-mgmt
type: ovs-bridge type: linux-bridge
state: up state: up
bridge: bridge:
port: port:
- name: enp3s0.236 - name: ens3.236
- name: br-mgmt
- name: br-mgmt
type: ovs-interface
state: up
ipv4: ipv4:
enabled: true enabled: true
dhcp: false dhcp: false
@@ -98,16 +89,13 @@ network_state:
enabled: true enabled: true
dhcp: false dhcp: false
autoconf: false autoconf: false
- name: br-vxlan - name: br-tunnel
type: ovs-bridge type: linux-bridge
mtu: 9000
state: up state: up
bridge: bridge:
port: port:
- name: enp3s0.240 - name: ens3.240
- name: br-vxlan
- name: br-vxlan
type: ovs-interface
state: up
ipv4: ipv4:
enabled: true enabled: true
dhcp: false dhcp: false
@@ -118,22 +106,13 @@ network_state:
enabled: true enabled: true
dhcp: false dhcp: false
autoconf: false autoconf: false
# - name: br-vlan
# type: ovs-bridge
# state: up
# bridge:
# port:
# - name: enp3s0
- name: br-storage - name: br-storage
type: ovs-bridge type: linux-bridge
state: up state: up
mtu: 9000
bridge: bridge:
port: port:
- name: enp3s0.244 - name: ens5
- name: br-storage
- name: br-storage
type: ovs-interface
state: up
ipv4: ipv4:
enabled: true enabled: true
dhcp: false dhcp: false