Merge "Correct the get_file patch in CoreOS template"
This commit is contained in:
commit
a4aa5bf109
|
@ -238,73 +238,73 @@ resources:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
properties:
|
properties:
|
||||||
group: ungrouped
|
group: ungrouped
|
||||||
config: {get_file: fragments/configure-etcds.yaml}
|
config: {get_file: fragments/configure-etcd.yaml}
|
||||||
|
|
||||||
make_cert:
|
make_cert:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
properties:
|
properties:
|
||||||
group: ungrouped
|
group: ungrouped
|
||||||
config: {get_file: fragments/make-certs.yaml}
|
config: {get_file: fragments/make-cert.yaml}
|
||||||
|
|
||||||
write_network_config:
|
write_network_config:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
properties:
|
properties:
|
||||||
group: ungrouped
|
group: ungrouped
|
||||||
config: {get_file: fragments/write-network-configs.yaml}
|
config: {get_file: fragments/write-network-config.yaml}
|
||||||
|
|
||||||
enable_network_service:
|
enable_network_service:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
properties:
|
properties:
|
||||||
group: ungrouped
|
group: ungrouped
|
||||||
config: {get_file: fragments/enable-network-services.yaml}
|
config: {get_file: fragments/enable-network-service.yaml}
|
||||||
|
|
||||||
enable_kubelet:
|
enable_kubelet:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
properties:
|
properties:
|
||||||
group: ungrouped
|
group: ungrouped
|
||||||
config: {get_file: fragments/enable-kubelet-masters.yaml}
|
config: {get_file: fragments/enable-kubelet-master.yaml}
|
||||||
|
|
||||||
enable_kube_apiserver:
|
enable_kube_apiserver:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
properties:
|
properties:
|
||||||
group: ungrouped
|
group: ungrouped
|
||||||
config: {get_file: fragments/enable-kube-apiservers.yaml}
|
config: {get_file: fragments/enable-kube-apiserver.yaml}
|
||||||
|
|
||||||
create_kube_namespace:
|
create_kube_namespace:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
properties:
|
properties:
|
||||||
group: ungrouped
|
group: ungrouped
|
||||||
config: {get_file: fragments/create-kube-namespaces.yaml}
|
config: {get_file: fragments/create-kube-namespace.yaml}
|
||||||
|
|
||||||
enable_kube_proxy:
|
enable_kube_proxy:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
properties:
|
properties:
|
||||||
group: ungrouped
|
group: ungrouped
|
||||||
config: {get_file: fragments/enable-kube-proxy-masters.yaml}
|
config: {get_file: fragments/enable-kube-proxy-master.yaml}
|
||||||
|
|
||||||
enable_kube_controller_manager:
|
enable_kube_controller_manager:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
properties:
|
properties:
|
||||||
group: ungrouped
|
group: ungrouped
|
||||||
config: {get_file: fragments/enable-kube-controller-managers.yaml}
|
config: {get_file: fragments/enable-kube-controller-manager.yaml}
|
||||||
|
|
||||||
enable_kube_scheduler:
|
enable_kube_scheduler:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
properties:
|
properties:
|
||||||
group: ungrouped
|
group: ungrouped
|
||||||
config: {get_file: fragments/enable-kube-schedulers.yaml}
|
config: {get_file: fragments/enable-kube-scheduler.yaml}
|
||||||
|
|
||||||
enable_kube_podmaster:
|
enable_kube_podmaster:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
properties:
|
properties:
|
||||||
group: ungrouped
|
group: ungrouped
|
||||||
config: {get_file: fragments/enable-kube-podmasters.yaml}
|
config: {get_file: fragments/enable-kube-podmaster.yaml}
|
||||||
|
|
||||||
wc_notify:
|
wc_notify:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
properties:
|
properties:
|
||||||
group: ungrouped
|
group: ungrouped
|
||||||
config: {get_file: fragments/wc-notifys.yaml}
|
config: {get_file: fragments/wc-notify.yaml}
|
||||||
|
|
||||||
kube_master_init:
|
kube_master_init:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
|
|
|
@ -164,37 +164,37 @@ resources:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
properties:
|
properties:
|
||||||
group: ungrouped
|
group: ungrouped
|
||||||
config: {get_file: fragments/write-kubeconfigs.yaml}
|
config: {get_file: fragments/write-kubeconfig.yaml}
|
||||||
|
|
||||||
make_cert:
|
make_cert:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
properties:
|
properties:
|
||||||
group: ungrouped
|
group: ungrouped
|
||||||
config: {get_file: fragments/make-cert-clients.yaml}
|
config: {get_file: fragments/make-cert-client.yaml}
|
||||||
|
|
||||||
enable_network_service:
|
enable_network_service:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
properties:
|
properties:
|
||||||
group: ungrouped
|
group: ungrouped
|
||||||
config: {get_file: fragments/enable-network-services.yaml}
|
config: {get_file: fragments/enable-network-service.yaml}
|
||||||
|
|
||||||
enable_kubelet:
|
enable_kubelet:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
properties:
|
properties:
|
||||||
group: ungrouped
|
group: ungrouped
|
||||||
config: {get_file: fragments/enable-kubelet-minions.yaml}
|
config: {get_file: fragments/enable-kubelet-minion.yaml}
|
||||||
|
|
||||||
enable_kube_proxy:
|
enable_kube_proxy:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
properties:
|
properties:
|
||||||
group: ungrouped
|
group: ungrouped
|
||||||
config: {get_file: fragments/enable-kube-proxy-minions.yaml}
|
config: {get_file: fragments/enable-kube-proxy-minion.yaml}
|
||||||
|
|
||||||
wc_notify:
|
wc_notify:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
properties:
|
properties:
|
||||||
group: ungrouped
|
group: ungrouped
|
||||||
config: {get_file: fragments/wc-notifys.yaml}
|
config: {get_file: fragments/wc-notify.yaml}
|
||||||
|
|
||||||
kube_minion_init:
|
kube_minion_init:
|
||||||
type: OS::Heat::SoftwareConfig
|
type: OS::Heat::SoftwareConfig
|
||||||
|
|
Loading…
Reference in New Issue