This repository has been archived by the owner on Sep 26, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2k
Issue #1947 CoreOS provisioner does not properly bootstrap etcd #1971
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,6 +20,32 @@ const ( | |
|
||
hostname: %s | ||
EOF | ||
` | ||
|
||
cloudConfigTmpl = `sudo tee /var/tmp/cloudinit.yml << EOF | ||
#cloud-config | ||
|
||
coreos: | ||
etcd: | ||
discovery: {{.Token}} | ||
addr: {{.IP}}:4001 | ||
peer-addr: {{.IP}}:7001 | ||
# give etcd more time if it's under heavy load - prevent leader election thrashing | ||
peer-election-timeout: 4000 | ||
# heartbeat interval should ideally be 1/4 or 1/5 of peer election timeout | ||
peer-heartbeat-interval: 1000 | ||
# don't keep all day in memory | ||
snapshot: true | ||
fleet: | ||
public-ip: {{.IP}} | ||
# allow etcd to slow down at times | ||
etcd-request-timeout: 15 | ||
units: | ||
- name: etcd.service | ||
command: start | ||
- name: fleet.service | ||
command: start | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why are you starting fleet? |
||
EOF | ||
` | ||
) | ||
|
||
|
@@ -80,6 +106,43 @@ func (provisioner *CoreOSProvisioner) SetHostname(hostname string) error { | |
return nil | ||
} | ||
|
||
func (provisioner *CoreOSProvisioner) SetCloudInit(hostname string) error { | ||
log.Debugf("SetCloudInit: %s", hostname) | ||
|
||
ip, err := provisioner.Driver.GetIP() | ||
if err != nil { | ||
log.Fatalf("Could not get IP address for created machine: %s", err) | ||
} | ||
|
||
token, err := provisioner.SSHCommand("curl -sSL https://discovery.etcd.io/new?size=3") | ||
if err != nil { | ||
return err | ||
} | ||
|
||
data := map[string]interface{}{ | ||
"IP": ip, | ||
"HostName": hostname, | ||
"Token": token, | ||
} | ||
|
||
t := template.Must(template.New("cloudinit").Parse(cloudConfigTmpl)) | ||
buf := &bytes.Buffer{} | ||
if err := t.Execute(buf, data); err != nil { | ||
panic(err) | ||
} | ||
cloudConfigTmpl := buf.String() | ||
|
||
if _, err := provisioner.SSHCommand(cloudConfigTmpl); err != nil { | ||
return err | ||
} | ||
|
||
if _, err := provisioner.SSHCommand("sudo systemctl start system-cloudinit@var-tmp-cloudinit.yml.service"); err != nil { | ||
return err | ||
} | ||
|
||
return nil | ||
} | ||
|
||
func (provisioner *CoreOSProvisioner) GenerateDockerOptions(dockerPort int) (*DockerOptions, error) { | ||
var ( | ||
engineCfg bytes.Buffer | ||
|
@@ -137,6 +200,10 @@ func (provisioner *CoreOSProvisioner) Provision(swarmOptions swarm.SwarmOptions, | |
return err | ||
} | ||
|
||
if err := provisioner.SetCloudInit(provisioner.Driver.GetMachineName()); err != nil { | ||
return err | ||
} | ||
|
||
if err := makeDockerOptionsDir(provisioner); err != nil { | ||
return err | ||
} | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you need to use etcd2