[PATCH configure] RM 2879 - Fix adding provider accounts through aeolus-configure

Updated provider accounts create url. Syntax fixes for rhevm and vsphere credential values. This patch is dependent on a conductor patch that will allow creating provider accounts using a provider name instead of an id. --- recipes/aeolus/manifests/conductor.pp | 2 +- recipes/aeolus/manifests/profiles/rhevm.pp | 4 ++-- recipes/aeolus/manifests/profiles/vsphere.pp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes/aeolus/manifests/conductor.pp b/recipes/aeolus/manifests/conductor.pp index 3eba07f..11acb0d 100644 --- a/recipes/aeolus/manifests/conductor.pp +++ b/recipes/aeolus/manifests/conductor.pp @@ -234,7 +234,7 @@ define aeolus::conductor::provider($deltacloud_driver="",$url="", $deltacloud_pr define aeolus::conductor::provider::account($provider="", $type="", $username="",$password="", $account_id="",$x509private="", $x509public=""){ if $type != "ec2" { web_request{ "provider-account-$name": - post => "https://localhost/conductor/provider_accounts", + post => "https://localhost/conductor/providers/0/provider_accounts", parameters => { 'provider_account[label]' => $name, 'provider_account[provider]' => $provider, 'provider_account[credentials_hash[username]]' => $username, diff --git a/recipes/aeolus/manifests/profiles/rhevm.pp b/recipes/aeolus/manifests/profiles/rhevm.pp index 39680f2..149542e 100644 --- a/recipes/aeolus/manifests/profiles/rhevm.pp +++ b/recipes/aeolus/manifests/profiles/rhevm.pp @@ -48,8 +48,8 @@ class aeolus::profiles::rhevm { aeolus::conductor::provider::account{"rhevm": provider => 'rhevm', type => 'rhevm', - username => '$rhevm_deltacloud_username', - password => '$rhevm_deltacloud_password', + username => "$rhevm_deltacloud_username", + password => "$rhevm_deltacloud_password", require => Aeolus::Conductor::Provider["rhevm"] } aeolus::conductor::hwp{"hwp1": diff --git a/recipes/aeolus/manifests/profiles/vsphere.pp b/recipes/aeolus/manifests/profiles/vsphere.pp index 1715181..0d511bf 100644 --- a/recipes/aeolus/manifests/profiles/vsphere.pp +++ b/recipes/aeolus/manifests/profiles/vsphere.pp @@ -38,8 +38,8 @@ class aeolus::profiles::vsphere { aeolus::conductor::provider::account{"vsphere": provider => 'vsphere', type => 'vsphere', - username => '$vsphere_username', - password => '$vsphere_password', + username => "$vsphere_username", + password => "$vsphere_password", require => Aeolus::Conductor::Provider["vsphere"] } aeolus::conductor::hwp{"hwp1": -- 1.7.6.4