airship
/
promenade
Code Issues Proposed changes

Add ceph-rgw: enabled to example labels 

Also remove spurious ceph labels from basic example.

Change-Id: I1d4560fb7af68576e407bbb1a95b919ccb31230c
This commit is contained in:
Mark Burnett 2017-10-26 11:33:58 -05:00
parent e56ad622c3
commit bf03868d16
4 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/basic/Genesis.yaml
View File

@ -14,9 +14,6 @@ data:
- calico-etcd=enabled
- node-role.kubernetes.io/master=
dynamic:
- ceph-mds=enabled
- ceph-mon=enabled
- ceph-osd=enabled
- kubernetes-apiserver=enabled
- kubernetes-controller-manager=enabled
- kubernetes-etcd=enabled

12
examples/basic/joining-host-config.yaml
View File

@ -12,9 +12,6 @@ data:
join_ip: 192.168.77.11
labels:
dynamic:
- ceph-mon=enabled
- ceph-osd=enabled
- ceph-mds=enabled
- ucp-control-plane=enabled
---
schema: promenade/KubernetesNode/v1
@ -33,9 +30,6 @@ data:
- node-role.kubernetes.io/master=
dynamic:
- calico-etcd=enabled
- ceph-mon=enabled
- ceph-osd=enabled
- ceph-mds=enabled
- kubernetes-apiserver=enabled
- kubernetes-controller-manager=enabled
- kubernetes-etcd=enabled
@ -58,9 +52,6 @@ data:
- node-role.kubernetes.io/master=
dynamic:
- calico-etcd=enabled
- ceph-mon=enabled
- ceph-osd=enabled
- ceph-mds=enabled
- kubernetes-apiserver=enabled
- kubernetes-controller-manager=enabled
- kubernetes-etcd=enabled
@ -83,9 +74,6 @@ data:
- node-role.kubernetes.io/master=
dynamic:
- calico-etcd=enabled
- ceph-mon=enabled
- ceph-osd=enabled
- ceph-mds=enabled
- kubernetes-apiserver=enabled
- kubernetes-controller-manager=enabled
- kubernetes-etcd=enabled

1
examples/complete/Genesis.yaml
View File

@ -17,6 +17,7 @@ data:
- ceph-mds=enabled
- ceph-mon=enabled
- ceph-osd=enabled
- ceph-rgw=enabled
- kubernetes-apiserver=enabled
- kubernetes-controller-manager=enabled
- kubernetes-etcd=enabled

12
examples/complete/joining-host-config.yaml
View File

@ -12,9 +12,10 @@ data:
join_ip: 192.168.77.11
labels:
dynamic:
- ceph-mds=enabled
- ceph-mon=enabled
- ceph-osd=enabled
- ceph-mds=enabled
- ceph-rgw=enabled
- ucp-control-plane=enabled
---
schema: promenade/KubernetesNode/v1
@ -33,9 +34,10 @@ data:
- node-role.kubernetes.io/master=
dynamic:
- calico-etcd=enabled
- ceph-mds=enabled
- ceph-mon=enabled
- ceph-osd=enabled
- ceph-mds=enabled
- ceph-rgw=enabled
- kubernetes-apiserver=enabled
- kubernetes-controller-manager=enabled
- kubernetes-etcd=enabled
@ -58,9 +60,10 @@ data:
- node-role.kubernetes.io/master=
dynamic:
- calico-etcd=enabled
- ceph-mds=enabled
- ceph-mon=enabled
- ceph-osd=enabled
- ceph-mds=enabled
- ceph-rgw=enabled
- kubernetes-apiserver=enabled
- kubernetes-controller-manager=enabled
- kubernetes-etcd=enabled
@ -83,9 +86,10 @@ data:
- node-role.kubernetes.io/master=
dynamic:
- calico-etcd=enabled
- ceph-mds=enabled
- ceph-mon=enabled
- ceph-osd=enabled
- ceph-mds=enabled
- ceph-rgw=enabled
- kubernetes-apiserver=enabled
- kubernetes-controller-manager=enabled
- kubernetes-etcd=enabled