Merge branch 'master' of github.com:coreos/coreos-cloudinit

Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>

config/config_test.go

@@ -375,6 +375,7 @@ users:
     no_user_group: true
     system: y
     no_log_init: True
+    shell: /bin/sh
 `
 	cfg, err := NewCloudConfig(contents)
 	if err != nil {
@@ -442,6 +443,10 @@ users:
 	if !user.NoLogInit {
 		t.Errorf("Failed to parse no_log_init field")
 	}
+
+	if user.Shell != "/bin/sh" {
+		t.Errorf("Failed to parse shell field, got %q", user.Shell)
+	}
 }
 
 func TestCloudConfigUsersGithubUser(t *testing.T) {

config/user.go

@@ -30,4 +30,5 @@ type User struct {
 	System               bool     `yaml:"system"`
 	NoLogInit            bool     `yaml:"no_log_init"`
 	LockPasswd           bool     `yaml:"lock_passwd"`
+	Shell                string   `yaml:"shell"`
 }