rename docker-volumes

inventories/pro/group_vars/all/vars.yml

@@ -10,11 +10,11 @@ cdt_protocol: https
 #registry_url: "docker.nexus3.devopswise.com/docker-internal/"
 registry_url: ""
 
-docker_volumes: /opt/docker-volumes
-docker_logs: /opt/docker-logs
-docker_backups: /opt/docker-backups
-docker_certs: /opt/docker-certs
 docker_data: /opt/docker-data
+cdt_data: /opt/cdt-data
+cdt_log: /opt/cdt-log
+cdt_backup: /opt/cdt-backup
+cdt_cert: /opt/cdt-cert
 
 aws_access_key: "AKIAJYUEDKFQKOPEJMHQ"
 aws_region: "eu-west-1"

roles/bitbucket/tasks/main.yml

@@ -2,10 +2,10 @@
 - name: Create a directory to store volume
   file: path="{{ item }}" state=directory mode=0777 owner="{{ bitbucket_user }}" group="{{ bitbucket_group }}"
   with_items:
-    - "{{ docker_logs }}/{{ bitbucket_service_name }}"
-    - "{{ docker_volumes }}/{{ bitbucket_service_name }}"
-    - "{{ docker_volumes }}/{{ bitbucket_service_name }}/db"
-    - "{{ docker_volumes }}/{{ bitbucket_service_name }}/data"
+    - "{{ cdt_log }}/{{ bitbucket_service_name }}"
+    - "{{ cdt_data }}/{{ bitbucket_service_name }}"
+    - "{{ cdt_data }}/{{ bitbucket_service_name }}/db"
+    - "{{ cdt_data }}/{{ bitbucket_service_name }}/data"
   become: yes
   become_method: sudo
 
@@ -16,7 +16,7 @@
 
 - name: sync docker-compose.yml
   template: 
-    src: ../templates/docker-compose.yml.j2
+    src: docker-compose.yml.j2
     dest: /tmp/{{ bitbucket_service_name }}/docker-compose.yml
     mode: 0755
   become: yes

roles/bitbucket/templates/docker-compose.yml.j2

@@ -12,7 +12,7 @@ services:
       SERVER_PROXY_NAME: "bitbucket.{{ base_domain }}"
       ELASTICSEARCH_ENABLED: "false"
     volumes:
-      - "{{ docker_volumes }}/{{ bitbucket_service_name }}/data:/var/atlassian/application-data/bitbucket"
+      - "{{ cdt_data }}/{{ bitbucket_service_name }}/data:/var/atlassian/application-data/bitbucket"
     ports:
       - "7999:7999"
       - "7990"

roles/cdtportal/tasks/main.yml

@@ -2,10 +2,10 @@
 - name: Create a directory to store volume
   file: path="{{ item }}" state=directory mode=0777 owner="{{ cdtportal_user }}" group="{{ cdtportal_group }}"
   with_items:
-    - "{{ docker_logs }}/{{ cdtportal_service_name }}"
-    - "{{ docker_volumes }}/{{ cdtportal_service_name }}"
-    - "{{ docker_volumes }}/{{ cdtportal_service_name }}/config"
-    - "{{ docker_volumes }}/{{ cdtportal_service_name }}/data"
+    - "{{ cdt_log }}/{{ cdtportal_service_name }}"
+    - "{{ cdt_data }}/{{ cdtportal_service_name }}"
+    - "{{ cdt_data }}/{{ cdtportal_service_name }}/config"
+    - "{{ cdt_data }}/{{ cdtportal_service_name }}/data"
   become: yes
   become_method: sudo
 
@@ -21,7 +21,7 @@
 - name: sync application.yaml file for cdtportal
   template:
     src: application.yml.j2
-    dest: /{{ docker_volumes }}/{{ cdtportal_service_name }}/config/application.yml
+    dest: /{{ cdt_data }}/{{ cdtportal_service_name }}/config/application.yml
     mode: 0755
   become: yes
   become_method: sudo

roles/cdtportal/templates/docker-compose.yml.j2

@@ -3,9 +3,9 @@ services:
   cdtportal:
     image: "{{ cdtportal_registry_url }}{{ cdtportal_image_name }}:{{ cdtportal_version }}"
     volumes:
