Skip to content

Commit

Permalink
bump devstack branch to stable/2023.2, fix python issues (#2740)
Browse files Browse the repository at this point in the history
Co-authored-by: pýrus <[email protected]>
  • Loading branch information
k8s-infra-cherrypick-robot and kayrus authored Dec 11, 2024
1 parent 45da9db commit 171f650
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 16 deletions.
2 changes: 1 addition & 1 deletion tests/playbooks/roles/install-devstack/defaults/main.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
user: "stack"
workdir: "/home/{{ user }}/devstack"
branch: "stable/2023.1"
branch: "stable/2023.2"
enable_services:
- nova
- glance
Expand Down
15 changes: 0 additions & 15 deletions tests/playbooks/roles/install-devstack/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,21 +97,6 @@
src: local.conf.j2
dest: "{{ workdir }}/local.conf"

- name: Fix localhost
shell:
executable: /bin/bash
cmd: |
# https://bugs.launchpad.net/devstack/+bug/1891694
rm -rf /usr/lib/python3/dist-packages/PyYAML-*.egg-info
# https://bugs.launchpad.net/devstack/+bug/1906322
sed -i 's|$cmd_pip $upgrade |$cmd_pip $upgrade --ignore-installed |g' {{ workdir }}/inc/python
python3 -m pip install --upgrade pip==23.0
python3 -m pip install --upgrade keystoneauth1==5.1.1
python3 -m pip install --upgrade setuptools
python3 -m pip install --upgrade python-debian
python3 -m pip install --upgrade distro-info
python3 -m pip install --upgrade SecretStorage
- name: Change devstack directory owner
file:
path: "{{ item }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,15 @@ MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS='snapshot_support=True create_share_from_s
MANILA_CONFIGURE_DEFAULT_TYPES=True
{% endif %}

# Add a pre-install script to upgrade pip and setuptools
[[local|pre-install]]
# Activate the virtual environment and upgrade pip and setuptools
if [ -f /opt/stack/data/venv/bin/activate ]; then
source /opt/stack/data/venv/bin/activate
pip install --upgrade pip setuptools
deactivate
fi

{% if "glance" in enable_services %}
[[post-config|$GLANCE_API_CONF]]
[glance_store]
Expand Down

0 comments on commit 171f650

Please sign in to comment.