From ba89cac8284dc7ce4d8932448cf228154c30b21a Mon Sep 17 00:00:00 2001
From: Flavio Percoco <flaper87@gmail.com>
Date: Fri, 15 Dec 2017 11:25:53 +0100
Subject: [PATCH] Make volumes and mounts configurable

Change-Id: Iee3266cf75a4a97ea253c9a372cd8af040854127
---
 defaults/main.yml   | 18 +++++++++++++++
 tasks/provision.yml | 56 +++++++--------------------------------------
 2 files changed, 26 insertions(+), 48 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index d4fd7df..4c10896 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -17,6 +17,24 @@ mariadb_config:
   host: mariadb
   root_password: weakpassword
 
+keystone_mounts:
+  - name: kolla-config
+    mountPath: /var/lib/kolla/config_files/
+  - name: keystone-fernet
+    mountPath: /etc/keystone/fernet-keys
+
+keystone_mounts_extra: []
+
+keystone_volumes:
+  - name: kolla-config
+    config_map:
+      name: keystone
+  - name: keystone-fernet
+    persistentVolumeClaim:
+      claimName: keystone-fernet
+
+keystone_volumes_extra: []
+
 keystone_config:
   DEFAULT:
     public_bind_host: "0.0.0.0"
diff --git a/tasks/provision.yml b/tasks/provision.yml
index 6dcdd75..564bced 100644
--- a/tasks/provision.yml
+++ b/tasks/provision.yml
@@ -130,18 +130,8 @@
             value: COPY_ALWAYS
           - name: KOLLA_BOOTSTRAP
             value: ''
-        volume_mounts:
-        - name: kolla-config
-          mountPath: /var/lib/kolla/config_files/
-        - name: keystone-fernet
-          mountPath: /etc/keystone/fernet-keys
-    volumes:
-      - name: kolla-config
-        config_map:
-          name: keystone
-      - name: keystone-fernet
-        persistentVolumeClaim:
-          claimName: keystone-fernet
+        volume_mounts: "{{keystone_mounts + keystone_mounts_extra}}"
+    volumes: "{{keystone_volumes + keystone_volumes_extra}}"
     state: present
 
 - name: Keystone fernet bootstrap
@@ -160,18 +150,8 @@
         env:
           - name: KOLLA_CONFIG_STRATEGY
             value: COPY_ALWAYS
-        volume_mounts:
-        - name: kolla-config
-          mountPath: /var/lib/kolla/config_files/
-        - name: keystone-fernet
-          mountPath: /etc/keystone/fernet-keys
-    volumes:
-      - name: kolla-config
-        config_map:
-          name: keystone
-      - name: keystone-fernet
-        persistentVolumeClaim:
-          claimName: keystone-fernet
+        volume_mounts: "{{keystone_mounts + keystone_mounts_extra}}"
+    volumes: "{{keystone_volumes + keystone_volumes_extra}}"
     state: present
 
 - name: Create keystone service
@@ -236,18 +216,8 @@
             value: COPY_ALWAYS
           - name: KOLLA_BOOTSTRAP
             value: ''
-        volume_mounts:
-        - name: kolla-config
-          mountPath: /var/lib/kolla/config_files/
-        - name: keystone-fernet
-          mountPath: /etc/keystone/fernet-keys
-    volumes:
-      - name: kolla-config
-        config_map:
-          name: keystone
-      - name: keystone-fernet
-        persistentVolumeClaim:
-          claimName: keystone-fernet
+        volume_mounts: "{{keystone_mounts + keystone_mounts_extra}}"
+    volumes: "{{keystone_volumes + keystone_volumes_extra}}"
     state: present
 
 - name: Create keystone deployment
@@ -275,18 +245,8 @@
             containerPort: 5000
           - name: api-admin
             containerPort: 35357
-        volume_mounts:
-        - name: kolla-config
-          mountPath: /var/lib/kolla/config_files/
-        - name: keystone-fernet
-          mountPath: /etc/keystone/fernet-keys
-    volumes:
-      - name: kolla-config
-        config_map:
-          name: keystone
-      - name: keystone-fernet
-        persistentVolumeClaim:
-          claimName: keystone-fernet
+        volume_mounts: "{{keystone_mounts + keystone_mounts_extra}}"
+    volumes: "{{keystone_volumes + keystone_volumes_extra}}"
     state: present
   register: create_service