-      - "{{ docker_volumes }}/{{ cdtportal_service_name }}/config/application.yml:/config/application.yml"
-      - "{{ docker_volumes }}/{{ cdtportal_service_name }}/data:/data"
-      - "{{ docker_certs }}/cacerts:/etc/ssl/certs/java/cacerts:ro"
+      - "{{ cdt_data }}/{{ cdtportal_service_name }}/config/application.yml:/config/application.yml"
+      - "{{ cdt_data }}/{{ cdtportal_service_name }}/data:/data"
+      - "{{ cdt_cert }}/cacerts:/etc/ssl/certs/java/cacerts:ro"
     environment:
       CDTPORTAL_DATA: "/data"
       CDTPORTAL_LOG: "/var/log/cdtportal"

roles/common/tasks/main.yml

@@ -54,9 +54,9 @@
 - name: Create base directories
   file: path="{{ item }}" state=directory mode=0777 owner="0" group="0"
   with_items:
-    - "{{ docker_logs }}"
-    - "{{ docker_volumes }}"
-    - "{{ docker_certs }}"
+    - "{{ cdt_log }}"
+    - "{{ cdt_data }}"
+    - "{{ cdt_cert }}"
     - "{{ docker_data }}"
   become: yes
   become_method: sudo
@@ -173,23 +173,23 @@
 - name: copy generated certificates to cert folder
   copy:
     src: ../credentials/{{ base_domain }}.crt
-    dest: "{{ docker_certs }}/{{ base_domain }}.crt"
+    dest: "{{ cdt_cert }}/{{ base_domain }}.crt"
 
 - name: copy generated certificates to cert folder
   copy:
     src: ../credentials/{{ base_domain }}.key
-    dest: "{{ docker_certs }}/{{ base_domain }}.key"
+    dest: "{{ cdt_cert }}/{{ base_domain }}.key"
 
 - name: generate-cacert.sh file
   template:
     src: generate-cacert.sh.j2
-    dest: "{{ docker_certs }}/generate-cacert.sh"
+    dest: "{{ cdt_cert }}/generate-cacert.sh"
     mode: 0755
   become: yes
   become_method: sudo
 
 - name: Run cacert generation script
-  shell: "cd {{ docker_certs }} && {{ docker_certs }}/generate-cacert.sh"
+  shell: "cd {{ cdt_cert }} && {{ cdt_cert }}/generate-cacert.sh"
   become: yes
   become_method: sudo
 

roles/common/templates/generate-cacert.sh.j2

@@ -1,6 +1,6 @@
 #!/bin/bash
 OPENJDK_VERSION="8-jdk"
-WORKING_DIR={{ docker_certs }}
+WORKING_DIR={{ cdt_cert }}
 CERT_TO_IMPORT={{ base_domain }}.crt
 docker pull openjdk:${OPENJDK_VERSION}
 docker run --rm --entrypoint cat openjdk:${OPENJDK_VERSION} /etc/ssl/certs/java/cacerts > ${WORKING_DIR}/cacerts

roles/gitea/tasks/main.yml

@@ -2,12 +2,12 @@
 - name: Create a directory to store volume
   file: path="{{ item }}" state=directory mode=0777 owner="{{ gitea_user }}" group="{{ gitea_group }}"
   with_items:
-    - "{{ docker_logs }}/{{ gitea_service_name }}"
-    - "{{ docker_volumes }}/{{ gitea_service_name }}"
-    - "{{ docker_volumes }}/{{ gitea_service_name }}/mysql"
-    - "{{ docker_volumes }}/{{ gitea_service_name }}/data"
-    - "{{ docker_volumes }}/{{ gitea_service_name }}/data/gitea"
-    - "{{ docker_volumes }}/{{ gitea_service_name }}/data/gitea/conf"
+    - "{{ cdt_log }}/{{ gitea_service_name }}"
+    - "{{ cdt_data }}/{{ gitea_service_name }}"
+    - "{{ cdt_data }}/{{ gitea_service_name }}/mysql"
+    - "{{ cdt_data }}/{{ gitea_service_name }}/data"
+    - "{{ cdt_data }}/{{ gitea_service_name }}/data/gitea"
+    - "{{ cdt_data }}/{{ gitea_service_name }}/data/gitea/conf"
   become: yes
   become_method: sudo
 
