Skip to content

Commit 9ec1b9d

Browse files
committed
lint: Fix os_host_aggregates issues
1 parent 9381d80 commit 9ec1b9d

File tree

5 files changed

+9
-29
lines changed

5 files changed

+9
-29
lines changed
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
---
22
# Path to a directory in which to create a virtualenv.
33
os_host_aggregates_venv:
4-
54
# Authentication type.
65
os_host_aggregates_auth_type:
7-
86
# Authentication information.
97
os_host_aggregates_auth: {}
10-
118
# Endpoint URL type to fetch from the service catalog. Maybe be one of:
129
# public, admin, or internal.
1310
os_host_aggregates_interface:
14-
1511
# List of nova host aggregates to register. Each item should be a dict containing the
1612
# following items:
1713
# - 'name': Name of the host aggregate.
1814
# - 'availability_zone': Name of the availability zone, optional.
1915
# - 'hosts': List of hosts to add to the aggregate, optional.
2016
# - 'metadata': Dict of key/value pairs to set on the aggregate, optional.
21-
os_host_aggregates: []
17+
os_host_aggregates: [] # noqa var-naming[no-role-prefix]
Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,4 @@
11
---
2-
galaxy_info:
3-
role_name: os_host_aggregates
4-
author: Pierre Riteau
5-
description: >
6-
Role to register nova host aggregates in OpenStack
7-
company: StackHPC Ltd
8-
license: Apache2
9-
min_ansible_version: 2.6
10-
platforms:
11-
- name: EL
12-
versions:
13-
- 7
14-
- 8
15-
galaxy_tags:
16-
- cloud
17-
- nova
18-
- openstack
19-
202
dependencies:
21-
- role: stackhpc.os_openstacksdk
3+
- role: stackhpc.openstack.os_openstacksdk
224
os_openstacksdk_venv: "{{ os_host_aggregates_venv }}"

roles/os_host_aggregates/tasks/host-aggregates.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
- name: Ensure nova host aggregates exist
3-
os_nova_host_aggregate:
3+
openstack.cloud.host_aggregate:
44
auth_type: "{{ os_host_aggregates_auth_type }}"
55
auth: "{{ os_host_aggregates_auth }}"
66
cacert: "{{ os_host_aggregates_cacert | default(omit) }}"
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
---
22
- name: Set a fact about the Ansible python interpreter
3-
set_fact:
3+
ansible.builtin.set_fact:
44
old_ansible_python_interpreter: "{{ ansible_python_interpreter | default('/usr/bin/python' + ansible_python.version.major | string) }}"
55

6-
- import_tasks: host-aggregates.yml
6+
- name: Import host-aggregates.yml
7+
ansible.builtin.import_tasks: host-aggregates.yml
78
vars:
89
ansible_python_interpreter: "{{ os_host_aggregates_venv ~ '/bin/python' if os_host_aggregates_venv != None else old_ansible_python_interpreter }}"
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
2-
- hosts: all
2+
- name: Test os_host_aggregates role
3+
hosts: all
34
connection: local
45
roles:
5-
- stackhpc.os_host_aggregates
6+
- stackhpc.openstack.os_host_aggregates

0 commit comments

Comments
 (0)