cassandra.yml

@@ -1,7 +0,0 @@
----
-# Run all plays as root.
-- hosts: cassandra
-  become: True
-  roles:
-      - common
-      - cassandra

hosts

@@ -2,20 +2,15 @@
 ansible-test
 [keystone]
 ansible-test
-[dockerregistry]
-openstack01-node01
+[registry]
+ansible-test
 [rabbitmq]
 ansible-test
 ansible-test-2
 ansible-test-3
-[cassandra]
-openstack01-node[01:03]
-[first_cassandra]
-openstack01-node01
-[next_cassandra]
-openstack01-node02
-openstack01-node03
-[first_cassandra:vars]
-run_options=""
-[next_cassandra:vars]
-run_options="-e CASSANDRA_SEEDS=172.23.41.1"
+
+
+
+
+
+

roles/cassandra/tasks/main.yml

@@ -1,16 +0,0 @@
-# Install a docker based cassandra cluster.
----
-- include: ../common/tasks/docker.yml
-- name: install service file.
-  template:
-    src: templates/cassandra.service
-    dest: /etc/systemd/system/cassandra.service
-    mode: 644
-    owner: root
-    group: root
-- name: install service file
-  command: systemctl daemon-reload
-- name: make sure service is started
-  systemd:
-    name: cassandra.service
-    state: started

roles/cassandra/templates/cassandra.service

@@ -1,19 +0,0 @@
-[Unit]
-Description=Cassandra Container
-After=docker.service
-Requires=docker.service
-
-[Service]
-TimeoutStartSec=0
-Restart=always
-ExecStartPre=-/usr/bin/docker stop %n
-ExecStartPre=-/usr/bin/docker rm %n
-ExecStartPre=/usr/bin/docker pull cassandra:3.10
-ExecStart=/usr/bin/docker run --name %n -v /srv/lib/cassandra:/var/lib/cassandra \
- -p 7000:7000 -p 7001:7001 -p 7199:7199 -p 9042:9042 -p 9160:9160 \
- -e CASSANDRA_BROADCAST_ADDRESS={{ansible_default_ipv4.address}} \
- -e CASSANDRA_START_RPC=True \
- {{run_options}} cassandra:3.10
-
-[Install]
-WantedBy=multi-user.target

roles/dockerregistry/files/dockerregistry.service

@@ -9,8 +9,9 @@ Restart=on-failure
 ExecStartPre=-/usr/bin/docker stop %n
 ExecStartPre=-/usr/bin/docker rm %n
 ExecStartPre=/usr/bin/docker pull registry:2
-ExecStart=/usr/bin/docker run -d -p 5000:5000 --name %n \
-          -v /srv/dockerregistry/certs:/certs \
+ExecStart=/usr/bin/docker run -d -p 5000:5000 --restart=always --name %n \
+          -v /srv/dockerregistry/auth:/auth -e "REGISTRY_AUTH=htpasswd" -e "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm"   \
+          -e REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd  -v /srv/dockerregistry/certs:/certs                               \
           -e REGISTRY_HTTP_TLS_CERTIFICATE=/certs/docker-registry.hpc.service.rug.nl.crt                      \
           -e REGISTRY_HTTP_TLS_KEY=/certs/docker-registry.hpc.service.rug.nl.key                              \
           -e REGISTRY_HTTP_SECRET=jahNoh2teev0  registry:2