Merge branch 'master' of github.com:rcbops-cookbooks/cinder into havana

Conflicts:
	metadata.rb

VERSION

@@ -0,0 +1 @@
+4.2.0

attributes/default.rb

@@ -3,6 +3,10 @@
 default["enable_monit"] = false  # OS provides packages                     # cluster_attribute
 ########################################################################
 
+# Generic regex for process pattern matching (to be used as a base pattern).
+# Works for both Grizzly and Havana packages on Ubuntu and CentOS.
+procmatch_base = '^((/usr/bin/)?python\d? )?(/usr/bin/)?'
+
 # Define the ha policy for queues.  If you change this to true
 # after you have already deployed you will need to wipe the RabbitMQ
 # database by stopping rabbitmq, removing /var/lib/rabbitmq/mnesia
@@ -104,10 +108,13 @@
     "cinder_common_packages" => ["openstack-cinder"],
     "cinder_api_packages" => ["openstack-cinder"],
     "cinder_api_service" => "openstack-cinder-api",
+    "cinder_api_procmatch" => procmatch_base + 'cinder-api\b',
     "cinder_volume_packages" => ["openstack-cinder", "iscsi-initiator-utils", "qemu-img"],
     "cinder_volume_service" => "openstack-cinder-volume",
+    "cinder_volume_procmatch" => procmatch_base + 'cinder-volume\b',
     "cinder_scheduler_packages" => ["openstack-cinder"],
     "cinder_scheduler_service" => "openstack-cinder-scheduler",
+    "cinder_scheduler_procmatch" => procmatch_base + 'cinder-scheduler\b',
     "cinder_iscsitarget_packages" => ["scsi-target-utils"],
     "cinder_iscsitarget_service" => "tgtd",
     "supporting_packages" => ["python-cinderclient", "MySQL-python", "python-keystone"],
@@ -121,10 +128,13 @@
     "cinder_common_packages" => ["cinder-common"],
     "cinder_api_packages" => ["cinder-api"],
     "cinder_api_service" => "cinder-api",
+    "cinder_api_procmatch" => procmatch_base + 'cinder-api\b',
     "cinder_volume_packages" => ["cinder-volume", "open-iscsi", "qemu-utils"],
     "cinder_volume_service" => "cinder-volume",
+    "cinder_volume_procmatch" => procmatch_base + 'cinder-volume\b',
     "cinder_scheduler_packages" => ["cinder-scheduler"],
     "cinder_scheduler_service" => "cinder-scheduler",
+    "cinder_scheduler_procmatch" => procmatch_base + 'cinder-scheduler\b',
     "cinder_iscsitarget_packages" => ["tgt"],
     "cinder_iscsitarget_service" => "tgt",
     "supporting_packages" => ["python-cinderclient", "python-mysqldb"],

metadata.rb

@@ -3,7 +3,7 @@
 license          "Apache 2.0"
 description      "Installs/Configures cinder"
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version           "4.2.0"
+version          IO.read(File.join(File.dirname(__FILE__), 'VERSION'))
 recipe           "cinder-api", ""
 recipe           "cinder-scheduler", ""
 recipe           "cinder-volume", ""