Skip to content

Instantly share code, notes, and snippets.

@ramielrowe
Created May 7, 2015 16:50
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save ramielrowe/ada727132b2342f1b7a5 to your computer and use it in GitHub Desktop.
Save ramielrowe/ada727132b2342f1b7a5 to your computer and use it in GitHub Desktop.
diff --git a/magnum/templates/heat-kubernetes/kubenode.yaml b/magnum/templates/heat-kubernetes/kubenode.yaml
index 1623a5f..27aa6c3 100644
--- a/magnum/templates/heat-kubernetes/kubenode.yaml
+++ b/magnum/templates/heat-kubernetes/kubenode.yaml
@@ -97,7 +97,6 @@ resources:
"$KUBE_ALLOW_PRIV": {get_param: kube_allow_priv}
"$KUBE_MASTER_IP": {get_param: kube_master_ip}
"$WAIT_HANDLE": {get_resource: node_wait_handle}
- "$DOCKER_VOLUME": {get_resource: docker_volume}
add_to_docker_group:
type: "OS::Heat::SoftwareConfig"
@@ -162,7 +161,6 @@ resources:
- config: {get_resource: kube_user}
- config: {get_resource: kube_examples}
- config: {get_resource: add_to_docker_group}
- - config: {get_resource: configure_docker_storage}
- config: {get_resource: configure_kubernetes_minion}
- config: {get_resource: docker_service}
- config: {get_resource: enable_services}
@@ -203,17 +201,6 @@ resources:
port_id:
get_resource: kube_node_eth0
- docker_volume:
- type: "OS::Cinder::Volume"
- properties:
- size: {get_param: docker_volume_size}
-
- docker_volume_attach:
- type: "OS::Cinder::VolumeAttachment"
- properties:
- instance_uuid: {get_resource: kube_node}
- volume_id: {get_resource: docker_volume}
-
outputs:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment