Skip to content

Commit

Permalink
Bump openstacksdk to >1
Browse files Browse the repository at this point in the history
This patch also vendors the openstack.cloud.subnet
module due to a problem with `disable_gateway_ip`
not being set for newly created subnets[1].

[1]: https://review.opendev.org/c/openstack/ansible-collections-openstack/+/940927

Change-Id: Ia021a1d7b82823c2e7498fdd66da3e2d5c6a8a79
  • Loading branch information
mnaser committed Feb 7, 2025
1 parent 26eb9e0 commit 8ccabb6
Show file tree
Hide file tree
Showing 23 changed files with 546 additions and 46 deletions.
1 change: 1 addition & 0 deletions .ansible-lint
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ exclude_paths:
- molecule
- playbooks
- plugins/filter
- plugins/modules/subnet.py
- roles/defaults/vars/main.yml
- roles/kube_prometheus_stack/files/jsonnet
- roles/storpool_csi/files
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
exclude: "^(roles/kube_prometheus_stack/files/jsonnet|charts)"
exclude: "^(roles/kube_prometheus_stack/files/jsonnet|charts|plugins/modules/subnet.py)"

repos:
- repo: local
Expand Down
2 changes: 1 addition & 1 deletion galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies:
community.general: 7.3.0
community.mysql: 3.6.0
kubernetes.core: 2.4.0
openstack.cloud: 1.7.0
openstack.cloud: ">=2.0.0"
vexxhost.ceph: 3.0.1
vexxhost.kubernetes: ">=2.0.1"
tags:
Expand Down
2 changes: 1 addition & 1 deletion molecule/default/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
molecule==3.5.2 # https://github.com/ansible-community/molecule/issues/3435
openstacksdk==0.61.0
openstacksdk
netaddr
8 changes: 4 additions & 4 deletions molecule/keycloak/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@
# we try a few more times.
retries: 30
delay: 1
until: identity_user_info_result.openstack_users | length > 0
until: identity_user_info_result.users | length > 0

- name: Assert that the user exists
run_once: true
ansible.builtin.assert:
that:
- identity_user_info_result.openstack_users | length > 0
- identity_user_info_result.openstack_users[0].id == keycloak_user_info.id | regex_replace('-', '')
- identity_user_info_result.openstack_users[0].name == keycloak_user_info.username
- identity_user_info_result.users | length > 0
- identity_user_info_result.users[0].id == keycloak_user_info.id | regex_replace('-', '')
- identity_user_info_result.users[0].name == keycloak_user_info.username

# TODO: Simulate Keystone authentication
# TODO: Simulate Horizon login
Loading

0 comments on commit 8ccabb6

Please sign in to comment.