From 5800b04729d9ad76c454172e0dac2f70f4e4a81b Mon Sep 17 00:00:00 2001
From: Ryan Hallisey <rhallise@redhat.com>
Date: Thu, 11 Aug 2016 05:29:54 -0400
Subject: [PATCH] Add persistent volumes to Rabbitmq

The dir /var/lib/rabbitmq needs to remain persistent.

Change-Id: Ib9db0bcfbc3188fdc1b0b0937946e6a27d38eed6
Implements: blueprint rabbitmq-kubernetes
---
 etc/kolla-kubernetes/service_resources.yml           | 12 ++++++++++++
 services/rabbitmq/rabbitmq-bootstrap-job.yml.j2      |  5 +++--
 services/rabbitmq/rabbitmq-pod.yml.j2                |  5 +++--
 services/rabbitmq/rabbitmq-service-management.yml.j2 |  2 +-
 services/rabbitmq/rabbitmq-service.yml.j2            |  2 +-
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/etc/kolla-kubernetes/service_resources.yml b/etc/kolla-kubernetes/service_resources.yml
index 8be0653a6..61851323a 100644
--- a/etc/kolla-kubernetes/service_resources.yml
+++ b/etc/kolla-kubernetes/service_resources.yml
@@ -128,8 +128,20 @@ kolla-kubernetes:
     resources:
       secret:
       disk:
+      - name: rabbitmq-disk
+        template: services/common/common-disk.sh.j2
+        vars:
+          size_in_gb: 10
       pv:
+      - name: rabbitmq-pv
+        template: services/common/common-pv.yml.j2
+        vars:
+          size_in_gb: 10
       pvc:
+      - name: rabbitmq-pvc
+        template: services/common/common-pvc.yml.j2
+        vars:
+          size_in_gb: 10
       svc:
       - name: rabbitmq-service-management
         template: services/rabbitmq/rabbitmq-service-management.yml.j2
diff --git a/services/rabbitmq/rabbitmq-bootstrap-job.yml.j2 b/services/rabbitmq/rabbitmq-bootstrap-job.yml.j2
index ba4554b19..a50a579ff 100644
--- a/services/rabbitmq/rabbitmq-bootstrap-job.yml.j2
+++ b/services/rabbitmq/rabbitmq-bootstrap-job.yml.j2
@@ -1,3 +1,4 @@
+{%- set resourceName = kolla_kubernetes.cli.args.service_name %}
 apiVersion: batch/v1
 kind: Job
 spec:
@@ -27,8 +28,8 @@ spec:
           configMap:
             name: rabbitmq-configmap
         - name: rabbitmq-persistent-storage
-          hostPath:
-            path: /var/lib/rabbitmq
+          persistentVolumeClaim:
+            claimName: {{ resourceName }}
         - name: kolla-logs
           emptyDir: {}
       restartPolicy: OnFailure
diff --git a/services/rabbitmq/rabbitmq-pod.yml.j2 b/services/rabbitmq/rabbitmq-pod.yml.j2
index 39c3f9578..23e59ee0f 100644
--- a/services/rabbitmq/rabbitmq-pod.yml.j2
+++ b/services/rabbitmq/rabbitmq-pod.yml.j2
@@ -1,3 +1,4 @@
+{%- set resourceName = kolla_kubernetes.cli.args.service_name %}
 apiVersion: v1
 kind: ReplicationController
 spec:
@@ -32,8 +33,8 @@ spec:
           configMap:
             name: rabbitmq-configmap
         - name: rabbitmq-persistent-storage
-          hostPath:
-            path: /var/lib/rabbitmq
+          persistentVolumeClaim:
+            claimName: {{ resourceName }}
         - name: kolla-logs
           emptyDir: {}
 metadata:
diff --git a/services/rabbitmq/rabbitmq-service-management.yml.j2 b/services/rabbitmq/rabbitmq-service-management.yml.j2
index 947a1f5b8..8dfb01896 100644
--- a/services/rabbitmq/rabbitmq-service-management.yml.j2
+++ b/services/rabbitmq/rabbitmq-service-management.yml.j2
@@ -7,4 +7,4 @@ spec:
   selector:
     service: rabbitmq
 metadata:
-   name: rabbitmq-management
\ No newline at end of file
+   name: rabbitmq-management
diff --git a/services/rabbitmq/rabbitmq-service.yml.j2 b/services/rabbitmq/rabbitmq-service.yml.j2
index 43d3e1c64..84b58851b 100644
--- a/services/rabbitmq/rabbitmq-service.yml.j2
+++ b/services/rabbitmq/rabbitmq-service.yml.j2
@@ -7,4 +7,4 @@ spec:
   selector:
     service: rabbitmq
 metadata:
-   name: rabbitmq
\ No newline at end of file
+   name: rabbitmq