Renamed manifests and tasks

Change-Id: I1295351b21f063fc9591727eaf0c2eff36d88a9a

deployment_scripts/puppet/manifests/check_environment_configuration.pp

@@ -1,12 +1,9 @@
 $scaleio = hiera('scaleio')
 
 if $scaleio['metadata']['enabled'] {
-    notice("ScaleIO plugin enabled in $deployment_mode mode")
-
-    #TODO: Add checks for ScaleIO plugin
-    #TODO: Check repo URL
-    #TODO: Check version
+    notify{'ScaleIO plugin enabled': }
+    #TODO: Check that Storage pool has enough space
 
 } else {
-    notice("ScaleIO plugin disabled")
+    notify{'ScaleIO plugin disabled': }
 }

deployment_scripts/puppet/manifests/configure_cinder.pp

@@ -1,2 +1,2 @@
 $fuel_settings = parseyaml(file('/etc/astute.yaml'))
-class {'scaleio_fuel::controller': }
+class {'scaleio_fuel::configure_cinder': }

deployment_scripts/puppet/manifests/configure_gateway.pp

@@ -1,2 +1,2 @@
 $fuel_settings = parseyaml(file('/etc/astute.yaml'))
-class {'scaleio_fuel::gateway_configuration': }
+class {'scaleio_fuel::configure_gateway': }

deployment_scripts/puppet/manifests/configure_nova.pp

@@ -1,2 +1,2 @@
 $fuel_settings = parseyaml(file('/etc/astute.yaml'))
-class {'scaleio_fuel::compute': }
+class {'scaleio_fuel::configure_nova': }

deployment_scripts/puppet/modules/scaleio_fuel/manifests/configure_cinder.pp

@@ -1,4 +1,4 @@
-class scaleio_fuel::controller
+class scaleio_fuel::configure_cinder
 inherits scaleio_fuel::params {
 
   $mdm_ip            = $scaleio_fuel::params::mdm_ip

deployment_scripts/puppet/modules/scaleio_fuel/manifests/configure_gateway.pp

@@ -1,4 +1,4 @@
-class scaleio_fuel::gateway_configuration
+class scaleio_fuel::configure_gateway
 inherits scaleio_fuel::params {
 
   $role = $scaleio_fuel::params::role
@@ -35,7 +35,7 @@ inherits scaleio_fuel::params {
       enable     => true,
       hasrestart => true,
     }
-    
+
   } else {
     notify {'Gateway not installed. Not doing anything.':}
   }

deployment_scripts/puppet/modules/scaleio_fuel/manifests/configure_nova.pp

@@ -1,4 +1,4 @@
-class scaleio_fuel::compute {
+class scaleio_fuel::configure_nova {
 
   notice("Configuring Compute node for ScaleIO integration")
 

tasks.yaml

@@ -10,7 +10,7 @@
   stage: post_deployment/2050
   type: puppet
   parameters:
-    puppet_manifest: puppet/manifests/scaleio.pp
+    puppet_manifest: puppet/manifests/install_scaleio.pp
     puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 1800
 
@@ -18,7 +18,7 @@
   stage: post_deployment/2100
   type: puppet
   parameters:
-    puppet_manifest: puppet/manifests/gateway_configuration.pp
+    puppet_manifest: puppet/manifests/configure_gateway.pp
     puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 600
 
@@ -34,7 +34,7 @@
   stage: post_deployment/2200
   type: puppet
   parameters:
-    puppet_manifest: puppet/manifests/compute.pp
+    puppet_manifest: puppet/manifests/configure_nova.pp
     puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 600
 
@@ -42,7 +42,7 @@
   stage: post_deployment/2250
   type: puppet
   parameters:
-    puppet_manifest: puppet/manifests/controller.pp
+    puppet_manifest: puppet/manifests/configure_cinder.pp
     puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 600