@@ -31,7 +31,7 @@
 - name: sync app.ini
   template:
     src: app.ini.j2
-    dest: "{{ docker_volumes }}/{{ gitea_service_name }}/data/gitea/conf/app.ini"
+    dest: "{{ cdt_data }}/{{ gitea_service_name }}/data/gitea/conf/app.ini"
     mode: 0644
     owner: "{{ gitea_user }}"
     group: "{{ gitea_group }}"

roles/gitea/templates/docker-compose.yml.j2

@@ -3,7 +3,7 @@ services:
   gitea:
     image: "{{ gitea_registry_url }}{{ gitea_image_name }}:{{ gitea_version }}"
     volumes:
-      - "{{ docker_volumes }}/{{ gitea_service_name }}/data:/data"
+      - "{{ cdt_data }}/{{ gitea_service_name }}/data:/data"
     ports:
       - 3000
       - "2222:22"
@@ -31,7 +31,7 @@ services:
       MYSQL_USER: gitea
       MYSQL_PASSWORD: {{ gitea_mysql_pass }}
     volumes:
-      - '{{ docker_volumes }}/{{ gitea_service_name }}/mysql:/var/lib/mysql'
+      - '{{ cdt_data }}/{{ gitea_service_name }}/mysql:/var/lib/mysql'
     ports:
       - 3306
     labels:

roles/grafana/tasks/main.yml

@@ -2,32 +2,32 @@
 - name: Create a directory to store volume
   file: path="{{ item }}" state=directory mode=0755 owner="{{ grafana_user }}" group="{{ grafana_group }}"
   with_items:
-    - "{{ docker_logs }}/{{ grafana_service_name }}"
-    - "{{ docker_volumes }}/{{ grafana_service_name }}"
-    - "{{ docker_volumes }}/{{ grafana_service_name }}/provisioning"
-    - "{{ docker_volumes }}/{{ grafana_service_name }}/data"
+    - "{{ cdt_log }}/{{ grafana_service_name }}"
+    - "{{ cdt_data }}/{{ grafana_service_name }}"
+    - "{{ cdt_data }}/{{ grafana_service_name }}/provisioning"
+    - "{{ cdt_data }}/{{ grafana_service_name }}/data"
   become: yes
   become_method: sudo
 
 - name: Create a directory to store volume
   file: path="{{ item }}" state=directory mode=0755 owner="{{ prometheus_user }}" group="{{ prometheus_group }}"
   with_items:
-    - "{{ docker_logs }}/{{ prometheus_service_name }}"
-    - "{{ docker_volumes }}/{{ prometheus_service_name }}"
-    - "{{ docker_volumes }}/{{ prometheus_service_name }}/data"
-    - "{{ docker_volumes }}/{{ prometheus_service_name }}/config"
+    - "{{ cdt_log }}/{{ prometheus_service_name }}"
+    - "{{ cdt_data }}/{{ prometheus_service_name }}"
+    - "{{ cdt_data }}/{{ prometheus_service_name }}/data"
+    - "{{ cdt_data }}/{{ prometheus_service_name }}/config"
   become: yes
   become_method: sudo
 
 - name: Check if the prometheus.yml exists
   stat:
-    path: "{{ docker_volumes }}/{{ prometheus_service_name }}/config/prometheus.yml"
+    path: "{{ cdt_data }}/{{ prometheus_service_name }}/config/prometheus.yml"
   register: prometheus_config_file
 
 - name: "Create default template if not exists"
   template:
     src: "prometheus.yml.j2"
-    dest: '{{ docker_volumes }}/{{ prometheus_service_name }}/config/prometheus.yml'
+    dest: '{{ cdt_data }}/{{ prometheus_service_name }}/config/prometheus.yml'
     owner: '{{ prometheus_user }}'
     group: '{{ prometheus_group }}'
   when: not prometheus_config_file.stat.exists
@@ -36,13 +36,13 @@
 
 - name: Check if the dashboards.yml exists, if so dont clone anything
   stat:
-    path: "{{ docker_volumes }}/{{ grafana_service_name }}/provisioning/dashboards/all.yml"
+    path: "{{ cdt_data }}/{{ grafana_service_name }}/provisioning/dashboards/all.yml"
   register: grafana_dashboard_config_file
 
 - name: clone dashboards from git
   git:
     repo: "{{ grafana_provisioning_repo_url }}"
