unistack-org/cloudinit
4
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2 from bcwaldon/custom-ssh-identity

Browse Source 
feat(ssh): Set custom name for ssh identity
This commit is contained in:
Brian Waldon 2014-03-05 14:50:51 -08:00
commit 840b1dfb6e
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -15,6 +15,9 @@ Only a subset of [cloud-config functionality][cloud-config] is implemented. A se
Provided public SSH keys will be authorized for the `core` user.
The keys will be named "coreos-cloudinit" by default.
Override this with the `--ssh-key-name` flag when calling `coreos-cloudinit`.
### Custom cloud-config Parameters
#### coreos.etcd.discovery_url

6
cloudinit/cloud_config.go
View File

@ -6,6 +6,8 @@ import (
"launchpad.net/goyaml"
)
const DefaultSSHKeyName = "coreos-cloudinit"
type CloudConfig struct {
SSH_Authorized_Keys []string
Coreos struct{Etcd struct{ Discovery_URL string }; Fleet struct{ Autostart bool } }
@ -26,9 +28,9 @@ func (cc CloudConfig) String() string {
}
}
func ResolveCloudConfig(cfg CloudConfig) error {
func ApplyCloudConfig(cfg CloudConfig, sshKeyName string) error {
if len(cfg.SSH_Authorized_Keys) > 0 {
err := AuthorizeSSHKeys(cfg.SSH_Authorized_Keys)
err := AuthorizeSSHKeys(sshKeyName, cfg.SSH_Authorized_Keys)
if err == nil {
log.Printf("Authorized SSH keys for core user")
} else {

4
cloudinit/ssh_key.go
View File

@ -10,7 +10,7 @@ import (
// Add the provide SSH public key to the core user's list of
// authorized keys
func AuthorizeSSHKeys(keys []string) error {
func AuthorizeSSHKeys(name string, keys []string) error {
for i, key := range keys {
keys[i] = strings.TrimSpace(key)
}
@ -19,7 +19,7 @@ func AuthorizeSSHKeys(keys []string) error {
// also ends with a newline
joined := fmt.Sprintf("%s\n", strings.Join(keys, "\n"))
cmd := exec.Command("update-ssh-keys", "-u", "core", "-a", "coreos-cloudinit")
cmd := exec.Command("update-ssh-keys", "-u", "core", "-a", name)
stdin, err := cmd.StdinPipe()
if err != nil {
return err

5
coreos-cloudinit.go
View File

@ -28,6 +28,9 @@ func main() {
var workspace string
flag.StringVar(&workspace, "workspace", "/var/lib/coreos-cloudinit", "Base directory coreos-cloudinit should use to store data")
var sshKeyName string
flag.StringVar(&sshKeyName, "ssh-key-name", cloudinit.DefaultSSHKeyName, "Add SSH keys to the system with the given name")
flag.Parse()
if printVersion == true {
@ -70,7 +73,7 @@ func main() {
switch t := parsed.(type) {
case cloudinit.CloudConfig:
err = cloudinit.ResolveCloudConfig(t)
err = cloudinit.ApplyCloudConfig(t, sshKeyName)
case cloudinit.Script:
var path string
path, err = cloudinit.PersistScriptInWorkspace(t, workspace)