moving apps submodules to the directory roles/apps

This commit is contained in:
Smaine Kahlouch 2015-10-12 13:12:29 +02:00
parent f9395f7259
commit 4281506322
7 changed files with 8 additions and 13 deletions

10
.gitmodules vendored
View file

@ -1,18 +1,18 @@
[submodule "roles/k8s-common"] [submodule "roles/k8s-common"]
path = roles/k8s-common path = roles/apps/k8s-common
url = https://github.com/ansibl8s/k8s-common.git url = https://github.com/ansibl8s/k8s-common.git
[submodule "roles/k8s-fabric8"] [submodule "roles/k8s-fabric8"]
path = roles/k8s-fabric8 path = roles/apps/k8s-fabric8
url = https://github.com/ansibl8s/k8s-fabric8.git url = https://github.com/ansibl8s/k8s-fabric8.git
[submodule "roles/k8s-kube-ui"] [submodule "roles/k8s-kube-ui"]
path = roles/k8s-kube-ui path = roles/apps/k8s-kube-ui
url = https://github.com/ansibl8s/k8s-kube-ui.git url = https://github.com/ansibl8s/k8s-kube-ui.git
branch = v1.0 branch = v1.0
[submodule "roles/k8s-skydns"] [submodule "roles/k8s-skydns"]
path = roles/k8s-skydns path = roles/apps/k8s-skydns
url = https://github.com/ansibl8s/k8s-skydns.git url = https://github.com/ansibl8s/k8s-skydns.git
branch = v1.0 branch = v1.0
[submodule "roles/k8s-postgres"] [submodule "roles/k8s-postgres"]
path = roles/k8s-postgres path = roles/apps/k8s-postgres
url = https://github.com/ansibl8s/k8s-postgres.git url = https://github.com/ansibl8s/k8s-postgres.git
branch = v1.0 branch = v1.0

View file

@ -122,7 +122,7 @@ grep path .gitmodules | sed 's/.*= //'
For instance if you will probably want to install a [dns server](https://github.com/kubernetes/kubernetes/tree/master/cluster/addons/dns) as it is **strongly recommanded**. For instance if you will probably want to install a [dns server](https://github.com/kubernetes/kubernetes/tree/master/cluster/addons/dns) as it is **strongly recommanded**.
In order to use this role you'll need to follow these steps In order to use this role you'll need to follow these steps
``` ```
git submodule init roles/k8s-skydns git submodule init roles/apps/k8s-skydns
git submodule update git submodule update
``` ```
Then update your playbook with the chosen role Then update your playbook with the chosen role
@ -131,7 +131,7 @@ Then update your playbook with the chosen role
- hosts: kube-master - hosts: kube-master
roles: roles:
- { role: kubernetes/master, tags: master } - { role: kubernetes/master, tags: master }
- { role: k8s-skydns, tags: skydns } - { role: apps/k8s-skydns, tags: skydns }
... ...
``` ```
Please refer to the [k8s-skydns readme](https://github.com/ansibl8s/k8s-skydns) for additionnal info. Please refer to the [k8s-skydns readme](https://github.com/ansibl8s/k8s-skydns) for additionnal info.
@ -171,12 +171,7 @@ This issue will be fixed when kubernetes 1.1 will be released as described in th
### Monitoring addon ### Monitoring addon
Until now i didn't managed to get the monitoring addon working. Until now i didn't managed to get the monitoring addon working.
### Listen on secure port only ### Apiserver listen on secure port only
Currently the api-server listens on both secure and insecure ports. Currently the api-server listens on both secure and insecure ports.
The insecure port is mainly used for calico. The insecure port is mainly used for calico.
Will be fixed soon. Will be fixed soon.
Author Information
------------------
Smana - Smaine Kahlouch (smainklh@gmail.com)