diff --git a/.gitmodules b/.gitmodules index ad6f0e0ac372ff856d15f799f528f30cf0ddc65f..19d51823d918e962aec5d653eeb05430f6a0c008 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 2fdb803e1d3f031640a2345cf80a38582d01a45f..178459ba6f676fb3e5c4de5d3bf2ddec9067d4bc 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 b9971911dcf90d4d0141c43981bffa0e41b2dc4d..4743d0a63ea3455af95a2f7b5fff44d93b2587a5 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 c17312c4dffd4728deeea12782fab5f42b6fed1d..0000000000000000000000000000000000000000 --- a/roles/apps/k8s-haproxy +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c17312c4dffd4728deeea12782fab5f42b6fed1d