Rename all of the modules

This is separate from the previous patch - it's just the results
of running the script so we can review the two a little independently.
We should probably squash them.

Change-Id: I838f15cf4a32455a5be20033c8ddc27db6ca15c0

ci/roles/router/tasks/main.yml

@@ -1,14 +1,14 @@
 ---
 # Regular user operation
 - name: Create internal network
-  openstack.cloud.os_network:
+  openstack.cloud.network:
      cloud: "{{ cloud }}"
      state: present
      name: "{{ network_name }}"
      external: false
 
 - name: Create subnet1
-  openstack.cloud.os_subnet:
+  openstack.cloud.subnet:
      cloud: "{{ cloud }}"
      state: present
      network_name: "{{ network_name }}"
@@ -16,13 +16,13 @@
      cidr: 10.7.7.0/24
 
 - name: Create router
-  openstack.cloud.os_router:
+  openstack.cloud.router:
      cloud: "{{ cloud }}"
      state: present
      name: "{{ router_name }}"
 
 - name: Update router (add interface)
-  openstack.cloud.os_router:
+  openstack.cloud.router:
      cloud: "{{ cloud }}"
      state: present
      name: "{{ router_name }}"
@@ -30,7 +30,7 @@
          - shade_subnet1
 
 - name: Gather routers info
-  openstack.cloud.os_routers_info:
+  openstack.cloud.routers_info:
      cloud: "{{ cloud }}"
      name: "{{ router_name }}"
      filters:
@@ -45,7 +45,7 @@
 
 # Admin operation
 - name: Create external network
-  openstack.cloud.os_network:
+  openstack.cloud.network:
      cloud: "{{ cloud }}"
      state: present
      name: "{{ external_network_name }}"
@@ -54,7 +54,7 @@
     - network_external
 
 - name: Create subnet2
-  openstack.cloud.os_subnet:
+  openstack.cloud.subnet:
      cloud: "{{ cloud }}"
      state: present
      network_name: "{{ external_network_name }}"
@@ -64,7 +64,7 @@
     - network_external
 
 - name: Update router (add external gateway)
-  openstack.cloud.os_router:
+  openstack.cloud.router:
      cloud: "{{ cloud }}"
      state: present
      name: "{{ router_name }}"
@@ -75,7 +75,7 @@
     - network_external
 
 - name: Gather routers info
-  openstack.cloud.os_routers_info:
+  openstack.cloud.routers_info:
      cloud: "{{ cloud }}"
      name: "{{ router_name }}"
      filters:
@@ -89,19 +89,19 @@
       - (result.openstack_routers.0.interfaces_info|length) == 1
 
 - name: Delete router
-  openstack.cloud.os_router:
+  openstack.cloud.router:
      cloud: "{{ cloud }}"
      state: absent
      name: "{{ router_name }}"
 
 - name: Delete subnet1
-  openstack.cloud.os_subnet:
+  openstack.cloud.subnet:
      cloud: "{{ cloud }}"
      state: absent
      name: shade_subnet1
 
 - name: Delete subnet2
-  openstack.cloud.os_subnet:
+  openstack.cloud.subnet:
      cloud: "{{ cloud }}"
      state: absent
      name: shade_subnet2
@@ -109,13 +109,13 @@
     - network_external
 
 - name: Delete internal network
-  openstack.cloud.os_network:
+  openstack.cloud.network:
      cloud: "{{ cloud }}"
      state: absent
      name: "{{ network_name }}"
 
 - name: Delete external network
-  openstack.cloud.os_network:
+  openstack.cloud.network:
      cloud: "{{ cloud }}"
      state: absent
      name: "{{ external_network_name }}"