From da675b7b597f724649b1cbb3b6b410231c724401 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 5 Nov 2019 14:02:33 -0600
Subject: [PATCH] Issue #1: Get memcached and rabbitmq deployments running.

---
 deploy/operator.yaml                          | 4 +++-
 roles/tower/tasks/main.yml                    | 4 ++--
 roles/tower/templates/tower_memcached.yaml.j2 | 3 +++
 roles/tower/templates/tower_rabbitmq.yaml.j2  | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/deploy/operator.yaml b/deploy/operator.yaml
index a91e430c..e55a0de9 100644
--- a/deploy/operator.yaml
+++ b/deploy/operator.yaml
@@ -40,7 +40,9 @@ spec:
                 fieldRef:
                   fieldPath: metadata.name
             - name: OPERATOR_NAME
-              value: "tower-operator"
+              value: tower-operator
+            # - name: ANSIBLE_VERBOSITY
+            #   value: '4'
       volumes:
         - name: runner
           emptyDir: {}
diff --git a/roles/tower/tasks/main.yml b/roles/tower/tasks/main.yml
index ff6b7d84..87dd64fc 100644
--- a/roles/tower/tasks/main.yml
+++ b/roles/tower/tasks/main.yml
@@ -1,8 +1,8 @@
 ---
 - name: Ensure configured Tower resources exist in the cluster.
   k8s:
-    definition: "{{ lookup('template', item) | from_yaml }}"
+    definition: "{{ lookup('template', item) | from_yaml_all | list }}"
   with_items:
-    - tower_postgres.yaml.j2
     - tower_memcached.yaml.j2
+    - tower_postgres.yaml.j2
     - tower_rabbitmq.yaml.j2
diff --git a/roles/tower/templates/tower_memcached.yaml.j2 b/roles/tower/templates/tower_memcached.yaml.j2
index 5d1f6a05..94897803 100644
--- a/roles/tower/templates/tower_memcached.yaml.j2
+++ b/roles/tower/templates/tower_memcached.yaml.j2
@@ -9,6 +9,9 @@ metadata:
     app: tower-memcached
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: tower-memcached
   template:
     metadata:
       labels:
diff --git a/roles/tower/templates/tower_rabbitmq.yaml.j2 b/roles/tower/templates/tower_rabbitmq.yaml.j2
index f35e47bb..71c1481d 100644
--- a/roles/tower/templates/tower_rabbitmq.yaml.j2
+++ b/roles/tower/templates/tower_rabbitmq.yaml.j2
@@ -24,7 +24,7 @@ spec:
         - name: RABBITMQ_DEFAULT_VHOST
           value: awx
         - name: RABBITMQ_NODE_PORT
-          value: 5672
+          value: '5672'
         ports:
         - containerPort: 15672
         - containerPort: 5672