To support data centers, the RHEVM provider URL is now in this form:
https://rhevm-rest-api-server:port/api;datacenter-uuid
Removed rhevm_deltacloud_provider configuration parameter and replaced
it with rhevm_deltacloud_api which represents the url to the REST API
and with rhevm_deltacloud_data_center which represents the data center
uuid.
In the example above,
rhevm_deltacloud_api =
https://rhevm-rest-api-server:port/api
rhevm_deltacloud_data_center = datacenter-uuid
---
conf/rhevm_configure | 3 ++-
recipes/aeolus/manifests/profiles/rhevm.pp | 7 ++++---
recipes/aeolus/templates/rhevm.json | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/conf/rhevm_configure b/conf/rhevm_configure
index 860c079..d352bed 100644
--- a/conf/rhevm_configure
+++ b/conf/rhevm_configure
@@ -10,7 +10,8 @@ parameters:
# rhevm_nfs_mount_point: /mnt/rhevm-nfs
# rhevm_deltacloud_username: username@fqdn
# rhevm_deltacloud_password: password
-# rhevm_deltacloud_provider:
https://rhevm.server.com:8443/api
+# rhevm_deltacloud_api:
https://rhevm.server.com:8443/api
+# rhevm_deltacloud_data_center: data center uuid
# rhevm_push_timeout: 1800
classes:
- aeolus::conductor
diff --git a/recipes/aeolus/manifests/profiles/rhevm.pp
b/recipes/aeolus/manifests/profiles/rhevm.pp
index 942fef1..eddba26 100644
--- a/recipes/aeolus/manifests/profiles/rhevm.pp
+++ b/recipes/aeolus/manifests/profiles/rhevm.pp
@@ -18,7 +18,8 @@ class aeolus::profiles::rhevm {
"rhevm_nfs_mount_point",
"rhevm_deltacloud_username",
"rhevm_deltacloud_password",
- "rhevm_deltacloud_provider",
+ "rhevm_deltacloud_api",
+ "rhevm_deltacloud_data_center",
"rhevm_push_timeout")
if $missing {
@@ -31,7 +32,7 @@ class aeolus::profiles::rhevm {
require => Package['aeolus-conductor-daemons'] }
web_request{ "rhevm-check-export-path-is-export-type":
- get =>
"$rhevm_deltacloud_provider/storagedomains?search=export",
+ get => "$rhevm_deltacloud_api/storagedomains?search=export",
username => "$rhevm_deltacloud_username",
password => "$rhevm_deltacloud_password",
returns => '200',
@@ -62,7 +63,7 @@ class aeolus::profiles::rhevm {
aeolus::conductor::provider{"rhevm":
deltacloud_driver => "rhevm",
url => "http://localhost:3002/api",
- deltacloud_provider => "$rhevm_deltacloud_provider",
+ deltacloud_provider =>
"$rhevm_deltacloud_api;$rhevm_deltacloud_data_center",
require => Aeolus::Conductor::Login["admin"] }
aeolus::conductor::provider::account{"rhevm":
diff --git a/recipes/aeolus/templates/rhevm.json b/recipes/aeolus/templates/rhevm.json
index 6f79ccd..14d1009 100644
--- a/recipes/aeolus/templates/rhevm.json
+++ b/recipes/aeolus/templates/rhevm.json
@@ -5,7 +5,7 @@
"nfs-dir": "<%= rhevm_nfs_mount_point %>",
"nfs-path": "<%= rhevm_nfs_export %>",
"nfs-host": "<%= rhevm_nfs_server %>",
- "api-url": "<%= rhevm_deltacloud_provider %>",
+ "api-url": "<%= rhevm_deltacloud_api %>",
"password": "<%= rhevm_deltacloud_password %>",
"cluster": "_any_",
"timeout": <%= rhevm_push_timeout %>
--
1.7.6.5