Merge branch 'master' into ha

This commit is contained in:
ant31 2015-12-16 18:09:50 +01:00
commit bf5c531037

View file

@ -24,3 +24,6 @@
# Console # Console
- { role: apps/k8s-fabric8, tags: 'fabric8' } - { role: apps/k8s-fabric8, tags: 'fabric8' }
- { role: apps/k8s-kube-ui, tags: ['kube-ui', 'kube-system']} - { role: apps/k8s-kube-ui, tags: ['kube-ui', 'kube-system']}
# ETCD
- { role: apps/k8s-etcd, tags: 'etcd'}