Skip to content
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

Match os-projects upper constraints naming scheme #29

Merged
merged 1 commit into from
Mar 1, 2024
Merged

Match os-projects upper constraints naming scheme #29

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
4 changes: 2 additions & 2 deletions roles/os_projects/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Each item should be a dict containing the following items:
- `public_key_file`: Path to the SSH public key on the control host.
- `quotas`: Optional dict mapping quota names to their values.

`os_projects_upper_constraints` is a path to an upper constraints file which
`os_projects_upper_constraints_file` is a path to an upper constraints file which
is passed through to the role dependencies.

Dependencies
Expand All @@ -77,7 +77,7 @@ resources.
roles:
- role: stackhpc.openstack.os_projects
os_projects_venv: "~/os-projects-venv"
os_projects_upper_constraints: "https://releases.openstack.org/constraints/upper/2023.1"
os_projects_upper_constraints_file: "https://releases.openstack.org/constraints/upper/2023.1"
os_projects_auth_type: "password"
os_projects_auth:
project_name: <keystone project>
Expand Down
2 changes: 1 addition & 1 deletion roles/os_projects/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ os_projects_domains: []
# - 'public_key_file': Path to the SSH public key on the control host.
# 'quotas': Optional dict mapping quota names to their values.
os_projects: [] # noqa var-naming[no-role-prefix]
os_projects_upper_constraints: https://releases.openstack.org/constraints/upper/2023.1
os_projects_upper_constraints_file: https://releases.openstack.org/constraints/upper/2023.1
5 changes: 3 additions & 2 deletions roles/os_projects/meta/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
dependencies:
- role: stackhpc.openstack.os_openstacksdk
os_openstacksdk_venv: "{{ os_projects_venv }}"
os_openstacksdk_upper_constraints_file: "{{ os_projects_upper_constraints | default(None) }}"
# Keep support for old naming scheme ``os_projects_upper_constraints``.
os_openstacksdk_upper_constraints_file: "{{ os_projects_upper_constraints_file | default(os_projects_upper_constraints) | default(None) }}"

- role: stackhpc.openstack.os_openstackclient
os_openstackclient_venv: "{{ os_projects_venv }}"
os_openstackclient_upper_constraints_file: "{{ os_projects_upper_constraints | default(None) }}"
os_openstackclient_upper_constraints_file: "{{ os_projects_upper_constraints_file | default(os_projects_upper_constraints) | default(None) }}"