From 6ede1dfbea42b6ceda61f2aa07d34c8a8866ff51 Mon Sep 17 00:00:00 2001
From: Matthew Jones <matburt@redhat.com>
Date: Thu, 5 Oct 2017 20:52:17 -0400
Subject: [PATCH] Update openshift installer to support rabbitmq autoscale

* Switch rabbitmq container out for one that supports autoscale
* Add etcd pod to support autoscale negotiation
---
 installer/openshift/tasks/main.yml            |  9 ++++
 .../openshift/templates/deployment.yml.j2     | 28 ++++++++++--
 installer/openshift/templates/etcd.yml.j2     | 44 +++++++++++++++++++
 3 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100644 installer/openshift/templates/etcd.yml.j2

diff --git a/installer/openshift/tasks/main.yml b/installer/openshift/tasks/main.yml
index 0de60caa98..fd6c967d24 100644
--- a/installer/openshift/tasks/main.yml
+++ b/installer/openshift/tasks/main.yml
@@ -121,6 +121,15 @@
     dest: "{{ openshift_base_path }}/deployment.yml"
     mode: '0600'
 
+- name: Template Openshift AWX etcd2
+  template:
+    src: etcd.yml.j2
+    dest: "{{ openshift_base_path }}/etcd.yml"
+    mode: '0600'
+
+- name: Apply etcd deployment
+  shell: "oc apply -f {{ openshift_base_path }}/etcd.yml"
+
 - name: Apply Configmap
   shell: "oc apply -f {{ openshift_base_path }}/configmap.yml"
 
diff --git a/installer/openshift/templates/deployment.yml.j2 b/installer/openshift/templates/deployment.yml.j2
index 775ad8a49c..1152503b12 100644
--- a/installer/openshift/templates/deployment.yml.j2
+++ b/installer/openshift/templates/deployment.yml.j2
@@ -41,18 +41,40 @@ spec:
             - name: AWX_ADMIN_PASSWORD
               value: {{ default_admin_password|default('password') }}
         - name: awx-rabbit
-          image: rabbitmq:3
+          image: ansible/awx_rabbitmq:latest
+          imagePullPolicy: Always
           env:
+            # For consupmption by rabbitmq-env.conf
+            - name: MY_POD_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
+            - name: RABBITMQ_USE_LONGNAME
+              value: "true"
+            - name: ERLANG_COOKIE
+              value: "test"
             - name: RABBITMQ_ERLANG_COOKIE
-              value: secretb
+              value: "secretb"
             - name: RABBITMQ_NODENAME
-              value: rabbitmq
+              value: "rabbit@$(MY_POD_IP)"
+            - name: AUTOCLUSTER_TYPE
+              value: "etcd"
+            - name: AUTOCLUSTER_DELAY
+              value: "60"
+            - name: ETCD_HOST
+              value: "etcd"
+            - name: AUTOCLUSTER_CLEANUP
+              value: "true"
+            - name: CLEANUP_WARN_ONLY
+              value: "true"
             - name: RABBITMQ_DEFAULT_USER
               value: awx
             - name: RABBITMQ_DEFAULT_PASS
               value: abcdefg
             - name: RABBITMQ_DEFAULT_VHOST
               value: awx
+            - name: RABBITMQ_CONFIG_FILE
+              value: /etc/rabbitmq/rabbitmq
         - name: awx-memcached
           image: memcached
       volumes:
diff --git a/installer/openshift/templates/etcd.yml.j2 b/installer/openshift/templates/etcd.yml.j2
new file mode 100644
index 0000000000..abbfe13185
--- /dev/null
+++ b/installer/openshift/templates/etcd.yml.j2
@@ -0,0 +1,44 @@
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: etcd
+  namespace: {{ awx_openshift_project }}
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        name: awx-etcd2
+        service: etcd
+    spec:
+      containers:
+        - name: etcd
+          image: elcolio/etcd:latest
+          ports:
+            - containerPort: 4001
+          volumeMounts:
+            - mountPath: /data
+              name: datadir
+      volumes:
+        - name: datadir
+          emptyDir: {}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+  labels:
+    name: awx-etcd
+  name: etcd
+  namespace: {{ awx_openshift_project }}
+spec:
+  ports:
+    - name: etcd
+      port: 4001
+      protocol: TCP
+      targetPort: 4001
+  selector:
+    name: awx-etcd2
+  sessionAffinity: None
+  type: ClusterIP