Removed inclusion of docker everywhere

It is now included in the common role itself, which is applied to all.

cassandra.yml

@@ -3,5 +3,4 @@
 - hosts: cassandra
   become: True
   roles:
-      - common
       - cassandra

mariadb.yml

@@ -3,5 +3,4 @@
 - hosts: databases
   become: True
   roles:
-      - common
       - mariadb

roles/cassandra/tasks/main.yml

@@ -1,6 +1,5 @@
 # Install a docker based cassandra cluster.
 ---
-- include: ../common/tasks/docker.yml
 - name: install service file.
   template:
     src: templates/cassandra.service

roles/common/tasks/main.yml

@@ -26,6 +26,4 @@
     owner: root
     group: root
 
-    #- name: Load secrets file
-    #  include_vars:
-    #      file: secrets/password_list.yml
+- include: docker.yml

roles/dockerregistry/tasks/main.yml

@@ -1,6 +1,5 @@
 # Install a docker based mariadb.
 ---
-- include: ../common/tasks/docker.yml
 - name: install service file.
   template:
     src: files/dockerregistry.service

roles/glance/tasks/main.yml

@@ -1,7 +1,5 @@
 # Build and install a docker image for glance.
 ---
-- include: ../common/tasks/docker.yml
-
 - name: Make build and persistent directories
   file:
     path: "{{ item }}"

roles/horizon/tasks/main.yml

@@ -1,7 +1,5 @@
 # Build and install a docker image for horizon.
 ---
-- include: ../common/tasks/docker.yml
-
 - name: Make build and persistent directories
   file:
     path: "{{ item }}"

roles/keystone/tasks/main.yml

@@ -1,7 +1,5 @@
 # Build and install a docker image for keystone.
 ---
-- include: ../common/tasks/docker.yml
-
 - name: Make build and persistent directories
   file:
     path: "{{ item }}"

roles/keystone/templates/keystone.service

@@ -9,7 +9,7 @@ Restart=always
 ExecStartPre=-/usr/bin/docker stop %n
 ExecStartPre=-/usr/bin/docker rm %n
 ExecStart=/usr/bin/docker run --name %n \
-  --add-host=mariadb:{{ hostvars[groups['databases'][0]]['ansible_default_ipv4']['address'] }} \
+  --add-host=mariadb:172.23.41.2 \
   -p 5000:5000 -p 35357:35357 \
   -v /srv/keystone/fernet-keys:/etc/keystone/fernet-keys \
   hpc/keystone

roles/mariadb/tasks/main.yml

@@ -1,6 +1,5 @@
 # Install a docker based mariadb.
 ---
-- include: ../common/tasks/docker.yml
 - name: install service file.
   template:
     src: files/mysql.service

roles/memcached/tasks/main.yml

@@ -1,6 +1,5 @@
 # Install a docker based mariadb.
 ---
-- include: ../common/tasks/docker.yml
 - name: install service file.
   template:
     src: files/memcached.service

roles/nova-management/tasks/main.yml

@@ -1,7 +1,5 @@
 # Build and install a docker image for nova-controller.
 ---
-- include: ../common/tasks/docker.yml
-
 - name: Make build and persistent directories
   file:
     path: "{{ item }}"

roles/rabbitmq/tasks/main.yml

@@ -1,6 +1,5 @@
 # Install a docker based rabbitMQ.
 ---
-- include: ../common/tasks/docker.yml
 - name: install service file.
   template:
     src: files/rabbitmq.service