changes for ansible-collection-openstack

Author: scrungus

README.rst

@@ -17,7 +17,7 @@ packages. For example:
 
    $ virtualenv venv
    $ source venv/bin/activate
-   $ pip install -U pip
+   $ python -m pip install --upgrade pip
    $ pip install -r requirements.txt
 
 Install Ansible role and collection dependencies from Ansible Galaxy:

ansible/openstack-container-clusters.yml

@@ -4,8 +4,8 @@
   tags:
     - container-clusters-templates
   roles:
-    - role: stackhpc.os-container-clusters
-      os_container_clusters_venv: "{{ openstack_venv }}"
+    - role: stackhpc.openstack.os_container_clusters
+      os_container_clusters_venv: "{{ openstack_sdk_1_0_venv }}"
       os_container_clusters_auth_type: "{{ openstack_auth_type }}"
       os_container_clusters_auth: "{{ openstack_auth }}"
       os_container_clusters_cacert: "{{ openstack_cacert }}"

ansible/openstack-flavors.yml

@@ -4,7 +4,7 @@
   tags:
     - flavors
   roles:
-    - role: stackhpc.os-flavors
+    - role: stackhpc.openstack.os_flavors
       os_flavors_venv: "{{ openstack_venv }}"
       os_flavors_auth_type: "{{ openstack_auth_type }}"
       os_flavors_auth: "{{ openstack_auth }}"

ansible/openstack-host-aggregates.yml

@@ -4,7 +4,7 @@
   tags:
     - host_aggregates
   roles:
-    - role: stackhpc.os_host_aggregates
+    - role: stackhpc.openstack.os_host_aggregates
       os_host_aggregates_venv: "{{ openstack_venv }}"
       os_host_aggregates_auth_type: "{{ openstack_auth_type }}"
       os_host_aggregates_auth: "{{ openstack_auth }}"

ansible/openstack-images.yml

@@ -4,8 +4,8 @@
   tags:
     - images
   roles:
-    - role: stackhpc.os-images
-      os_images_venv: "{{ openstack_venv }}"
+    - role: stackhpc.openstack.os_images
+      os_images_venv: "{{ openstack_sdk_1_0_venv }}"
       os_images_cache: "{{ ansible_env.PWD }}/openstack-config-image-cache"
       os_images_auth_type: "{{ openstack_auth_type }}"
       os_images_auth: "{{ openstack_auth }}"

ansible/openstack-networks.yml

@@ -4,7 +4,7 @@
   tags:
     - networks
   roles:
-    - role: stackhpc.os-networks
+    - role: stackhpc.openstack.os_networks
       os_networks_venv: "{{ openstack_venv }}"
       os_networks_auth_type: "{{ openstack_auth_type }}"
       os_networks_auth: "{{ openstack_auth }}"

ansible/openstack-project.yml

@@ -4,7 +4,7 @@
   tags:
     - project
   roles:
-    - role: stackhpc.os-projects
+    - role: stackhpc.openstack.os_projects
       os_projects_venv: "{{ openstack_venv }}"
       os_projects_auth_type: "{{ openstack_auth_type }}"
       os_projects_admin_auth: "{{ openstack_auth }}"

ansible/openstack.yml

@@ -1,8 +1,8 @@
 ---
 # Top level playbook that includes all others.
-- import_playbook: openstack-project.yml
+#- import_playbook: openstack-project.yml
 - import_playbook: openstack-networks.yml
-- import_playbook: openstack-flavors.yml
-- import_playbook: openstack-images.yml
-- import_playbook: openstack-host-aggregates.yml
-- import_playbook: openstack-container-clusters.yml
+#- import_playbook: openstack-flavors.yml
+#- import_playbook: openstack-images.yml
+#- import_playbook: openstack-host-aggregates.yml
+#- import_playbook: openstack-container-clusters.yml

ansible/roles/.keep

@@ -1,12 +1,8 @@
 ---
-roles:
-  - name: stackhpc.os-flavors
-  - name: stackhpc.os-images
-  - name: stackhpc.os-networks
-  - name: stackhpc.os-projects
-  - name: stackhpc.os_host_aggregates
-  - name: stackhpc.os-container-clusters
-
 collections:
   - name: openstack.cloud
-    version: '<2'
+    version: 2.1.0
+  - name: stackhpc.openstack
+    type: git
+    source: https://github.com/stackhpc/ansible-collection-openstack.git
+    version: 8a526f520b231ced3f5cf122a6c6fc241c03df73