[PATCH configure] BZ #783220 - change default admin email to 'root at localhost'

John Eckersberg jeckersb at redhat.com
Wed Feb 1 19:40:25 UTC 2012


On Mon, 30 Jan 2012 08:24:44 -0500, Mo Morsi <mmorsi at redhat.com> wrote:
> ---
>  recipes/aeolus/manifests/profiles/conductor.pp |    6 +++---
>  recipes/aeolus/manifests/profiles/custom.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 +++---
>  7 files changed, 21 insertions(+), 21 deletions(-)
> 
> diff --git a/recipes/aeolus/manifests/profiles/conductor.pp b/recipes/aeolus/manifests/profiles/conductor.pp
> index 83e0731..aabd98f 100644
> --- a/recipes/aeolus/manifests/profiles/conductor.pp
> +++ b/recipes/aeolus/manifests/profiles/conductor.pp
> @@ -15,10 +15,10 @@
>  class aeolus::profiles::conductor {
>  
>    aeolus::conductor::site_admin{"admin":
> -     email           => 'dcuser at aeolusproject.org',
> +     email           => 'root at localhost',
>       password        => "password",
> -     first_name      => 'aeolus',
> -     last_name       => 'user'}
> +     first_name      => 'Administrator',
> +     last_name       => ''}
>  
>    aeolus::conductor::login{"admin": password => "password",
>       require  => Aeolus::Conductor::Site_admin['admin']}
> diff --git a/recipes/aeolus/manifests/profiles/custom.pp b/recipes/aeolus/manifests/profiles/custom.pp
> index d87c0fe..fdbe126 100644
> --- a/recipes/aeolus/manifests/profiles/custom.pp
> +++ b/recipes/aeolus/manifests/profiles/custom.pp
> @@ -15,10 +15,10 @@
>  class aeolus::profiles::custom {
>  
>  aeolus::conductor::site_admin{"admin":
> -   email           => 'dcuser at aeolusproject.org',
> +   email           => 'root at localhost',
>     password        => "password",
> -   first_name      => 'aeolus',
> -   last_name       => 'user'}
> +   first_name      => 'Administrator',
> +   last_name       => ''}
>  
>  aeolus::conductor::login{"admin": password => "password",
>     require  => Aeolus::Conductor::Site_admin['admin']}
> diff --git a/recipes/aeolus/manifests/profiles/default.pp b/recipes/aeolus/manifests/profiles/default.pp
> index c3a58cd..8ac8ab3 100644
> --- a/recipes/aeolus/manifests/profiles/default.pp
> +++ b/recipes/aeolus/manifests/profiles/default.pp
> @@ -17,10 +17,10 @@ class aeolus::profiles::default {
>    aeolus::create_bucket{"aeolus":}
>  
>    aeolus::conductor::site_admin{"admin":
> -     email           => 'dcuser at aeolusproject.org',
> +     email           => 'root at localhost',
>       password        => "password",
> -     first_name      => 'aeolus',
> -     last_name       => 'user'}
> +     first_name      => 'Administrator',
> +     last_name       => ''}
>  
>    aeolus::conductor::login{"admin": password => "password",
>       require  => Aeolus::Conductor::Site_admin['admin']}
> diff --git a/recipes/aeolus/manifests/profiles/ec2.pp b/recipes/aeolus/manifests/profiles/ec2.pp
> index 0cec35f..d8f408d 100644
> --- a/recipes/aeolus/manifests/profiles/ec2.pp
> +++ b/recipes/aeolus/manifests/profiles/ec2.pp
> @@ -18,10 +18,10 @@ class aeolus::profiles::ec2 {
>    aeolus::create_bucket{"aeolus":}
>  
>    aeolus::conductor::site_admin{"admin":
> -     email           => 'dcuser at aeolusproject.org',
> +     email           => 'root at localhost',
>       password        => "password",
> -     first_name      => 'aeolus',
> -     last_name       => 'user'}
> +     first_name      => 'Administrator',
> +     last_name       => ''}
>  
>    aeolus::conductor::login{"admin": password => "password",
>       require  => Aeolus::Conductor::Site_admin['admin']}
> diff --git a/recipes/aeolus/manifests/profiles/mock.pp b/recipes/aeolus/manifests/profiles/mock.pp
> index c96a48c..a4b4b83 100644
> --- a/recipes/aeolus/manifests/profiles/mock.pp
> +++ b/recipes/aeolus/manifests/profiles/mock.pp
> @@ -17,10 +17,10 @@ class aeolus::profiles::mock {
>    aeolus::create_bucket{"aeolus":}
>  
>    aeolus::conductor::site_admin{"admin":
> -     email           => 'dcuser at aeolusproject.org',
> +     email           => 'root at localhost',
>       password        => "password",
> -     first_name      => 'aeolus',
> -     last_name       => 'user'}
> +     first_name      => 'Administrator',
> +     last_name       => ''}
>  
>    aeolus::conductor::login{"admin": password => "password",
>       require  => Aeolus::Conductor::Site_admin['admin']}
> diff --git a/recipes/aeolus/manifests/profiles/rhevm.pp b/recipes/aeolus/manifests/profiles/rhevm.pp
> index 0663a47..5322f30 100644
> --- a/recipes/aeolus/manifests/profiles/rhevm.pp
> +++ b/recipes/aeolus/manifests/profiles/rhevm.pp
> @@ -52,10 +52,10 @@ class aeolus::profiles::rhevm {
>    aeolus::create_bucket{"aeolus":}
>  
>    aeolus::conductor::site_admin{"admin":
> -     email           => 'dcuser at aeolusproject.org',
> +     email           => 'root at localhost',
>       password        => "password",
> -     first_name      => 'aeolus',
> -     last_name       => 'user'}
> +     first_name      => 'Administrator',
> +     last_name       => ''}
>  
>    aeolus::conductor::login{"admin": password => "password",
>       require  => Aeolus::Conductor::Site_admin['admin']}
> diff --git a/recipes/aeolus/manifests/profiles/vsphere.pp b/recipes/aeolus/manifests/profiles/vsphere.pp
> index 130a80a..c28e7e1 100644
> --- a/recipes/aeolus/manifests/profiles/vsphere.pp
> +++ b/recipes/aeolus/manifests/profiles/vsphere.pp
> @@ -31,10 +31,10 @@ class aeolus::profiles::vsphere {
>      require => Package['aeolus-conductor-daemons'] }
>  
>    aeolus::conductor::site_admin{"admin":
> -     email           => 'dcuser at aeolusproject.org',
> +     email           => 'root at localhost',
>       password        => "password",
> -     first_name      => 'aeolus',
> -     last_name       => 'user'}
> +     first_name      => 'Administrator',
> +     last_name       => ''}
>  
>    aeolus::conductor::login{"admin": password => "password",
>       require  => Aeolus::Conductor::Site_admin['admin']}
> -- 
> 1.7.6.5
> 

NACK, for a few reasons.

- This doesn't apply and needs rebased due to the changes for BZ#740089
  in 814ae5ed0aacd5aa482b213be339d6470630561d (removing interactive mode
  gets rid of profiles/custom.pp)

- The dc:create_user task requires a last name, and ultimately
  interprets the empty string as nil, causing it to display usage and
  quit

- root at localhost fails email address validation; I'd propose using
  root at localhost.localdomain instead which is accepted



More information about the aeolus-devel mailing list