From 73e240c6442ccfb41674fc77f173f5fa9a4bf4a8 Mon Sep 17 00:00:00 2001
From: Smaine Kahlouch <smaine.kahlouch@arkena.com>
Date: Wed, 21 Oct 2015 14:03:39 +0200
Subject: [PATCH] Running apps after cluster setup

---
 .gitmodules            | 3 ---
 cluster.yml            | 9 ++++++---
 requirements.yml       | 4 ----
 roles/apps/k8s-haproxy | 1 -
 4 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 160000 roles/apps/k8s-haproxy

diff --git a/.gitmodules b/.gitmodules
index ad6f0e0ac..19d51823d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -23,9 +23,6 @@
 [submodule "roles/apps/k8s-memcached"]
     path = roles/apps/k8s-memcached
     url = https://github.com/ansibl8s/k8s-memcached.git
-[submodule "roles/apps/k8s-haproxy"]
-    path = roles/apps/k8s-haproxy
-    url = https://github.com/ansibl8s/k8s-haproxy.git
 [submodule "roles/apps/k8s-postgres"]
     path = roles/apps/k8s-postgres
     url = https://github.com/ansibl8s/k8s-postgres.git
diff --git a/cluster.yml b/cluster.yml
index 2fdb803e1..178459ba6 100644
--- a/cluster.yml
+++ b/cluster.yml
@@ -14,10 +14,13 @@
 - hosts: kube-master
   roles:
     - { role: kubernetes/master, tags: master }
-    # Apps to be installed
-    # - { role: apps/k8s-kubedns, tags: ['kubedns', 'apps'] }
-    # - { role: apps/k8s-fabric8, tags: ['fabric8', 'apps'] }
 
 - hosts: kube-node
   roles:
     - { role: kubernetes/node, tags: node }
+
+#- hosts: kube-master
+#  roles:
+    # Apps to be installed
+    # - { role: apps/k8s-kubedns, tags: ['kubedns', 'apps'] }
+    # - { role: apps/k8s-fabric8, tags: ['fabric8', 'apps'] }
diff --git a/requirements.yml b/requirements.yml
index b9971911d..4743d0a63 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -27,10 +27,6 @@
 #  path: roles/apps
 #  # version: v1.0
 #
-#- src: https://github.com/ansibl8s/k8s-haproxy.git
-#  path: roles/apps
-#  # version: v1.0
-#
 #- src: https://github.com/ansibl8s/k8s-postgres.git
 #  path: roles/apps
 #  version: v1.0
diff --git a/roles/apps/k8s-haproxy b/roles/apps/k8s-haproxy
deleted file mode 160000
index c17312c4d..000000000
--- a/roles/apps/k8s-haproxy
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c17312c4dffd4728deeea12782fab5f42b6fed1d