Skip to content

Update script #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
3 commits merged into from
Jun 19, 2018
Merged

Update script #6

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d220e1f
Update the configs
Jun 19, 2018
11ebe6b
master it
Jun 19, 2018
681c652
Merge branch 'dev' into DG-452
Jun 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 21 additions & 17 deletions google-cloud-spawn-vms/spawn-nodes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ func main() {
MachineType: "f1-micro",
Tags: "disgo-node",
NamePrefix: namePrefix + "-seed",
ScriptConfigURL: "https://raw.githubusercontent.com/dispatchlabs/samples/DG-484/google-cloud-spawn-vms",
ScriptConfigURL: "https://raw.githubusercontent.com/dispatchlabs/samples/dev/google-cloud-spawn-vms",
ScriptConfigFile: "vm-debian9-configure.sh",
CodeBranch: "DG-484",
CodeBranch: "master",
},
types.Config{
HttpEndpoint: &types.Endpoint{"0.0.0.0", 1975},
GrpcEndpoint: &types.Endpoint{"0.0.0.0", 1973},
HttpEndpoint: &types.Endpoint{Host: "0.0.0.0", Port: 1975},
GrpcEndpoint: &types.Endpoint{Host: "0.0.0.0", Port: 1973},
GrpcTimeout: 5,
UseQuantumEntropy: false,
SeedEndpoints: []*types.Endpoint{},
Expand All @@ -67,13 +67,13 @@ func main() {
MachineType: "f1-micro",
Tags: "disgo-node",
NamePrefix: namePrefix + "-delegate",
ScriptConfigURL: "https://raw.githubusercontent.com/dispatchlabs/samples/DG-484/google-cloud-spawn-vms",
ScriptConfigURL: "https://raw.githubusercontent.com/dispatchlabs/samples/dev/google-cloud-spawn-vms",
ScriptConfigFile: "vm-debian9-configure.sh",
CodeBranch: "DG-484",
CodeBranch: "master",
},
types.Config{
HttpEndpoint: &types.Endpoint{"0.0.0.0", 1975},
GrpcEndpoint: &types.Endpoint{"0.0.0.0", 1973},
HttpEndpoint: &types.Endpoint{Host: "0.0.0.0", Port: 1975},
GrpcEndpoint: &types.Endpoint{Host: "0.0.0.0", Port: 1973},
GrpcTimeout: 5,
UseQuantumEntropy: false,
SeedEndpoints: seedEndpoints,
Expand All @@ -84,8 +84,6 @@ func main() {

var delegateEndpoints = getEndpoints(delegatesCount, namePrefix+"-delegate")

//Need to update the delegates with list of endpoints for all the other delegate endpoints

// Create NODEs
createVMs(
nodesCount,
Expand All @@ -95,13 +93,13 @@ func main() {
MachineType: "f1-micro",
Tags: "disgo-node",
NamePrefix: namePrefix + "-node",
ScriptConfigURL: "https://raw.githubusercontent.com/dispatchlabs/samples/DG-484/google-cloud-spawn-vms",
ScriptConfigURL: "https://raw.githubusercontent.com/dispatchlabs/samples/dev/google-cloud-spawn-vms",
ScriptConfigFile: "vm-debian9-configure.sh",
CodeBranch: "DG-484",
CodeBranch: "master",
},
types.Config{
HttpEndpoint: &types.Endpoint{"0.0.0.0", 1975},
GrpcEndpoint: &types.Endpoint{"0.0.0.0", 1973},
HttpEndpoint: &types.Endpoint{Host: "0.0.0.0", Port: 1975},
GrpcEndpoint: &types.Endpoint{Host: "0.0.0.0", Port: 1973},
GrpcTimeout: 5,
UseQuantumEntropy: false,
SeedEndpoints: seedEndpoints,
Expand Down Expand Up @@ -179,8 +177,14 @@ func createVMs(count int, vmsConfig VMsConfig, disgoConfig types.Config) {
exec.Command(osc, ose, cmd).Run()
}

//disgoConfig.NodeId = vmName
//disgoConfig.NodeIp = getVMIP(vmName)
disgoConfig.GrpcEndpoint.Host = getVMIP(vmName)
disgoConfig.DelegateEndpoints = append(
disgoConfig.DelegateEndpoints,
&types.Endpoint{
Host: disgoConfig.GrpcEndpoint.Host,
Port: disgoConfig.GrpcEndpoint.Port,
},
)

// Save JSON config to a temp file then upload that file to the VM
var configFileName = randString(20) + ".json"
Expand Down Expand Up @@ -231,7 +235,7 @@ func getEndpoints(count int, namePrefix string) []*types.Endpoint {

var ip = getVMIP(vmName)
if ip != "" {
seedList = append(seedList, &types.Endpoint{ip, 1973})
seedList = append(seedList, &types.Endpoint{Host: ip, Port: 1973})
}
}
return seedList
Expand Down