-    dest: "{{ docker_volumes }}/{{ grafana_service_name }}/provisioning"
+    dest: "{{ cdt_data }}/{{ grafana_service_name }}/provisioning"
     version: "{{ grafana_provisioning_repo_branch }}"
   when: not grafana_dashboard_config_file.stat.exists
   become: yes
@@ -51,15 +51,15 @@
 - name: "overwrite datasources"
   template:
     src: "grafana-datasources.yml.j2"
-    dest: '{{ docker_volumes }}/{{ grafana_service_name }}/provisioning/datasources/datasources.yml'
+    dest: '{{ cdt_data }}/{{ grafana_service_name }}/provisioning/datasources/datasources.yml'
     owner: '{{ grafana_user }}'
     group: '{{ grafana_group }}'
   become: yes
   become_method: sudo
 
 - name: set ownership for cloned dashboards so grafana user can access
   file:
-    dest: "{{ docker_volumes }}/{{ grafana_service_name }}/provisioning"
+    dest: "{{ cdt_data }}/{{ grafana_service_name }}/provisioning"
     owner: "{{ grafana_user }}"
     group: "{{ grafana_group }}"
     recurse: yes

roles/grafana/templates/docker-compose.yml.j2

@@ -10,8 +10,8 @@ services:
     ports:
       - 9090
     volumes:
-      - "{{ docker_volumes }}/{{ prometheus_service_name }}/data:/prometheus"
-      - "{{ docker_volumes }}/{{ prometheus_service_name }}/config:/etc/prometheus"
+      - "{{ cdt_data }}/{{ prometheus_service_name }}/data:/prometheus"
+      - "{{ cdt_data }}/{{ prometheus_service_name }}/config:/etc/prometheus"
       - /etc/localtime:/etc/localtime:ro
     networks:
       - internal
@@ -45,8 +45,8 @@ services:
     restart: always
     image: "{{ grafana_registry_url }}{{ grafana_image_name }}:{{ grafana_version }}"
     volumes:
-      - "{{ docker_volumes }}/{{ grafana_service_name }}/provisioning:/etc/grafana/provisioning"
-      - "{{ docker_volumes }}/{{ grafana_service_name }}/data:/var/lib/grafana"
+      - "{{ cdt_data }}/{{ grafana_service_name }}/provisioning:/etc/grafana/provisioning"
+      - "{{ cdt_data }}/{{ grafana_service_name }}/data:/var/lib/grafana"
       - "/etc/localtime:/etc/localtime:ro"    
     environment:
       http_proxy: "{{ http_proxy }}"

roles/jenkins/tasks/main.yml

@@ -2,8 +2,8 @@
 - name: Create a directory to store volume
   file: path="{{ item }}" state=directory mode=0777 owner="{{ jenkins_user }}" group="{{ jenkins_group }}"
   with_items:
-    - "{{ docker_logs }}/{{ jenkins_service_name }}"
-    - "{{ docker_volumes }}/{{ jenkins_service_name }}"
+    - "{{ cdt_log }}/{{ jenkins_service_name }}"
+    - "{{ cdt_data }}/{{ jenkins_service_name }}"
   become: yes
   become_method: sudo
 
@@ -90,7 +90,7 @@
 - name: Transfer script to run
   copy:
     src: ../credentials/openldap_admin_sshkey.pem
-    dest: "{{ docker_volumes }}/{{ jenkins_service_name }}/ssh-private-key.pem"
+    dest: "{{ cdt_data }}/{{ jenkins_service_name }}/ssh-private-key.pem"
     mode: 0755
   become: yes
   become_method: sudo

roles/jenkins/templates/docker-compose.yml.j2

@@ -7,7 +7,7 @@ services:
       - 8080
       - 50000
     volumes:
-      - "{{ docker_volumes }}/{{ jenkins_service_name }}:/var/jenkins_home"
+      - "{{ cdt_data }}/{{ jenkins_service_name }}:/var/jenkins_home"
       - '/var/run/docker.sock:/var/run/docker.sock'
     environment:
       INITIAL_ADMIN_USER: "admin"

roles/jira/tasks/main.yml

