Merge pull request #76 from liu-sheng/xtrace-plugin

dims · web-flow · commit 6d1ddef72513 · 2018-02-11T14:55:37.000-05:00
Cluster installation inherit the xtrace setting from devstack plugin
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
@@ -130,7 +130,7 @@ function install_k8s_cloud_provider {
     $SYSTEMCTL stop $ETCD_SYSTEMD_SERVICE
 
     # local-up-cluster.sh compiles everything from source and starts the services.
-    sudo -E PATH=$PATH ./hack/local-up-cluster.sh
+    sudo -E PATH=$PATH SHELLOPTS=$SHELLOPTS ./hack/local-up-cluster.sh
 
     popd >/dev/null
 }

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ function install_k8s_cloud_provider {`
`130`	`130`	`$SYSTEMCTL stop $ETCD_SYSTEMD_SERVICE`
`131`	`131`
`132`	`132`	`# local-up-cluster.sh compiles everything from source and starts the services.`
`133`		`- sudo -E PATH=$PATH ./hack/local-up-cluster.sh`
	`133`	`+ sudo -E PATH=$PATH SHELLOPTS=$SHELLOPTS ./hack/local-up-cluster.sh`
`134`	`134`
`135`	`135`	`popd >/dev/null`
`136`	`136`	`}`