diff --git a/cassandra.yml b/cassandra.yml index c30c999..22b7fbb 100644 --- a/cassandra.yml +++ b/cassandra.yml @@ -3,5 +3,4 @@ - hosts: cassandra become: True roles: - - common - cassandra diff --git a/mariadb.yml b/mariadb.yml index c827f51..830e63d 100644 --- a/mariadb.yml +++ b/mariadb.yml @@ -3,5 +3,4 @@ - hosts: databases become: True roles: - - common - mariadb diff --git a/roles/cassandra/tasks/main.yml b/roles/cassandra/tasks/main.yml index 52d70c4..df00309 100644 --- a/roles/cassandra/tasks/main.yml +++ b/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 diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 03601c8..6d4b966 100644 --- a/roles/common/tasks/main.yml +++ b/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 diff --git a/roles/dockerregistry/tasks/main.yml b/roles/dockerregistry/tasks/main.yml index ed883bb..489f8b4 100644 --- a/roles/dockerregistry/tasks/main.yml +++ b/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 diff --git a/roles/glance/tasks/main.yml b/roles/glance/tasks/main.yml index 3183fe3..897b992 100644 --- a/roles/glance/tasks/main.yml +++ b/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 }}" diff --git a/roles/horizon/tasks/main.yml b/roles/horizon/tasks/main.yml index c8310f1..0a6a27c 100644 --- a/roles/horizon/tasks/main.yml +++ b/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 }}" diff --git a/roles/keystone/tasks/main.yml b/roles/keystone/tasks/main.yml index f2bd7f6..8c370af 100644 --- a/roles/keystone/tasks/main.yml +++ b/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 }}" diff --git a/roles/keystone/templates/keystone.service b/roles/keystone/templates/keystone.service index d9c6487..6569000 100644 --- a/roles/keystone/templates/keystone.service +++ b/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 diff --git a/roles/mariadb/tasks/main.yml b/roles/mariadb/tasks/main.yml index fe27c74..0f53879 100644 --- a/roles/mariadb/tasks/main.yml +++ b/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 diff --git a/roles/memcached/tasks/main.yml b/roles/memcached/tasks/main.yml index 3399d91..c46c616 100644 --- a/roles/memcached/tasks/main.yml +++ b/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 diff --git a/roles/nova-management/tasks/main.yml b/roles/nova-management/tasks/main.yml index 2bd2422..5eac8c4 100644 --- a/roles/nova-management/tasks/main.yml +++ b/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 }}" diff --git a/roles/rabbitmq/tasks/main.yml b/roles/rabbitmq/tasks/main.yml index d18181f..f49697d 100644 --- a/roles/rabbitmq/tasks/main.yml +++ b/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