Skip to content

Commit 8b7a14a

Browse files
committed
Match os-projects upper constraints naming scheme
All roles except os-projects use the naming scheme ``os_*_upper_constraints_file`` for setting upper constraints. Add the suffix ``_file`` to os-projects too so all roles are consistent. Backwards compatibility is maintained.
1 parent 7bb56c4 commit 8b7a14a

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

roles/os_projects/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Each item should be a dict containing the following items:
5656
- `public_key_file`: Path to the SSH public key on the control host.
5757
- `quotas`: Optional dict mapping quota names to their values.
5858

59-
`os_projects_upper_constraints` is a path to an upper constraints file which
59+
`os_projects_upper_constraints_file` is a path to an upper constraints file which
6060
is passed through to the role dependencies.
6161

6262
Dependencies
@@ -77,7 +77,7 @@ resources.
7777
roles:
7878
- role: stackhpc.openstack.os_projects
7979
os_projects_venv: "~/os-projects-venv"
80-
os_projects_upper_constraints: "https://releases.openstack.org/constraints/upper/2023.1"
80+
os_projects_upper_constraints_file: "https://releases.openstack.org/constraints/upper/2023.1"
8181
os_projects_auth_type: "password"
8282
os_projects_auth:
8383
project_name: <keystone project>

roles/os_projects/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ os_projects_domains: []
3838
# - 'public_key_file': Path to the SSH public key on the control host.
3939
# 'quotas': Optional dict mapping quota names to their values.
4040
os_projects: [] # noqa var-naming[no-role-prefix]
41-
os_projects_upper_constraints: https://releases.openstack.org/constraints/upper/2023.1
41+
os_projects_upper_constraints_file: https://releases.openstack.org/constraints/upper/2023.1

roles/os_projects/meta/main.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
dependencies:
33
- role: stackhpc.openstack.os_openstacksdk
44
os_openstacksdk_venv: "{{ os_projects_venv }}"
5-
os_openstacksdk_upper_constraints_file: "{{ os_projects_upper_constraints | default(None) }}"
5+
# Keep support for old naming scheme ``os_projects_upper_constraints``.
6+
os_openstacksdk_upper_constraints_file: "{{ os_projects_upper_constraints_file | default(os_projects_upper_constraints) | default(None) }}"
67

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

0 commit comments

Comments
 (0)