Skip to content

Commit fbe04a0

Browse files
authored
Merge pull request stackhpc#20 from stackhpc/convert-ans-coll
Convert to use ansible-collection-openstack
2 parents 8429a57 + 51c5608 commit fbe04a0

10 files changed

+10
-22
lines changed

README.rst

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,12 @@ packages. For example:
1717
1818
$ virtualenv venv
1919
$ source venv/bin/activate
20-
$ pip install -U pip
20+
$ python -m pip install --upgrade pip
2121
$ pip install -r requirements.txt
2222
2323
Install Ansible role and collection dependencies from Ansible Galaxy:
2424

2525
.. code-block::
26-
27-
$ ansible-galaxy role install \
28-
-p ansible/roles \
29-
-r requirements.yml
30-
3126
$ ansible-galaxy collection install \
3227
-p ansible/collections \
3328
-r requirements.yml

ansible/openstack-container-clusters.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
tags:
55
- container-clusters-templates
66
roles:
7-
- role: stackhpc.os-container-clusters
7+
- role: stackhpc.openstack.os_container_clusters
88
os_container_clusters_venv: "{{ openstack_venv }}"
99
os_container_clusters_auth_type: "{{ openstack_auth_type }}"
1010
os_container_clusters_auth: "{{ openstack_auth }}"

ansible/openstack-flavors.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
tags:
55
- flavors
66
roles:
7-
- role: stackhpc.os-flavors
7+
- role: stackhpc.openstack.os_flavors
88
os_flavors_venv: "{{ openstack_venv }}"
99
os_flavors_auth_type: "{{ openstack_auth_type }}"
1010
os_flavors_auth: "{{ openstack_auth }}"

ansible/openstack-host-aggregates.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
tags:
55
- host_aggregates
66
roles:
7-
- role: stackhpc.os_host_aggregates
7+
- role: stackhpc.openstack.os_host_aggregates
88
os_host_aggregates_venv: "{{ openstack_venv }}"
99
os_host_aggregates_auth_type: "{{ openstack_auth_type }}"
1010
os_host_aggregates_auth: "{{ openstack_auth }}"

ansible/openstack-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
tags:
55
- images
66
roles:
7-
- role: stackhpc.os-images
7+
- role: stackhpc.openstack.os_images
88
os_images_venv: "{{ openstack_venv }}"
99
os_images_cache: "{{ ansible_env.PWD }}/openstack-config-image-cache"
1010
os_images_auth_type: "{{ openstack_auth_type }}"

ansible/openstack-networks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
tags:
55
- networks
66
roles:
7-
- role: stackhpc.os-networks
7+
- role: stackhpc.openstack.os_networks
88
os_networks_venv: "{{ openstack_venv }}"
99
os_networks_auth_type: "{{ openstack_auth_type }}"
1010
os_networks_auth: "{{ openstack_auth }}"

ansible/openstack-project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
tags:
55
- project
66
roles:
7-
- role: stackhpc.os-projects
7+
- role: stackhpc.openstack.os_projects
88
os_projects_venv: "{{ openstack_venv }}"
99
os_projects_auth_type: "{{ openstack_auth_type }}"
1010
os_projects_admin_auth: "{{ openstack_auth }}"

ansible/roles/.keep

Whitespace-only changes.

examples/projects.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ openstack_unlimited_quotas:
5757
backup_gigabytes: -1
5858
backups: -1
5959
cores: -1
60-
fixed_ips: -1
6160
floatingip: -1
6261
gigabytes: -1
6362
injected_file_size: -1

requirements.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
---
2-
roles:
3-
- name: stackhpc.os-flavors
4-
- name: stackhpc.os-images
5-
- name: stackhpc.os-networks
6-
- name: stackhpc.os-projects
7-
- name: stackhpc.os_host_aggregates
8-
- name: stackhpc.os-container-clusters
9-
102
collections:
113
- name: openstack.cloud
12-
version: '<2'
4+
version: 2.1.0
5+
- name: stackhpc.openstack
6+
version: 0.1.0

0 commit comments

Comments
 (0)