v2 - iwhd-conf.js can be removed, was missing from original patch
The default iwhd configuration file now works with RHEV-M.
This makes the RHEV-M specific config file unnecessary.
---
recipes/aeolus/manifests/profiles/rhevm.pp | 13 -------------
recipes/aeolus/templates/iwhd-conf.js | 7 -------
2 files changed, 0 insertions(+), 20 deletions(-)
delete mode 100644 recipes/aeolus/templates/iwhd-conf.js
diff --git a/recipes/aeolus/manifests/profiles/rhevm.pp
b/recipes/aeolus/manifests/profiles/rhevm.pp
index 93d8bad..39680f2 100644
--- a/recipes/aeolus/manifests/profiles/rhevm.pp
+++ b/recipes/aeolus/manifests/profiles/rhevm.pp
@@ -18,11 +18,6 @@ class aeolus::profiles::rhevm {
mode => 755,
require => Package['aeolus-conductor-daemons'] }
- file {"/etc/iwhd/conf.js":
- content => template("aeolus/iwhd-conf.js"),
- mode => 755,
- require => Package['aeolus-conductor-daemons'] }
-
file {"$rhevm_nfs_mount_point":
ensure => 'directory'}
@@ -33,14 +28,6 @@ class aeolus::profiles::rhevm {
options => "rw",
require => File["$rhevm_nfs_mount_point"]}
- # give iwhd a restart to pick up new configuration files
- # in the event iwhd had already initialized at /var/lib/iwhd
- exec { "/sbin/service iwhd restart":
- require => [Service['iwhd'],
- Mount["$rhevm_nfs_mount_point"],
- File["/etc/imagefactory/rhevm.json"],
- File["/etc/iwhd/conf.js"]]}
-
aeolus::create_bucket{"aeolus":}
aeolus::conductor::site_admin{"admin":
diff --git a/recipes/aeolus/templates/iwhd-conf.js
b/recipes/aeolus/templates/iwhd-conf.js
deleted file mode 100644
index d0be7fd..0000000
--- a/recipes/aeolus/templates/iwhd-conf.js
+++ /dev/null
@@ -1,7 +0,0 @@
-[
- {
- "name": "rhevm",
- "type": "fs-rhev-m",
- "path": "/var/lib/iwhd"
- }
-]
--
1.7.6.4