@@ -2,10 +2,10 @@
 - name: Create a directory to store volume
   file: path="{{ item }}" state=directory mode=0777 owner="{{ jira_user }}" group="{{ jira_group }}"
   with_items:
-    - "{{ docker_logs }}/{{ jira_service_name }}"
-    - "{{ docker_volumes }}/{{ jira_service_name }}"
-    - "{{ docker_volumes }}/{{ jira_service_name }}/mysql"
-    - "{{ docker_volumes }}/{{ jira_service_name }}/data"
+    - "{{ cdt_log }}/{{ jira_service_name }}"
+    - "{{ cdt_data }}/{{ jira_service_name }}"
+    - "{{ cdt_data }}/{{ jira_service_name }}/mysql"
+    - "{{ cdt_data }}/{{ jira_service_name }}/data"
   become: yes
   become_method: sudo
 
@@ -20,7 +20,7 @@
 
 - name: sync docker-compose.yml
   template: 
-    src: ../templates/docker-compose.yml.j2
+    src: docker-compose.yml.j2
     dest: /tmp/{{ jira_service_name }}/docker-compose.yml
     mode: 0755
   become: yes

roles/jira/templates/docker-compose.yml.j2

@@ -4,7 +4,7 @@ services:
     restart: always
     image: "{{ jira_registry_url }}{{ jira_image_name }}:{{ jira_version }}"
     volumes:
-      - "{{ docker_volumes }}/{{ jira_service_name }}/data:/var/atlassian/jira"
+      - "{{ cdt_data }}/{{ jira_service_name }}/data:/var/atlassian/jira"
     depends_on:
       - jira_db
     environment:
@@ -36,7 +36,7 @@ services:
       - internal
       - external
     volumes:
-      - '{{ docker_volumes }}/{{ jira_service_name }}/mysql:/var/lib/mysql'
+      - '{{ cdt_data }}/{{ jira_service_name }}/mysql:/var/lib/mysql'
     ports:
       - 3306
     labels:

roles/openldap/tasks/main.yml

@@ -2,10 +2,10 @@
 - name: Create a directory to store volume
   file: path="{{ item }}" state=directory mode=0777 owner="{{ openldap_user }}" group="{{ openldap_group }}"
   with_items:
-    - "{{ docker_logs }}/{{ openldap_service_name }}"
-    - "{{ docker_volumes }}/{{ openldap_service_name }}"
-    - "{{ docker_volumes }}/{{ openldap_service_name }}/data"
-    - "{{ docker_volumes }}/{{ openldap_service_name }}/etc"
+    - "{{ cdt_log }}/{{ openldap_service_name }}"
+    - "{{ cdt_data }}/{{ openldap_service_name }}"
+    - "{{ cdt_data }}/{{ openldap_service_name }}/data"
+    - "{{ cdt_data }}/{{ openldap_service_name }}/etc"
   become: yes
   become_method: sudo
 
@@ -24,7 +24,7 @@
 - name: sync structure.ldif
   template:
     src: structure.ldif.j2
-    dest: "{{ docker_volumes }}/{{ openldap_service_name }}/structure.ldif"
+    dest: "{{ cdt_data }}/{{ openldap_service_name }}/structure.ldif"
     mode: 0755
   become: yes
   become_method: sudo

roles/openldap/templates/docker-compose.yml.j2

@@ -14,9 +14,9 @@ services:
       SLAPD_DOMAIN: {{ openldap_slapd_domain }}
       SLAPD_FULL_DOMAIN: {{ openldap_full_domain }}
     volumes:
-      - "{{ docker_volumes }}/{{ openldap_service_name }}/data:/var/lib/ldap"
-      - "{{ docker_volumes }}/{{ openldap_service_name }}/etc:/etc/ldap"
-      - "{{ docker_volumes }}/{{ openldap_service_name }}/structure.ldif:/tmp/structure.ldif"
+      - "{{ cdt_data }}/{{ openldap_service_name }}/data:/var/lib/ldap"
+      - "{{ cdt_data }}/{{ openldap_service_name }}/etc:/etc/ldap"
+      - "{{ cdt_data }}/{{ openldap_service_name }}/structure.ldif:/tmp/structure.ldif"
     networks:
       - internal
     logging: