Merge pull request #804 from nimbusscale/calico_manifest_path_fix

aaronlevy · web-flow · commit 2944dff01a8d · 2017-01-12T09:45:29.000-08:00
change calico.yaml path from /etc to /srv
diff --git a/single-node/user-data b/single-node/user-data
@@ -808,7 +808,7 @@ EOF
 }
 EOF
     fi
-    local TEMPLATE=/etc/kubernetes/manifests/calico.yaml
+    local TEMPLATE=/srv/kubernetes/manifests/calico.yaml
     if [ "${USE_CALICO}" = "true" ]; then
     echo "TEMPLATE: $TEMPLATE"
     mkdir -p $(dirname $TEMPLATE)

Original file line number	Diff line number	Diff line change
`@@ -808,7 +808,7 @@ EOF`
`808`	`808`	`}`
`809`	`809`	`EOF`
`810`	`810`	`fi`
`811`		`- local TEMPLATE=/etc/kubernetes/manifests/calico.yaml`
	`811`	`+ local TEMPLATE=/srv/kubernetes/manifests/calico.yaml`
`812`	`812`	`if [ "${USE_CALICO}" = "true" ]; then`
`813`	`813`	`echo "TEMPLATE: $TEMPLATE"`
`814`	`814`	`mkdir -p $(dirname $TEMPLATE)`