Flatten Ansible role structure

Given current constraints of CI Lab application of Ansible playbooks has
to be divided into several stages (changing Ansible controller between
them). This is why role structure can be flattened for increased
readability.

Issue-ID: INT-1601
Change-Id: I71f95649617e160f7887f03c6a96161fb8873c66
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>

diff --git a/deployment/noheat/infra-openstack/ansible/create.yml b/deployment/noheat/infra-openstack/ansible/create.yml
index 5b95421..69ecd1d 100644 (file)
--- a/deployment/noheat/infra-openstack/ansible/create.yml
+++ b/deployment/noheat/infra-openstack/ansible/create.yml
@@ -4,10 +4,10 @@
   connection: local
   gather_facts: False
   roles:
-    - openstack/create_devstack_network
-    - openstack/create_devstack_securitygroup
-    - openstack/create_devstack_keypair
-    - role: openstack/create_devstack_hosts
+    - create_network
+    - create_securitygroup
+    - create_keypair
+    - role: create_hosts
       hosts: "{{ operation.hosts }}"
       operator_key: "dummy"
 - name: Create cluster operator access keypair
@@ -25,7 +25,7 @@
   connection: local
   gather_facts: False
   roles:
-    - role: openstack/create_devstack_hosts
+    - role: create_hosts
       hosts: "{{ cluster.hosts }}"
       operator_key: "{{ hostvars['operator0']['key']['public_key'] }}"
 - name: Create cluster operator access information

diff --git a/deployment/noheat/infra-openstack/ansible/destroy.yml b/deployment/noheat/infra-openstack/ansible/destroy.yml
index ca1455f..ff9d5fc 100644 (file)
--- a/deployment/noheat/infra-openstack/ansible/destroy.yml
+++ b/deployment/noheat/infra-openstack/ansible/destroy.yml
@@ -4,10 +4,10 @@
   connection: local
   gather_facts: False
   roles:
-    - role: openstack/destroy_devstack_hosts
+    - role: destroy_hosts
       hosts: "{{ cluster.hosts }}"
-    - role: openstack/destroy_devstack_hosts
+    - role: destroy_hosts
       hosts: "{{ operation.hosts }}"
-    - openstack/destroy_devstack_keypair
-    - openstack/destroy_devstack_network
-    - openstack/destroy_devstack_securitygroup
+    - destroy_keypair
+    - destroy_network
+    - destroy_securitygroup

diff --git a/deployment/noheat/infra-openstack/ansible/roles/openstack/create_devstack_hosts/tasks/create_host.yml b/deployment/noheat/infra-openstack/ansible/roles/create_hosts/tasks/create_host.yml
similarity index 100%
rename from deployment/noheat/infra-openstack/ansible/roles/openstack/create_devstack_hosts/tasks/create_host.yml
rename to deployment/noheat/infra-openstack/ansible/roles/create_hosts/tasks/create_host.yml

diff --git a/deployment/noheat/infra-openstack/ansible/roles/openstack/create_devstack_hosts/tasks/main.yml b/deployment/noheat/infra-openstack/ansible/roles/create_hosts/tasks/main.yml
similarity index 100%
rename from deployment/noheat/infra-openstack/ansible/roles/openstack/create_devstack_hosts/tasks/main.yml
rename to deployment/noheat/infra-openstack/ansible/roles/create_hosts/tasks/main.yml

diff --git a/deployment/noheat/infra-openstack/ansible/roles/openstack/create_devstack_keypair/tasks/main.yml b/deployment/noheat/infra-openstack/ansible/roles/create_keypair/tasks/main.yml
similarity index 100%
rename from deployment/noheat/infra-openstack/ansible/roles/openstack/create_devstack_keypair/tasks/main.yml
rename to deployment/noheat/infra-openstack/ansible/roles/create_keypair/tasks/main.yml

diff --git a/deployment/noheat/infra-openstack/ansible/roles/openstack/create_devstack_network/tasks/create_network.yml b/deployment/noheat/infra-openstack/ansible/roles/create_network/tasks/create_network.yml
similarity index 100%
rename from deployment/noheat/infra-openstack/ansible/roles/openstack/create_devstack_network/tasks/create_network.yml
rename to deployment/noheat/infra-openstack/ansible/roles/create_network/tasks/create_network.yml

diff --git a/deployment/noheat/infra-openstack/ansible/roles/openstack/create_devstack_network/tasks/main.yml b/deployment/noheat/infra-openstack/ansible/roles/create_network/tasks/main.yml
similarity index 100%
rename from deployment/noheat/infra-openstack/ansible/roles/openstack/create_devstack_network/tasks/main.yml
rename to deployment/noheat/infra-openstack/ansible/roles/create_network/tasks/main.yml

