[PATCH configure] BZ #805537 - allow configuration of admin username / password

Mo Morsi mmorsi at redhat.com
Fri Mar 23 13:53:03 UTC 2012


---
 conf/default_configure                         |    2 ++
 conf/ec2_configure                             |    2 ++
 conf/mock_configure                            |    2 ++
 conf/rhevm_configure                           |    2 ++
 conf/vsphere_configure                         |    2 ++
 recipes/aeolus/manifests/conductor.pp          |    2 --
 recipes/aeolus/manifests/init.pp               |    3 +++
 recipes/aeolus/manifests/profiles/conductor.pp |    6 +++---
 recipes/aeolus/manifests/profiles/default.pp   |    6 +++---
 recipes/aeolus/manifests/profiles/ec2.pp       |    6 +++---
 recipes/aeolus/manifests/profiles/mock.pp      |    6 +++---
 recipes/aeolus/manifests/profiles/rhevm.pp     |    6 +++---
 recipes/aeolus/manifests/profiles/vsphere.pp   |    6 +++---
 13 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/conf/default_configure b/conf/default_configure
index db33897..b8a3ca0 100644
--- a/conf/default_configure
+++ b/conf/default_configure
@@ -15,6 +15,8 @@
 #
 ---
 parameters:
+  admin_username: admin
+  admin_password: password
   enable_https: true
   enable_security: false
   package_provider: rpm
diff --git a/conf/ec2_configure b/conf/ec2_configure
index 142887f..69e07fb 100644
--- a/conf/ec2_configure
+++ b/conf/ec2_configure
@@ -1,6 +1,8 @@
 # ec2 setup configuration.
 ---
 parameters:
+  admin_username: admin
+  admin_password: password
   enable_https: true
   enable_security: false
   package_provider: rpm
diff --git a/conf/mock_configure b/conf/mock_configure
index 087c329..3c0df7c 100644
--- a/conf/mock_configure
+++ b/conf/mock_configure
@@ -1,6 +1,8 @@
 # mock setup configuration.
 ---
 parameters:
+  admin_username: admin
+  admin_password: password
   enable_https: true
   enable_security: false
   package_provider: rpm
diff --git a/conf/rhevm_configure b/conf/rhevm_configure
index 6668a33..7c07114 100644
--- a/conf/rhevm_configure
+++ b/conf/rhevm_configure
@@ -1,5 +1,7 @@
 ---
 parameters:
+  admin_username: admin
+  admin_password: password
   enable_https: true
   enable_security: false
   package_provider: rpm
diff --git a/conf/vsphere_configure b/conf/vsphere_configure
index ca5bffe..2450497 100644
--- a/conf/vsphere_configure
+++ b/conf/vsphere_configure
@@ -1,5 +1,7 @@
 ---
 parameters:
+  admin_username: admin
+  admin_password: password
   enable_https: true
   enable_security: false
   package_provider: rpm
