---
conf/default_cleanup | 6 ++++++
conf/default_configure | 11 +++++++++++
conf/rhevm_cleanup | 15 ---------------
conf/rhevm_configure | 26 --------------------------
4 files changed, 17 insertions(+), 41 deletions(-)
delete mode 100644 conf/rhevm_cleanup
delete mode 100644 conf/rhevm_configure
diff --git a/conf/default_cleanup b/conf/default_cleanup
index 36f3521..5a5ce55 100644
--- a/conf/default_cleanup
+++ b/conf/default_cleanup
@@ -9,8 +9,14 @@
parameters:
enable_https: true
enable_security: false
+# Uncomment these to clean up RHEV
+# rhevm_nfs_server:
nfs.server.com
+# rhevm_nfs_export: /export/export_domain
+# rhevm_nfs_mount_point: /mnt/rhevm-nfs
classes:
- aeolus::conductor::disabled
- aeolus::iwhd::disabled
- aeolus::image-factory::disabled
- aeolus::conductor::remove_seed_data
+# Uncomment this to clean up RHEV details
+#- aeolus::rhevm::disabled
diff --git a/conf/default_configure b/conf/default_configure
index fb89277..d60b11a 100644
--- a/conf/default_configure
+++ b/conf/default_configure
@@ -16,8 +16,19 @@
parameters:
enable_https: true
enable_security: false
+# Uncomment this section and provide reasonable values to
+# enable RHEV values to be populated.
+# rhevm_nfs_server:
nfs.server.com
+# rhevm_nfs_export: /export/export_domain
+# rhevm_nfs_mount_point: /mnt/rhevm-nfs
+# rhevm_deltacloud_port: 3005
+# rhevm_deltacloud_username: username@fqdn
+# rhevm_deltacloud_password: password
+# rhevm_deltacloud_powershell_url:
https://rhevm.server.com:8543/rhevm-api-powershell
classes:
- aeolus::conductor
- aeolus::image-factory
- aeolus::iwhd
- aeolus::conductor::seed_data
+# Uncomment this section to include rhev setup
+#- aeolus::rhevm
diff --git a/conf/rhevm_cleanup b/conf/rhevm_cleanup
deleted file mode 100644
index a43d991..0000000
--- a/conf/rhevm_cleanup
+++ /dev/null
@@ -1,15 +0,0 @@
-#RHEV-M-only cleanup specification
-
-#You can override the default behavior
-#by renaming this to <fqdn>_cleanup.
-#This will result in only iwhd being
-#disabled
----
-parameters:
- enable_https: true
- enable_security: false
- rhevm_nfs_server:
nfs.server.com
- rhevm_nfs_export: /export/export_domain
- rhevm_nfs_mount_point: /mnt/rhevm-nfs
-classes:
-- aeolus::rhevm::disabled
diff --git a/conf/rhevm_configure b/conf/rhevm_configure
deleted file mode 100644
index 8e6e601..0000000
--- a/conf/rhevm_configure
+++ /dev/null
@@ -1,26 +0,0 @@
-#RHEV-M-only setup configuration.
-
-#renaming this file to <fqdn>_configure will
-#make it override the default configure everything
-#behavior with the behavior below to only set up
-#iwhd
-
-#NOTE: Although this suggests the components
-#can be deployed on individual boxes. This will likely
-#become a common practice, but be advised that currently
-#apart from https on the web server for conductor, you should
-#consider intermachine communications insecure. Securing
-#intermachine service calls is on the roadmap.
----
-parameters:
- enable_https: true
- enable_security: false
- rhevm_nfs_server:
nfs.server.com
- rhevm_nfs_export: /export/export_domain
- rhevm_nfs_mount_point: /mnt/rhevm-nfs
- rhevm_deltacloud_port: 3005
- rhevm_deltacloud_username: username@fqdn
- rhevm_deltacloud_password: password
- rhevm_deltacloud_powershell_url:
https://rhevm.server.com:8543/rhevm-api-powershell
-classes:
-- aeolus::rhevm
--
1.7.4.4