openstack
/
magnum
Code Issues Proposed changes

Merge "Added kube_register file which required by configure-kubernetes-minion.sh"

This commit is contained in:
Jenkins 2015-06-01 13:51:07 +00:00 committed by Gerrit Code Review
parent 9a373a48eb 06cfbdd462
commit 2b2970d53b
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
magnum/templates/heat-kubernetes/kubenode-coreos.yaml
View File

@ -130,6 +130,12 @@ resources:
group: ungrouped
config: {get_file: fragments/configure-docker-storage.sh}
kube_register:
type: "OS::Heat::SoftwareConfig"
properties:
group: ungrouped
config: {get_file: fragments/kube-register.yaml}
configure_kubernetes_minion:
type: "OS::Heat::SoftwareConfig"
properties:
@ -182,6 +188,7 @@ resources:
- config: {get_resource: kube_examples}
- config: {get_resource: add_to_docker_group}
- config: {get_resource: configure_docker_storage}
- config: {get_resource: kube_register}
- config: {get_resource: configure_kubernetes_minion}
- config: {get_resource: docker_service}
- config: {get_resource: enable_services}

7
magnum/templates/heat-kubernetes/kubenode-fedora-ironic.yaml
View File

@ -80,6 +80,12 @@ resources:
group: ungrouped
config: {get_file: fragments/add-to-docker-group.sh}
kube_register:
type: "OS::Heat::SoftwareConfig"
properties:
group: ungrouped
config: {get_file: fragments/kube-register.yaml}
configure_kubernetes_minion:
type: "OS::Heat::SoftwareConfig"
properties:
@ -131,6 +137,7 @@ resources:
- config: {get_resource: kube_user}
- config: {get_resource: kube_examples}
- config: {get_resource: add_to_docker_group}
- config: {get_resource: kube_register}
- config: {get_resource: configure_kubernetes_minion}
- config: {get_resource: docker_service}
- config: {get_resource: enable_services}