Update plugin to solve problem relative to TestVM image when we get multiple controllers

Change-Id: I9549b9391ccb1f0d49fced0e881646b732473e57

README.md

@@ -113,4 +113,7 @@ Release Notes
 
 * Update plugin to Fuel 7.0 release
 
+**3.0.1**
+
+* Update to solve problem with TestVM image on multi controller deployment
 

deployment_scripts/puppet/delete.pp

@@ -0,0 +1,4 @@
+  # have to find a better way to do this, if we can execute plugin before upload_cirros task we don't need this anymore
+  exec{ "image-delete":
+  command       => "/bin/bash -c 'source /root/openrc && /usr/bin/glance image-delete TestVM'",
+  }

deployment_scripts/puppet/modules/glance_nfs/manifests/init.pp

@@ -4,12 +4,6 @@ $nfs_mount_point_glance,
 ){
   include glance_nfs::params
 
-  # have to find a better way to do this, if we can execute plugin before upload_cirros task we don't need this anymore 
-  exec{ "image-delete":
-  command		=> "/bin/bash -c 'source /root/openrc && /usr/bin/glance image-delete TestVM | exit 0'",
-  before 		=> Package["$glance_nfs::params::package_name"],
-  }
-  
   # Install package and start services
   package { $glance_nfs::params::package_name:
     ensure => present,
@@ -17,6 +11,7 @@ $nfs_mount_point_glance,
 
   package { $glance_nfs::params::required_packages:
     ensure => present,
+    before => Mount["$nfs_mount_point_glance"],
   }
 
   service { $glance_nfs::params::service_name:
@@ -75,8 +70,4 @@ $nfs_mount_point_glance,
   notify => Service["$::glance_nfs::params::service_name"],
   }
 
-  exec{ "/usr/bin/ruby /etc/puppet/modules/osnailyfacter/modular/astute/upload_cirros.rb":
-  require => Exec["/bin/chmod 775 ${$nfs_mount_point_glance}/images"],
-  }
-
 }

deployment_scripts/puppet/upload.pp

@@ -0,0 +1,2 @@
+  exec{ "/usr/bin/ruby /etc/puppet/modules/osnailyfacter/modular/astute/upload_cirros.rb":
+  }

metadata.yaml

@@ -2,7 +2,7 @@
 name: glance_nfs
 title: Glance NFS plugin
 # Plugin version
-version: 3.0.0
+version: 3.0.1
 # Description
 description: Enables Glance to use NFS volume as storage backend for images
 # Required fuel version

tasks.yaml

@@ -1,9 +1,22 @@
 # This task is required for controller nodes
-- role: ['primary-controller', 'controller']
+- role: ['primary-controller']
   stage: post_deployment/700
-  required_for: [upload_cirros]
+  type: puppet
+  parameters:
+    puppet_manifest: puppet/delete.pp
+    puppet_modules:  "puppet/modules/:/etc/puppet/modules/"
+    timeout: 360
+- role: ['primary-controller', 'controller']
+  stage: post_deployment/800
   type: puppet
   parameters:
     puppet_manifest: puppet/site.pp
     puppet_modules:  "puppet/modules/:/etc/puppet/modules/"
     timeout: 360
+- role: ['primary-controller']
+  stage: post_deployment/1000
+  type: puppet
+  parameters:
+    puppet_manifest: puppet/upload.pp
+    puppet_modules:  "puppet/modules/:/etc/puppet/modules/"
+    timeout: 360