docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2501 from fsoppelsa/2478-sanitizekey 

Sanitize keynames by replacing dots with underscores
This commit is contained in:
Jean-Laurent de Morlhon 2015-12-07 09:41:34 +01:00
parent ff54bf1b0c 6e43436a3d
commit 760e814d43
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/openstack/openstack.go
View File

@ -576,6 +576,7 @@ func (d *Driver) initNetwork() error {
} }
func (d *Driver) createSSHKey() error { func (d *Driver) createSSHKey() error {
sanitizeKeyPairName(&d.KeyPairName)
log.WithField("Name", d.KeyPairName).Debug("Creating Key Pair...") log.WithField("Name", d.KeyPairName).Debug("Creating Key Pair...")
if err := ssh.GenerateSSHKey(d.GetSSHKeyPath()); err != nil { if err := ssh.GenerateSSHKey(d.GetSSHKeyPath()); err != nil {
return err return err
@ -685,3 +686,7 @@ func (d *Driver) lookForIPAddress() error {
func (d *Driver) publicSSHKeyPath() string { func (d *Driver) publicSSHKeyPath() string {
return d.GetSSHKeyPath() + ".pub" return d.GetSSHKeyPath() + ".pub"
} }
func sanitizeKeyPairName(s *string) {
*s = strings.Replace(*s, ".", "_", -1)
}