diff --git a/deployment/noheat/infra-openstack/ansible/roles/openstack/create_devstack_securitygroup/tasks/create_securitygroup.yml b/deployment/noheat/infra-openstack/ansible/roles/create_securitygroup/tasks/create_securitygroup.yml
similarity index 100%
rename from deployment/noheat/infra-openstack/ansible/roles/openstack/create_devstack_securitygroup/tasks/create_securitygroup.yml
rename to deployment/noheat/infra-openstack/ansible/roles/create_securitygroup/tasks/create_securitygroup.yml

diff --git a/deployment/noheat/infra-openstack/ansible/roles/openstack/create_devstack_securitygroup/tasks/main.yml b/deployment/noheat/infra-openstack/ansible/roles/create_securitygroup/tasks/main.yml
similarity index 100%
rename from deployment/noheat/infra-openstack/ansible/roles/openstack/create_devstack_securitygroup/tasks/main.yml
rename to deployment/noheat/infra-openstack/ansible/roles/create_securitygroup/tasks/main.yml

diff --git a/deployment/noheat/infra-openstack/ansible/roles/openstack/destroy_devstack_hosts/tasks/destroy_host.yml b/deployment/noheat/infra-openstack/ansible/roles/destroy_hosts/tasks/destroy_host.yml
similarity index 100%
rename from deployment/noheat/infra-openstack/ansible/roles/openstack/destroy_devstack_hosts/tasks/destroy_host.yml
rename to deployment/noheat/infra-openstack/ansible/roles/destroy_hosts/tasks/destroy_host.yml

diff --git a/deployment/noheat/infra-openstack/ansible/roles/openstack/destroy_devstack_hosts/tasks/main.yml b/deployment/noheat/infra-openstack/ansible/roles/destroy_hosts/tasks/main.yml
similarity index 100%
rename from deployment/noheat/infra-openstack/ansible/roles/openstack/destroy_devstack_hosts/tasks/main.yml
rename to deployment/noheat/infra-openstack/ansible/roles/destroy_hosts/tasks/main.yml

diff --git a/deployment/noheat/infra-openstack/ansible/roles/openstack/destroy_devstack_keypair/tasks/main.yml b/deployment/noheat/infra-openstack/ansible/roles/destroy_keypair/tasks/main.yml
similarity index 100%
rename from deployment/noheat/infra-openstack/ansible/roles/openstack/destroy_devstack_keypair/tasks/main.yml
rename to deployment/noheat/infra-openstack/ansible/roles/destroy_keypair/tasks/main.yml

diff --git a/deployment/noheat/infra-openstack/ansible/roles/openstack/destroy_devstack_network/tasks/destroy_network.yml b/deployment/noheat/infra-openstack/ansible/roles/destroy_network/tasks/destroy_network.yml
similarity index 100%
rename from deployment/noheat/infra-openstack/ansible/roles/openstack/destroy_devstack_network/tasks/destroy_network.yml
rename to deployment/noheat/infra-openstack/ansible/roles/destroy_network/tasks/destroy_network.yml

diff --git a/deployment/noheat/infra-openstack/ansible/roles/openstack/destroy_devstack_network/tasks/main.yml b/deployment/noheat/infra-openstack/ansible/roles/destroy_network/tasks/main.yml
similarity index 100%
rename from deployment/noheat/infra-openstack/ansible/roles/openstack/destroy_devstack_network/tasks/main.yml
rename to deployment/noheat/infra-openstack/ansible/roles/destroy_network/tasks/main.yml

diff --git a/deployment/noheat/infra-openstack/ansible/roles/openstack/destroy_devstack_securitygroup/tasks/destroy_securitygroup.yml b/deployment/noheat/infra-openstack/ansible/roles/destroy_securitygroup/tasks/destroy_securitygroup.yml
similarity index 100%
rename from deployment/noheat/infra-openstack/ansible/roles/openstack/destroy_devstack_securitygroup/tasks/destroy_securitygroup.yml
rename to deployment/noheat/infra-openstack/ansible/roles/destroy_securitygroup/tasks/destroy_securitygroup.yml

diff --git a/deployment/noheat/infra-openstack/ansible/roles/openstack/destroy_devstack_securitygroup/tasks/main.yml b/deployment/noheat/infra-openstack/ansible/roles/destroy_securitygroup/tasks/main.yml
similarity index 100%
rename from deployment/noheat/infra-openstack/ansible/roles/openstack/destroy_devstack_securitygroup/tasks/main.yml
rename to deployment/noheat/infra-openstack/ansible/roles/destroy_securitygroup/tasks/main.yml