Skip to content

update test from yoga to zed in devstack #1398

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
jichenjc wants to merge 1 commit into from
Closed

update test from yoga to zed in devstack #1398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ This provider's versions are able to install and manage the following versions o

This provider's versions are able to install Kubernetes to the following versions of OpenStack:

| | Pike | Queens | Rocky | Stein | Train | Ussuri | Victoria | Wallaby | Xena | Yoga |
|------------------------------------| ---- | ------ | ----- | ----- | ----- | ------ | -------- | ------- | ---- | ---- |
| OpenStack Provider v1alpha3 (v0.3) | + | + | + | ✓ | ✓ | ✓ | ✓ | | | |
| OpenStack Provider v1alpha4 (v0.4) | + | + | + | + | + | + | ✓ | | | |
| OpenStack Provider v1alpha4 (v0.5) | + | + | + | + | + | + | ✓ | | | |
| OpenStack Provider v1alpha5 (v0.6) | + | + | + | + | + | + | ✓ | ✓ | ✓ | ✓ |
| OpenStack Provider v1alpha6 | + | + | + | + | + | + | ✓ | ✓ | ✓ | ✓ |
| | Pike | Queens | Rocky | Stein | Train | Ussuri | Victoria | Wallaby | Xena | Yoga | Zed |
|------------------------------------| ---- | ------ | ----- | ----- | ----- | ------ | -------- | ------- | ---- | ---- | --- |
| OpenStack Provider v1alpha3 (v0.3) | + | + | + | ✓ | ✓ | ✓ | ✓ | | | | |
| OpenStack Provider v1alpha4 (v0.4) | + | + | + | + | + | + | ✓ | | | | |
| OpenStack Provider v1alpha4 (v0.5) | + | + | + | + | + | + | ✓ | | | | |
| OpenStack Provider v1alpha5 (v0.6) | + | + | + | + | + | + | ✓ | ✓ | ✓ | ✓ | |
| OpenStack Provider v1alpha6 | + | + | + | + | + | + | ✓ | ✓ | ✓ | ✓ | ✓ |

Test status:

Expand Down
5 changes: 2 additions & 3 deletions hack/ci/cloud-init/controller.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
VERBOSE=True
LOG_COLOR=True

# Neutron
enable_plugin neutron https://github.com/openstack/neutron stable/${OPENSTACK_RELEASE}

# Octavia
Expand All @@ -36,8 +35,8 @@

# Neutron
ENABLED_SERVICES+=,neutron-api,neutron-agent,neutron-dhcp,neutron-l3,neutron-trunk

ENABLED_SERVICES+=,neutron-metadata-agent,neutron-qos

# Octavia
ENABLED_SERVICES+=,octavia,o-api,o-cw,o-hm,o-hk,o-da

Expand Down Expand Up @@ -82,7 +81,7 @@

[[post-config|$NEUTRON_CONF]]
[DEFAULT]
service_plugins = trunk,router
service_plugins = trunk, router
- path: /tmp/register-worker.sh
permissions: 0755
content: |
Expand Down
14 changes: 8 additions & 6 deletions hack/ci/create_devstack.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ source "${scriptdir}/${RESOURCE_TYPE}.sh"

CLUSTER_NAME=${CLUSTER_NAME:-"capo-e2e"}

OPENSTACK_RELEASE=${OPENSTACK_RELEASE:-"yoga"}
OPENSTACK_RELEASE=${OPENSTACK_RELEASE:-"zed"}
OPENSTACK_ENABLE_HORIZON=${OPENSTACK_ENABLE_HORIZON:-"false"}

# Devstack will create a provider network using this range
Expand Down Expand Up @@ -84,7 +84,7 @@ function ensure_openstack_client {
# Until then, this script tries to carefully navigate around current
# issues running openstack client on python 3.7.
#
# We explicitly pin the yoga version of openstackclient. This is the
# We explicitly pin the zed version of openstackclient. This is the
# last version of openstackclient which will support python 3.7.

# Install virtualenv to install the openstack client and curl to fetch
Expand All @@ -94,12 +94,12 @@ function ensure_openstack_client {
VIRTUAL_ENV_DISABLE_PROMPT=1 source /tmp/openstack-venv/bin/activate

# openstackclient has never actually supported python 3.7, only 3.6 and
# 3.8. Here we download the yoga constraints file and modify all the
# 3.8. Here we download the zed constraints file and modify all the
# 3.8 constraints to be 3.7 constraints.
curl -L https://releases.openstack.org/constraints/upper/yoga -o /tmp/yoga-constraints
sed -i "s/python_version=='3.8'/python_version=='3.7'/" /tmp/yoga-constraints
# curl -L https://releases.openstack.org/constraints/upper/zed -o /tmp/zed-constraints
# sed -i "s/python_version=='3.8'/python_version=='3.7'/" /tmp/zed-constraints

pip install -c /tmp/yoga-constraints \
pip install \
python-openstackclient python-cinderclient \
python-glanceclient python-keystoneclient \
python-neutronclient python-novaclient python-octaviaclient
Expand Down Expand Up @@ -169,6 +169,8 @@ function wait_for_devstack {
# Continuously capture devstack logs until killed
$ssh_cmd "$ip" -- sudo journalctl --no-tail -a -b -u 'devstack@*' -f > "${devstackdir}/${name}-devstack.log" &

$ssh_cmd "$ip" -- sudo journalctl --no-tail -a -b -u 'devstack@neutron-api.service' -f > "${devstackdir}/${name}-neutron.log" &

# Capture cloud-init logs
# Devstack logs are in cloud-final
for service in cloud-config cloud-final cloud-init-local cloud-init; do
Expand Down