diff --git a/recipes/aeolus/manifests/conductor.pp b/recipes/aeolus/manifests/conductor.pp
index f06ae16..dd4c385 100644
--- a/recipes/aeolus/manifests/conductor.pp
+++ b/recipes/aeolus/manifests/conductor.pp
@@ -218,8 +218,6 @@ define aeolus::conductor::login($password){
 define aeolus::conductor::logout(){
   web_request{ "$name-conductor-logout":
     post         => 'https://localhost/conductor/logout',
-    parameters  => { 'login'    => "admin", 'password' => "password",
-                     'commit'                 => 'submit' },
     returns     => '200',
     follow      => true,
     use_cookies_at => "/tmp/aeolus-$name",
diff --git a/recipes/aeolus/manifests/init.pp b/recipes/aeolus/manifests/init.pp
index 9551cc8..a04fe3d 100644
--- a/recipes/aeolus/manifests/init.pp
+++ b/recipes/aeolus/manifests/init.pp
@@ -42,6 +42,9 @@ if $aeolus_enable_security == "true" or $aeolus_enable_security == "1" {
   $enable_security = false
 }
 
+$admin_username = $aeolus_admin_username
+$admin_password = $aeolus_admin_password
+
 # Base aeolus class
 class aeolus {
   package{'curl':
diff --git a/recipes/aeolus/manifests/profiles/conductor.pp b/recipes/aeolus/manifests/profiles/conductor.pp
index 03bef43..a1f743e 100644
--- a/recipes/aeolus/manifests/profiles/conductor.pp
+++ b/recipes/aeolus/manifests/profiles/conductor.pp
@@ -14,13 +14,13 @@
 
 class aeolus::profiles::conductor {
 
-  aeolus::conductor::site_admin{"admin":
+  aeolus::conductor::site_admin{$admin_username:
      email           => 'root at localhost.localdomain',
-     password        => "password",
+     password        => $admin_password,
      first_name      => 'Administrator',
      last_name       => ''}
 
-  aeolus::conductor::login{"admin": password => "password",
+  aeolus::conductor::login{$admin_username: password => $admin_password,
      require  => Aeolus::Conductor::Site_admin['admin']}
 
   aeolus::conductor::provider{"mock":
diff --git a/recipes/aeolus/manifests/profiles/default.pp b/recipes/aeolus/manifests/profiles/default.pp
index 5bb3119..542604e 100644
--- a/recipes/aeolus/manifests/profiles/default.pp
+++ b/recipes/aeolus/manifests/profiles/default.pp
@@ -16,13 +16,13 @@ class aeolus::profiles::default {
 
   aeolus::create_bucket{"aeolus":}
 
-  aeolus::conductor::site_admin{"admin":
+  aeolus::conductor::site_admin{$admin_username:
      email           => 'root at localhost.localdomain',
-     password        => "password",
+     password        => $admin_password,
      first_name      => 'Administrator',
      last_name       => ''}
 
-  aeolus::conductor::login{"admin": password => "password",
+  aeolus::conductor::login{$admin_username: password => $admin_password,
      require  => Aeolus::Conductor::Site_admin['admin']}
 
   aeolus::conductor::hwp{"small-x86_64":
diff --git a/recipes/aeolus/manifests/profiles/ec2.pp b/recipes/aeolus/manifests/profiles/ec2.pp
index 3f63f70..3bfe0c4 100644
--- a/recipes/aeolus/manifests/profiles/ec2.pp
+++ b/recipes/aeolus/manifests/profiles/ec2.pp
@@ -17,13 +17,13 @@ class aeolus::profiles::ec2 {
 
   aeolus::create_bucket{"aeolus":}
 
-  aeolus::conductor::site_admin{"admin":
+  aeolus::conductor::site_admin{$admin_username:
      email           => 'root at localhost.localdomain',
-     password        => "password",
+     password        => $admin_password,
      first_name      => 'Administrator',
      last_name       => ''}
 
-  aeolus::conductor::login{"admin": password => "password",
+  aeolus::conductor::login{$admin_username: password => $admin_password,
      require  => Aeolus::Conductor::Site_admin['admin']}
 
   aeolus::conductor::provider{"ec2-us-east-1":
diff --git a/recipes/aeolus/manifests/profiles/mock.pp b/recipes/aeolus/manifests/profiles/mock.pp
index c68829c..9135d5c 100644
--- a/recipes/aeolus/manifests/profiles/mock.pp
+++ b/recipes/aeolus/manifests/profiles/mock.pp
@@ -16,13 +16,13 @@ class aeolus::profiles::mock {
 
   aeolus::create_bucket{"aeolus":}
 
-  aeolus::conductor::site_admin{"admin":
+  aeolus::conductor::site_admin{$admin_username:
      email           => 'root at localhost.localdomain',
-     password        => "password",
+     password        => $admin_password,
      first_name      => 'Administrator',
      last_name       => ''}
 
-  aeolus::conductor::login{"admin": password => "password",
+  aeolus::conductor::login{$admin_username: password => $admin_password,
      require  => Aeolus::Conductor::Site_admin['admin']}
 
   aeolus::conductor::provider{"mock":
diff --git a/recipes/aeolus/manifests/profiles/rhevm.pp b/recipes/aeolus/manifests/profiles/rhevm.pp
index 547d7a9..94e5ea1 100644
--- a/recipes/aeolus/manifests/profiles/rhevm.pp
+++ b/recipes/aeolus/manifests/profiles/rhevm.pp
@@ -24,13 +24,13 @@ class aeolus::profiles::rhevm ($instances) {
 
   aeolus::create_bucket{"aeolus":}
 
-  aeolus::conductor::site_admin{"admin":
+  aeolus::conductor::site_admin{$admin_username:
      email           => 'root at localhost.localdomain',
-     password        => "password",
+     password        => $admin_password,
      first_name      => 'Administrator',
      last_name       => ''}
 
-  aeolus::conductor::login{"admin": password => "password",
+  aeolus::conductor::login{$admin_username: password => $admin_password,
      require  => Aeolus::Conductor::Site_admin['admin']}
 
   aeolus::conductor::hwp{"small-x86_64":
diff --git a/recipes/aeolus/manifests/profiles/vsphere.pp b/recipes/aeolus/manifests/profiles/vsphere.pp
index dcca15b..74258d5 100644
--- a/recipes/aeolus/manifests/profiles/vsphere.pp
+++ b/recipes/aeolus/manifests/profiles/vsphere.pp
@@ -24,13 +24,13 @@ class aeolus::profiles::vsphere ($instances) {
     mode => 640,
     require => Package['aeolus-conductor-daemons'] }
 
-  aeolus::conductor::site_admin{"admin":
+  aeolus::conductor::site_admin{$admin_username:
      email           => 'root at localhost.localdomain',
-     password        => "password",
+     password        => $admin_password,
      first_name      => 'Administrator',
      last_name       => ''}
 
-  aeolus::conductor::login{"admin": password => "password",
+  aeolus::conductor::login{$admin_username: password => $admin_password,
      require  => Aeolus::Conductor::Site_admin['admin']}
 
   aeolus::conductor::hwp{"small-x86_64":
-- 
1.7.6.5




More information about the aeolus-devel mailing list