environs, juju: require admin-secret

environs/dummy/environs.go

Index: environs/dummy/environs.go
=== modified file 'environs/dummy/environs.go'
--- environs/dummy/environs.go	2012-10-15 14:42:04 +0000
+++ environs/dummy/environs.go	2012-10-16 17:27:11 +0000
@@ -379,6 +379,10 @@
 	if err := e.checkBroken("Bootstrap"); err != nil {
 		return err
 	}
+	password := e.Config().AdminSecret()
+	if password == "" {
+		return fmt.Errorf("admin-secret is required for bootstrap")
+	}
 	var tools *state.Tools
 	var err error
 	if uploadTools {
@@ -409,10 +413,8 @@
 		if err != nil {
 			panic(err)
 		}
-		if password := e.Config().AdminSecret(); password != "" {
-			if err := st.SetAdminPassword(trivial.PasswordHash(password)); err != nil {
-				return err
-			}
+		if err := st.SetAdminPassword(trivial.PasswordHash(password)); err != nil {
+			return err
 		}
 		if err := st.Close(); err != nil {
 			panic(err)