Browse Source

Removed inclusion of docker everywhere

It is now included in the common role itself, which is applied to all.
feature/cinder-volume-encryption
Egon Rijpkema 5 years ago
parent
commit
86cd68e465
  1. 1
      cassandra.yml
  2. 1
      mariadb.yml
  3. 1
      roles/cassandra/tasks/main.yml
  4. 4
      roles/common/tasks/main.yml
  5. 1
      roles/dockerregistry/tasks/main.yml
  6. 2
      roles/glance/tasks/main.yml
  7. 2
      roles/horizon/tasks/main.yml
  8. 2
      roles/keystone/tasks/main.yml
  9. 2
      roles/keystone/templates/keystone.service
  10. 1
      roles/mariadb/tasks/main.yml
  11. 1
      roles/memcached/tasks/main.yml
  12. 2
      roles/nova-management/tasks/main.yml
  13. 1
      roles/rabbitmq/tasks/main.yml

1
cassandra.yml

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

1
mariadb.yml

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

1
roles/cassandra/tasks/main.yml

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

4
roles/common/tasks/main.yml

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

1
roles/dockerregistry/tasks/main.yml

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

2
roles/glance/tasks/main.yml

@ -1,7 +1,5 @@ @@ -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 }}"

2
roles/horizon/tasks/main.yml

@ -1,7 +1,5 @@ @@ -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 }}"

2
roles/keystone/tasks/main.yml

@ -1,7 +1,5 @@ @@ -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 }}"

2
roles/keystone/templates/keystone.service

@ -9,7 +9,7 @@ Restart=always @@ -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

1
roles/mariadb/tasks/main.yml

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

1
roles/memcached/tasks/main.yml

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

2
roles/nova-management/tasks/main.yml

@ -1,7 +1,5 @@ @@ -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 }}"

1
roles/rabbitmq/tasks/main.yml

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

Loading…
Cancel
Save