From d7ba7009616db9b1c7f90999e2c5632572770b55 Mon Sep 17 00:00:00 2001
From: Igor Gajsin <igajsin@mirantis.com>
Date: Thu, 19 Mar 2015 12:40:24 +0300
Subject: [PATCH] recovery vmware init-files on ubuntu

Init files for vmware was merged in https://review.fuel-infra.org/#/c/4509/
But after https://review.fuel-infra.org/#/c/4591/ they was lost (only for
Ubuntu). Revert this files back.

Change-Id: Ia1866ad6005563a8c54042ab9e1904d5ee88a910
---
 trusty/debian/cinder-volume-vmware.conf | 21 +++++++++++++++++++++
 trusty/debian/cinder-volume.dirs        |  1 +
 trusty/debian/cinder-volume.install     |  1 +
 3 files changed, 23 insertions(+)
 create mode 100644 trusty/debian/cinder-volume-vmware.conf

diff --git a/trusty/debian/cinder-volume-vmware.conf b/trusty/debian/cinder-volume-vmware.conf
new file mode 100644
index 000000000..2e531c61a
--- /dev/null
+++ b/trusty/debian/cinder-volume-vmware.conf
@@ -0,0 +1,21 @@
+# vim: set ft=upstart et ts=2:
+description "Cinder volume service for vmware"
+author "Igor Gajsin igajsin@mirantis.com"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+chdir /var/run
+
+pre-start script
+    mkdir -p /var/run/cinder
+    chown cinder:cinder /var/run/cinder
+
+    mkdir -p /var/lock/cinder
+    chown cinder:root /var/lock/cinder
+end script
+
+script
+  [ -r /etc/default/$UPSTART_JOB ] &&. /etc/default/$UPSTART_JOB
+  start-stop-daemon --start --chuid cinder --exec /usr/bin/cinder-volume -- $CINDER_VOLUME_OPTS
+end script
diff --git a/trusty/debian/cinder-volume.dirs b/trusty/debian/cinder-volume.dirs
index 769913906..8ef65c6b2 100644
--- a/trusty/debian/cinder-volume.dirs
+++ b/trusty/debian/cinder-volume.dirs
@@ -1 +1,2 @@
 var/lib/cinder/volumes
+usr/share/cinder
diff --git a/trusty/debian/cinder-volume.install b/trusty/debian/cinder-volume.install
index bbaf426b3..cbe16b457 100644
--- a/trusty/debian/cinder-volume.install
+++ b/trusty/debian/cinder-volume.install
@@ -1,4 +1,5 @@
 debian/cinder_tgt.conf etc/tgt/conf.d
+debian/cinder-volume-vmware.conf usr/share/cinder
 etc/cinder/rootwrap.d/volume.filters /etc/cinder/rootwrap.d
 usr/bin/cinder-volume
 usr/bin/cinder-volume-usage-audit
-- 
2.45.2