vsphere.json file was omitted when we moved to profiles.

Starting with imagefactory 0.6.x, json files should be in /etc/imagefactory --- recipes/aeolus/manifests/profiles/rhevm.pp | 2 +- recipes/aeolus/manifests/profiles/vsphere.pp | 5 +++++ recipes/aeolus/templates/vmware.json | 10 ---------- recipes/aeolus/templates/vsphere.json | 10 ++++++++++ 4 files changed, 16 insertions(+), 11 deletions(-) delete mode 100644 recipes/aeolus/templates/vmware.json create mode 100644 recipes/aeolus/templates/vsphere.json

diff --git a/recipes/aeolus/manifests/profiles/rhevm.pp b/recipes/aeolus/manifests/profiles/rhevm.pp index 306729e..47d3e23 100644 --- a/recipes/aeolus/manifests/profiles/rhevm.pp +++ b/recipes/aeolus/manifests/profiles/rhevm.pp @@ -14,7 +14,7 @@

class aeolus::profiles::rhevm {

- file {"/etc/rhevm.json": + file {"/etc/imagefactory/rhevm.json": content => template("aeolus/rhevm.json"), mode => 755, require => Package['aeolus-conductor-daemons'] } diff --git a/recipes/aeolus/manifests/profiles/vsphere.pp b/recipes/aeolus/manifests/profiles/vsphere.pp index c971abc..c85488e 100644 --- a/recipes/aeolus/manifests/profiles/vsphere.pp +++ b/recipes/aeolus/manifests/profiles/vsphere.pp @@ -15,6 +15,11 @@ class aeolus::profiles::vsphere { aeolus::create_bucket{"aeolus":}

+ file {"/etc/imagefactory/vsphere.json": + content => template("aeolus/vsphere.json"), + mode => 755, + require => Package['aeolus-conductor-daemons'] } + aeolus::conductor::site_admin{"admin": email => 'dcuser@aeolusproject.org', password => "password", diff --git a/recipes/aeolus/templates/vmware.json b/recipes/aeolus/templates/vmware.json deleted file mode 100644 index 6f70d62..0000000 --- a/recipes/aeolus/templates/vmware.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "vsphere": - { - "api-url": "https://<%= vsphere_deltacloud_provider %>/sdk", - "username": "<%= vsphere_username %>", - "password": "<%= vsphere_password %>", - "datastore": "<%= vsphere_datastore %>", - "network_name": "<%= vsphere_network_name %>" - } -} diff --git a/recipes/aeolus/templates/vsphere.json b/recipes/aeolus/templates/vsphere.json new file mode 100644 index 0000000..6f70d62 --- /dev/null +++ b/recipes/aeolus/templates/vsphere.json @@ -0,0 +1,10 @@ +{ + "vsphere": + { + "api-url": "https://<%= vsphere_deltacloud_provider %>/sdk", + "username": "<%= vsphere_username %>", + "password": "<%= vsphere_password %>", + "datastore": "<%= vsphere_datastore %>", + "network_name": "<%= vsphere_network_name %>" + } +}