Genericize rolenames

test-install-glance.yml

@@ -60,6 +60,6 @@
       delegate_to: "{{ groups['galera_all'][0] }}"
       when: inventory_hostname == groups['glance_all'][0]
   roles:
-    - role: "openstack-ansible-os_glance"
+    - role: "{{ glance_rolename | default('os_glance') }}"
   vars_files:
     - test-vars.yml

test-install-keystone.yml

@@ -55,7 +55,7 @@
       tags:
         - mysql-db-setup
   roles:
-    - role: "openstack-ansible-os_keystone"
+    - role: "{{ keystone_rolename | default('os_keystone') }}"
   vars_files:
     - test-vars.yml
 

test-install-swift.yml

@@ -27,6 +27,6 @@
         - inventory_hostname in groups['swift_all']
         - hostvars[inventory_hostname]['container_networks']['replication_address']['address'] is defined
   roles:
-    - role: "openstack-ansible-os_swift"
+    - role: "{{ swift_rolename | default('os_swift') }}"
   vars_files:
     - test-vars.yml