Merge branch 'master' of https://github.com/goodrain/rainbond into githubmaster

This commit is contained in:
Bay 2017-12-26 15:02:24 +08:00
commit 0bee99c65a

View File

@ -365,7 +365,7 @@ func (n *NodeCluster) checkNodeInstall(node *model.HostNode) {
etcd = strings.Join(etcdConfig.Value.([]string), ",") etcd = strings.Join(etcdConfig.Value.([]string), ",")
} }
} }
initshell := "dev.repo.goodrain.com/gaops/jobs/install/prepare/init.sh" initshell := "repo.goodrain.com/gaops/jobs/install/prepare/init.sh"
etcd = etcd + "," etcd = etcd + ","
cmd := fmt.Sprintf("bash -c \"set %s %s %s;$(curl -s %s)\"", node.ID, etcd, role, initshell) cmd := fmt.Sprintf("bash -c \"set %s %s %s;$(curl -s %s)\"", node.ID, etcd, role, initshell)
logrus.Infof("init endpoint node cmd is %s", cmd) logrus.Infof("init endpoint node cmd is %s", cmd)