Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions .automation.conf/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# See: https://github.com/stackhpc/docker-rally/blob/master/bin/rally-verify-wrapper.sh for a full list of tempest parameters that can be overriden.
# You can override tempest parameters like so:
export TEMPEST_CONCURRENCY=8
export TEMPEST_CONCURRENCY=2
# Specify single test whilst experimenting
#export TEMPEST_PATTERN="${TEMPEST_PATTERN:-tempest.api.compute.servers.test_create_server.ServersTestJSON.test_host_name_is_same_as_server_name}"

Expand All @@ -19,6 +19,10 @@ if [ ! -z ${KAYOBE_ENVIRONMENT:+x} ]; then
# Seem to get servers failing to spawn with higher concurrency
export TEMPEST_CONCURRENCY=1
fi
if [[ "$KAYOBE_ENVIRONMENT" =~ "ci-multinode" ]]; then
export KAYOBE_AUTOMATION_TEMPEST_LOADLIST=tempest-full
export KAYOBE_AUTOMATION_TEMPEST_SKIPLIST=ci-multinode
fi
fi

if [[ -z "${KAYOBE_AUTOMATION_TEMPEST_CONF_OVERRIDES:+x}" ]] || [[ ! -e "${KAYOBE_AUTOMATION_TEMPEST_CONF_OVERRIDES}" ]]; then
Expand All @@ -28,6 +32,3 @@ fi
if [[ -f ${KAYOBE_AUTOMATION_REPO_ROOT}/etc/kolla/public-openrc.sh ]]; then
export TEMPEST_OPENRC="$(< ${KAYOBE_AUTOMATION_REPO_ROOT}/etc/kolla/public-openrc.sh)"
fi

export KAYOBE_AUTOMATION_TEMPEST_LOADLIST=tempest-full
export KAYOBE_AUTOMATION_TEMPEST_SKIPLIST=tempest-full
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ min_microversion = 3.0
max_microversion = 3.64

[dashboard]
dashboard_url = https://192.168.39.2
dashboard_url = http://192.168.39.2
2 changes: 1 addition & 1 deletion etc/kayobe/ansible/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ collections:
- name: pulp.squeezer
version: 0.0.11
- name: stackhpc.cephadm
version: 1.8.0
version: 1.10.0
roles:
- src: stackhpc.vxlan
1 change: 1 addition & 0 deletions etc/kayobe/environments/ci-multinode/compute.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
compute_bootstrap_user: "{{ os_distribution if os_distribution == 'ubuntu' else 'cloud-user' }}"
# List of storage volume groups. See mrlesmithjr.manage-lvm role for
# format.
compute_lvm_groups:
Expand Down
1 change: 1 addition & 0 deletions etc/kayobe/environments/ci-multinode/controllers.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
controller_bootstrap_user: "{{ os_distribution if os_distribution == 'ubuntu' else 'cloud-user' }}"
# List of storage volume groups. See mrlesmithjr.manage-lvm role for
# format.
controller_lvm_groups:
Expand Down
2 changes: 2 additions & 0 deletions etc/kayobe/environments/ci-multinode/growroot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
growroot_group: "seed:overcloud"
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ vxlan_phys_dev: "{{ admin_oc_interface }}"
vxlan_dstport: 4790

# Virtual network identifier used by the VLXAN. This must be unique between multinode environments.
vxlan_vni: 10
vxlan_vni:

# This is a dictionary of interfaces to be created by the stackhpc.vxlan role.
vxlan_interfaces:
Expand Down
2 changes: 2 additions & 0 deletions etc/kayobe/environments/ci-multinode/kolla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
kolla_enable_cinder: true
kolla_enable_cinder_backup: true
kolla_enable_neutron_provider_networks: true
kolla_enable_ovn: true
Copy link
Contributor

Choose a reason for hiding this comment

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

Unsure whether we should change this default. Ideally it should be possible & easy to use either OVS or OVN.

kolla_enable_octavia: true
Copy link
Contributor

Choose a reason for hiding this comment

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

Perhaps only enable octavia when OVN is enabled, since we don't have the config for the amphora provider in place currently.

5 changes: 5 additions & 0 deletions etc/kayobe/environments/ci-multinode/kolla/globals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,8 @@ nova_backend_ceph: "yes"
# list, and add the config that would be generated from it here.
neutron_bridge_name: "{{ vxlan_interfaces[0].device }}-ovs"
neutron_external_interface: "{{ vxlan_interfaces[0].device }}"

# Octavia load balancer configuration
octavia_auto_configure: "no"
octavia_provider_drivers: "ovn:OVN provider"
octavia_provider_agents: "ovn"
Comment on lines +18 to +21
Copy link
Contributor

Choose a reason for hiding this comment

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

We probably only want this when kolla_enable_ovn is true.

2 changes: 1 addition & 1 deletion etc/kayobe/environments/ci-multinode/networks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ internal_vlan: 101

# External network
external_cidr: 192.168.38.0/24
external_mtu: 1400
external_mtu: 1350
Copy link
Contributor

Choose a reason for hiding this comment

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

I think @sd109 hit this with his aufn work, and possibly @darmach with his magnum work. It's because we're using VXLAN networks with OVN, but internally it sometimes uses GENEVE tunnels which have a larger header size.

One option is to switch to geneve tenant networks when using OVN, which generally work better.

external_allocation_pool_start: 192.168.38.3
external_allocation_pool_end: 192.168.38.128
external_vlan: 102
Expand Down
1 change: 1 addition & 0 deletions etc/kayobe/environments/ci-multinode/seed.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
seed_bootstrap_user: "{{ os_distribution if os_distribution == 'ubuntu' else 'cloud-user' }}"
seed_lvm_groups:
- "{{ stackhpc_lvm_group_rootvg }}"

Expand Down
1 change: 1 addition & 0 deletions etc/kayobe/environments/ci-multinode/storage.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
storage_bootstrap_user: "{{ os_distribution if os_distribution == 'ubuntu' else 'cloud-user' }}"
# List of storage volume groups. See mrlesmithjr.manage-lvm role for
# format.
storage_lvm_groups:
Expand Down