Add debian files
authorIlya Kharin <akscram@gmail.com>
Mon, 25 Mar 2013 17:23:43 +0000 (21:23 +0400)
committerIlya Kharin <akscram@gmail.com>
Mon, 25 Mar 2013 17:24:09 +0000 (21:24 +0400)
Change-Id: Iaf03c4572a4311736d9315099a6cd6c960f0ec99

43 files changed:
debian/README.Debian [new file with mode: 0644]
debian/changelog [new file with mode: 0644]
debian/cinder-api.install [new file with mode: 0644]
debian/cinder-api.logrotate [new file with mode: 0644]
debian/cinder-api.manpages [new file with mode: 0644]
debian/cinder-api.upstart [new file with mode: 0644]
debian/cinder-backup.install [new file with mode: 0644]
debian/cinder-backup.logrotate [new file with mode: 0644]
debian/cinder-backup.upstart [new file with mode: 0644]
debian/cinder-common.dirs [new file with mode: 0644]
debian/cinder-common.install [new file with mode: 0644]
debian/cinder-common.manpages [new file with mode: 0644]
debian/cinder-common.postinst [new file with mode: 0644]
debian/cinder-scheduler.install [new file with mode: 0644]
debian/cinder-scheduler.logrotate [new file with mode: 0644]
debian/cinder-scheduler.manpages [new file with mode: 0644]
debian/cinder-scheduler.upstart [new file with mode: 0644]
debian/cinder-volume.dirs [new file with mode: 0644]
debian/cinder-volume.install [new file with mode: 0644]
debian/cinder-volume.logrotate [new file with mode: 0644]
debian/cinder-volume.manpages [new file with mode: 0644]
debian/cinder-volume.postinst [new file with mode: 0644]
debian/cinder-volume.upstart [new file with mode: 0644]
debian/cinder.conf [new file with mode: 0644]
debian/cinder_sudoers [new file with mode: 0644]
debian/cinder_tgt.conf [new file with mode: 0644]
debian/clean [new file with mode: 0644]
debian/compat [new file with mode: 0644]
debian/control [new file with mode: 0644]
debian/copyright [new file with mode: 0644]
debian/docs [new file with mode: 0644]
debian/logging.conf [new file with mode: 0644]
debian/man/cinder-api.8 [new file with mode: 0644]
debian/man/cinder-manage.8 [new file with mode: 0644]
debian/man/cinder-rootwrap.8 [new file with mode: 0644]
debian/man/cinder-scheduler.8 [new file with mode: 0644]
debian/man/cinder-volume.8 [new file with mode: 0644]
debian/patches/fix_cinder_dependencies.patch [new file with mode: 0644]
debian/patches/series [new file with mode: 0644]
debian/python-cinder.install [new file with mode: 0644]
debian/rules [new file with mode: 0755]
debian/source/format [new file with mode: 0644]
debian/watch [new file with mode: 0644]

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644 (file)
index 0000000..83164de
--- /dev/null
@@ -0,0 +1,10 @@
+Migration from nova-volumes to cinder-volumes:
+
+1. upgrade your nova install to folsom
+2. upgrade your nova database using nova-manage db sync
+3. install the folsom version of cinder
+4. create a cinder database using cinder-manage db sync
+5. copy data from nova database using cinder-manage migrate import_db --src=$NOVA_SQL_CONN --dest=$CINDER_SQL_CONN
+6. disable the nova-volume-api in enabled apis in /etc/nova/nova.conf sed -i "s/osapi_volume,// /etc/nova/nova.conf"
+7. restart nova-api
+8. start cinder-api 
diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..b0d4181
--- /dev/null
@@ -0,0 +1,243 @@
+cinder (1:2013.1~rc1-0ubuntu1~cloud0) precise-grizzly; urgency=low
+
+  * New upstream release candidate for the Ubuntu Cloud Archive.
+
+ -- James Page <james.page@ubuntu.com>  Tue, 19 Mar 2013 15:02:53 +0000
+
+cinder (1:2013.1~rc1-0ubuntu1) raring; urgency=low
+
+  [ Chuck Short ]
+  * debian/patches/fix-ubuntu-tests.patch: Dropped.
+  * debian/rules: Fix version number when building the testsuite. 
+  * debian/cinder-backup{.install, upstart, logroate}: Add cinder-backup
+    service.
+  * debian/rules: Run the testsuite against PYTHONPATH.
+  * debian/control: Update build-depends and run-time depends.
+    - Dropped python-glance not needed.
+    - Dropped python-cheetah not needed.
+    - Droped python-daemon not needed.
+    - Dropped python-netaddr not needed.
+    - Renamed python-oslo-config to python-oslo.config.
+    - Added python-keystoneclient to depends.
+    - Added python-swiftclient to depends.
+   * debian/pydist-overrides: No longer needed.
+
+  [ James Page ]
+  * New upstream release candidate.
+  * d/watch: Update uversionmangle to deal with upstream versioning
+    changes, remove tarballs.openstack.org.
+  * d/cinder.conf: Set lock_path to /var/lock/cinder (default is not
+    sensible).
+
+ -- James Page <james.page@ubuntu.com>  Sat, 16 Mar 2013 09:30:20 +0000
+
+cinder (2013.1.g3-0ubuntu1) raring; urgency=low
+
+  [ Yolanda Robla Mota ]
+  * d/control: Add BD on python-hp3parclient.
+  * d/patches: Drop patches related to disabling hp3parclient.
+
+  [ James Page ]
+  * d/control: Add Suggests: python-hp3parclient for python-cinder.
+  * d/control: Add BD on python-oslo-config.
+  * d/*: Wrapped and sorted.
+
+  [ Chuck Short ]
+  * New upstream release.
+  * debian/rules, debian/cinder-volumes.install: 
+    - Fail if binaries are missing and install missing binaries.
+  * debian/patches/fix-ubuntu-tests.patch: Fix failing tests.
+  * debian/control: Add python-rtslib and python-mock.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Fri, 22 Feb 2013 10:45:17 -0600
+
+cinder (2013.1~g2-0ubuntu2) raring; urgency=low
+
+  * debian/patches/series: Enable skip_failed_tests to fix FTBFS. 
+
+ -- Chris J Arges <chris.j.arges@canonical.com>  Tue, 15 Jan 2013 10:10:28 -0600
+
+cinder (2013.1~g2-0ubuntu1) raring; urgency=low
+
+  [ Chuck Short ]
+  * New upstream release. 
+  * debian/patches/avoid_setuptools_git_dependency.patch: Rediff
+    due to upstream changes.
+  * debian/control: Add python-keystoneclient as a dependency
+
+  [ James Page ]
+  * Improve upstart configurations:
+    - d/*.upstart: Switch to using start-stop-daemon instead of su,
+      stop on [!2345] to catch all transitions.
+  * d/control: General tidy of package descriptions.
+  * d/control: Drop BD on python-all-dev as its not required.
+  * d/*.postrm: Dropped; update-rc.d calls for purge are handled by
+    debhelper and are not require for upstart configurations.
+
+  [ Yolanda Robla Mota ]
+  * d/patches: removing hp3parclient dependency from tools/test-requires
+  * d/patches, d/control: adding stevedore dependency, merging deps patches
+  * d/patches: remove failing tests
+
+ -- Chuck Short <zulcss@ubuntu.com>  Fri, 11 Jan 2013 07:33:57 -0600
+
+cinder (2013.1~g1-0ubuntu1) raring; urgency=low
+
+  * New upstream release.
+  * debian/patches/avoid_setuptools_git_dependency.patch:
+    Avoid git installation. (LP: #1075948) 
+
+ -- Chuck Short <zulcss@ubuntu.com>  Fri, 23 Nov 2012 08:39:28 -0600
+
+cinder (2013.1~g1~20121101.361-0ubuntu1) raring; urgency=low
+
+  [ Adam Gandelman ]
+  * New upstream release.
+  * debian/patches/0001-Replace-builtin-hash.patch: Dropped.
+
+  [ James Page ]
+  * Cinder should suggest ceph-common, not python-ceph (LP: #1065901):
+    - debian/control: cinder-volume Suggests: python-ceph -> ceph-common
+
+ -- Adam Gandelman <adamg@canonical.com>  Thu, 01 Nov 2012 11:30:15 +0100
+
+cinder (2012.2-0ubuntu2) quantal; urgency=low
+
+  * debian/cinder_tgt.conf: Add missing configuration file. (LP: #1064366) 
+  * debian/README.Debian: Added note about migration from nova-volume
+    to cinder-volume.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Tue, 09 Oct 2012 08:26:21 -0500
+
+cinder (2012.2-0ubuntu1) quantal; urgency=low
+
+  * New upstream release. 
+  * debian/cinder-volume.postinst, debian/cinder-common.dirs,
+    debian/cinder.conf: Properly configure tgtd to be used with cinder.
+  * debian/pydist-overrides: Dont try to install babel.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Thu, 27 Sep 2012 11:32:27 -0500
+
+cinder (2012.2~rc3-0ubuntu1) quantal; urgency=low
+
+  * New upstream release.
+  * debian/patches/0001-Replace-builtin-hash-with-MD5-to-solve-32-64-bit-iss.patch:
+    Fix FTBFS.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Wed, 26 Sep 2012 14:07:35 -0500
+
+cinder (2012.2~rc2-0ubuntu1) quantal; urgency=low
+
+  [ Adam Gandelman ]
+  * debian/control: Add python-mysqldb to python-cinder Depends.
+
+  [ Chuck Short ]
+  * New upstream release
+  * debian/rules: Fail to build if the testsuite doesnt pass.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Tue, 25 Sep 2012 10:17:21 -0500
+
+cinder (2012.2~rc1-0ubuntu1) quantal; urgency=low
+
+  [ Adam Gandelman ]
+  * debian/control: Add lvm2 + tgt as a Dependency of cinder-volume.
+  * debian/cinder-volume.{dirs, postinst}:
+        - Create /var/lib/cinder/volumes (LP: #1047059)
+        - chmod 0600, not chown.
+  * debain/cinder-scheduler.postinst: Drop.
+  * debian/cinder.conf: Fix defaults.
+  * debian/*.upstart: Specify --log-file.
+  * debian/*.logrotate: Update.
+  * Only rootwrap filters with the packages that need them (cinder-volume).
+  * Ensure /etc/cinder/rootwrap.d/ is only writable by root, ensure
+    those permissions on /etc/cinder/rootwrap.conf and individual filter
+    configurations.
+
+  [ Chuck Short ]
+  * New upstream version.
+  * debian/control: Add python-ceph as a suggests
+
+ -- Chuck Short <zulcss@ubuntu.com>  Tue, 18 Sep 2012 14:24:45 -0500
+
+cinder (2012.2~rc1~20120907.230-0ubuntu4) quantal; urgency=low
+
+  [Chuck Short]
+  * New upstream version.
+  * debian/cinder.conf: Fix path for cinder-rootwrap. (LP: #1045438) 
+  * debian/control: Add python-glanceclient as a dep. 
+  * debian/cinder-common.postinst: Fix chmod thinko.
+  * debian/*.upstart: Specify the configuration files.
+
+  [Soren Hansen]
+  * Update debian/watch to account for symbolically named tarballs and
+    use newer URL.
+  * Fix Launchpad URLs in debian/watch.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Fri, 07 Sep 2012 11:27:55 -0500
+
+cinder (2012.2~f3-0ubuntu3) quantal; urgency=low
+
+  * debian/cinder.conf: Re-add sql_connection and set it to sqllite.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Wed, 22 Aug 2012 20:14:41 -0500
+
+cinder (2012.2~f3-0ubuntu2) quantal; urgency=low
+
+  * debian/cinder.conf: Get rid of deprecated warnings.
+    (LP: #1036240) 
+
+ -- Chuck Short <zulcss@ubuntu.com>  Sun, 19 Aug 2012 13:36:22 -0500
+
+cinder (2012.2~f3-0ubuntu1) quantal; urgency=low
+
+  * New upstream version.
+  * debian/patches/0001-Use-setuptools-git.patch: Dropped
+  * debian/control: Add python-glanceclient
+
+ -- Chuck Short <zulcss@ubuntu.com>  Fri, 17 Aug 2012 10:18:57 -0500
+
+cinder (2012.2~f3~20120809.102-0ubuntu2) quantal; urgency=low
+
+  * debian/cinder.conf, cinder-common.install: Use rootwrap.conf. (LP: #1036240) 
+  * debian/control: Drop python-babel.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Mon, 13 Aug 2012 14:14:31 -0500
+
+cinder (2012.2~f3~20120809.102-0ubuntu1) quantal; urgency=low
+
+  [ Adam Gandelman ]
+  * debian/control: Add python-setuptools dependency.
+  * debian/cinder-common.postinst: Fix syntax errors, fix permissions.
+  * debian/cinder-common.dirs: Correct, etc/nova -> etc/cinder.
+  * debian/{cinder_sudoers, rules, cinder-common.install}: Install proper
+    cinder_sudoers.
+  * debian/cinder-*.upstart: Close quotes, replace 'nova' references with
+    'cinder'.
+  * debian/cinder.conf: Specify correct sql_connection.
+  * debian/cinder-scheduler.postinst: Added.  Migrate local databases only.
+
+  [ Chuck Short ]
+  * debian/*.upstart: Fix upstart jobs to run with right interfaces.
+    (LP: #1030197)
+  * debian/control: Drop python-babel, python-nosexcover
+  * debian/control: Add python-mox, pep8
+  * debian/rules: Re-add get-orig-source
+  * debian/rules: Enable testsuite.
+  * debian/cinder.conf: Update config file.
+  * debian/cinder-{api,volumes,scheduler}.manpages: Add manpages.
+  * New upstream version.
+  * debian/rules: Don't run pep8 tests
+  * debian/patches/0001-Use-setuptools-git.patch: Cleanup manifest
+  * debian/control: Add python-setuptools-git
+  * debian/control: Add section for python-cinder
+  * fix lintian warnings and errors.
+  * debian/cinder-common.install: Remove clear_rabbit_queues since it
+    will conflict with nova installed.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Fri, 10 Aug 2012 12:05:11 -0500
+
+cinder (2012.2~f1~20120503.2-0ubuntu1) quantal; urgency=low
+
+  * Initial release.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Tue, 22 May 2012 09:57:46 -0400
diff --git a/debian/cinder-api.install b/debian/cinder-api.install
new file mode 100644 (file)
index 0000000..98e58c1
--- /dev/null
@@ -0,0 +1 @@
+usr/bin/cinder-api
diff --git a/debian/cinder-api.logrotate b/debian/cinder-api.logrotate
new file mode 100644 (file)
index 0000000..31f3a7f
--- /dev/null
@@ -0,0 +1,7 @@
+/var/log/cinder/cinder-api.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
diff --git a/debian/cinder-api.manpages b/debian/cinder-api.manpages
new file mode 100644 (file)
index 0000000..0cc348b
--- /dev/null
@@ -0,0 +1 @@
+debian/man/cinder-api.8
diff --git a/debian/cinder-api.upstart b/debian/cinder-api.upstart
new file mode 100644 (file)
index 0000000..2d6d071
--- /dev/null
@@ -0,0 +1,18 @@
+description "Cinder api server"
+author "Chuck Short <zulcss@ubuntu.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
+
+exec start-stop-daemon --start --chuid cinder --exec /usr/bin/cinder-api \
+     -- --config-file=/etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-api.log
diff --git a/debian/cinder-backup.install b/debian/cinder-backup.install
new file mode 100644 (file)
index 0000000..b362ab5
--- /dev/null
@@ -0,0 +1 @@
+usr/bin/cinder-backup
diff --git a/debian/cinder-backup.logrotate b/debian/cinder-backup.logrotate
new file mode 100644 (file)
index 0000000..fd6419d
--- /dev/null
@@ -0,0 +1,7 @@
+/var/log/cinder/cinder-backup.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
diff --git a/debian/cinder-backup.upstart b/debian/cinder-backup.upstart
new file mode 100644 (file)
index 0000000..a95de6f
--- /dev/null
@@ -0,0 +1,18 @@
+description "Cinder backup server"
+author "Chuck Short <zulcss@ubuntu.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
+
+exec start-stop-daemon --start --chuid cinder --exec /usr/bin/cinder-backup \
+     -- --config-file=/etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-backup.log
diff --git a/debian/cinder-common.dirs b/debian/cinder-common.dirs
new file mode 100644 (file)
index 0000000..f622135
--- /dev/null
@@ -0,0 +1,5 @@
+etc/cinder
+etc/cinder/rootwrap.d
+var/lib/cinder
+var/log/cinder
+var/lib/cinder/volumes
diff --git a/debian/cinder-common.install b/debian/cinder-common.install
new file mode 100644 (file)
index 0000000..f14d09e
--- /dev/null
@@ -0,0 +1,8 @@
+debian/cinder.conf etc/cinder
+debian/cinder_sudoers etc/sudoers.d
+debian/logging.conf etc/cinder
+etc/cinder/api-paste.ini etc/cinder
+etc/cinder/policy.json etc/cinder
+etc/cinder/rootwrap.conf etc/cinder
+usr/bin/cinder-manage
+usr/bin/cinder-rootwrap
diff --git a/debian/cinder-common.manpages b/debian/cinder-common.manpages
new file mode 100644 (file)
index 0000000..23a27cc
--- /dev/null
@@ -0,0 +1,2 @@
+debian/man/cinder-manage.8
+debian/man/cinder-rootwrap.8
diff --git a/debian/cinder-common.postinst b/debian/cinder-common.postinst
new file mode 100644 (file)
index 0000000..3443c56
--- /dev/null
@@ -0,0 +1,33 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ]; then
+    if ! getenv group cinder > /dev/null 2>&1; then
+        addgroup --system cinder >/dev/null
+    fi
+
+    if ! getenv passwd cinder > /dev/null 2>&1; then
+        adduser --system --home /var/lib/cinder --ingroup cinder --no-create-home \
+            --shell /bin/false cinder
+    fi
+
+    chown -R cinder:adm /var/log/cinder
+    chmod 0750 /var/log/cinder
+    chown -R cinder:cinder /var/lib/cinder /etc/cinder
+    chmod 0750 /etc/cinder
+    chmod 0440 /etc/sudoers.d/cinder_sudoers
+    chown -R root:root /etc/cinder/rootwrap.d
+    chmod 0755 /etc/cinder/rootwrap.d
+    chown root:root /etc/cinder/rootwrap.conf
+
+    if ! grep -q sql_connection /etc/cinder/cinder.conf
+    then
+        su -s /bin/sh -c 'cinder-manage db sync' cinder
+    fi
+
+    if [ -e /var/lib/cinder/cinder.sqlite ]; then
+        chown cinder:cinder /var/lib/cinder/cinder.sqlite
+        chmod 0600 /var/lib/cinder/cinder.sqlite
+    fi
+fi
+
+#DEBHELPER#
diff --git a/debian/cinder-scheduler.install b/debian/cinder-scheduler.install
new file mode 100644 (file)
index 0000000..8d994a1
--- /dev/null
@@ -0,0 +1 @@
+usr/bin/cinder-scheduler
diff --git a/debian/cinder-scheduler.logrotate b/debian/cinder-scheduler.logrotate
new file mode 100644 (file)
index 0000000..650adee
--- /dev/null
@@ -0,0 +1,7 @@
+/var/log/cinder/cinder-scheduler.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
diff --git a/debian/cinder-scheduler.manpages b/debian/cinder-scheduler.manpages
new file mode 100644 (file)
index 0000000..4d6e93c
--- /dev/null
@@ -0,0 +1 @@
+debian/man/cinder-scheduler.8
diff --git a/debian/cinder-scheduler.upstart b/debian/cinder-scheduler.upstart
new file mode 100644 (file)
index 0000000..c321041
--- /dev/null
@@ -0,0 +1,18 @@
+description "Cinder scheduler server"
+author "Chuck Short <zulcss@ubuntu.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
+
+exec start-stop-daemon --start --chuid cinder --exec /usr/bin/cinder-scheduler \
+     -- --config-file=/etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-scheduler.log
diff --git a/debian/cinder-volume.dirs b/debian/cinder-volume.dirs
new file mode 100644 (file)
index 0000000..7699139
--- /dev/null
@@ -0,0 +1 @@
+var/lib/cinder/volumes
diff --git a/debian/cinder-volume.install b/debian/cinder-volume.install
new file mode 100644 (file)
index 0000000..da0a990
--- /dev/null
@@ -0,0 +1,6 @@
+debian/cinder_tgt.conf etc/tgt/conf.d
+etc/cinder/rootwrap.d/volume.filters /etc/cinder/rootwrap.d
+usr/bin/cinder-clear-rabbit-queues
+usr/bin/cinder-rtstool
+usr/bin/cinder-volume
+usr/bin/cinder-volume-usage-audit
diff --git a/debian/cinder-volume.logrotate b/debian/cinder-volume.logrotate
new file mode 100644 (file)
index 0000000..0215932
--- /dev/null
@@ -0,0 +1,7 @@
+/var/log/cinder/cinder-volume.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
diff --git a/debian/cinder-volume.manpages b/debian/cinder-volume.manpages
new file mode 100644 (file)
index 0000000..87e53e9
--- /dev/null
@@ -0,0 +1 @@
+debian/man/cinder-volume.8
diff --git a/debian/cinder-volume.postinst b/debian/cinder-volume.postinst
new file mode 100644 (file)
index 0000000..d9e3bcf
--- /dev/null
@@ -0,0 +1,22 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ]; then
+    chown cinder:cinder /var/lib/cinder/volumes
+    chmod 0750 /var/lib/cinder/volumes
+    chown root:root /etc/cinder/rootwrap.d/volume.filters
+
+       if which invoke-rc.d >/dev/null 2>&1; then
+               invoke-rc.d tgtd restart > /dev/null 2>&1 || true
+       else
+               /etc/init.d/tgtd restart > /dev/null 2>&1 || true
+       fi
+
+       if which invoke-rc.d >/dev/null 2>&1; then
+               invoke-rc.d cinder-volume restart > /dev/null 2>&1 || true
+       else
+               /etc/init.d/cinder-volume restart > /dev/null 2>&1 || true
+       fi
+
+fi
+
+#DEBHELPER#
diff --git a/debian/cinder-volume.upstart b/debian/cinder-volume.upstart
new file mode 100644 (file)
index 0000000..dd3295a
--- /dev/null
@@ -0,0 +1,18 @@
+description "Cinder volume server"
+author "Chuck Short <zulcss@ubuntu.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
+
+exec start-stop-daemon --start --chuid cinder --exec /usr/bin/cinder-volume \
+     -- --config-file=/etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-volume.log
diff --git a/debian/cinder.conf b/debian/cinder.conf
new file mode 100644 (file)
index 0000000..7094033
--- /dev/null
@@ -0,0 +1,11 @@
+[DEFAULT]
+rootwrap_config = /etc/cinder/rootwrap.conf
+api_paste_confg = /etc/cinder/api-paste.ini
+iscsi_helper = tgtadm
+volume_name_template = volume-%s
+volume_group = cinder-volumes
+verbose = True
+auth_strategy = keystone
+state_path = /var/lib/cinder
+lock_path = /var/lock/cinder
+volumes_dir = /var/lib/cinder/volumes
diff --git a/debian/cinder_sudoers b/debian/cinder_sudoers
new file mode 100644 (file)
index 0000000..73142ab
--- /dev/null
@@ -0,0 +1,3 @@
+Defaults:cinder !requiretty
+
+cinder ALL = (root) NOPASSWD: /usr/bin/cinder-rootwrap 
diff --git a/debian/cinder_tgt.conf b/debian/cinder_tgt.conf
new file mode 100644 (file)
index 0000000..444eb00
--- /dev/null
@@ -0,0 +1 @@
+include /var/lib/cinder/volumes/*
diff --git a/debian/clean b/debian/clean
new file mode 100644 (file)
index 0000000..e932b02
--- /dev/null
@@ -0,0 +1 @@
+setup.cfg
diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..45a4fb7
--- /dev/null
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..7feaaa4
--- /dev/null
@@ -0,0 +1,157 @@
+Source: cinder
+Section: net
+Priority: extra
+Maintainer: Chuck Short <zulcss@ubuntu.com>
+Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6)
+Build-Depends-Indep:
+ pep8,
+ python-amqplib,
+ python-anyjson,
+ python-cheetah,
+ python-coverage,
+ python-eventlet,
+ python-glanceclient,
+ python-greenlet,
+ python-hp3parclient (>= 1.0.0),
+ python-iso8601,
+ python-keystoneclient,
+ python-kombu,
+ python-lockfile,
+ python-lxml,
+ python-migrate,
+ python-mock,
+ python-mox,
+ python-mysqldb,
+ python-nose,
+ python-oslo.config,
+ python-paramiko,
+ python-paste,
+ python-pastedeploy,
+ python-routes,
+ python-swiftclient,
+ python-setuptools,
+ python-setuptools-git,
+ python-sphinx,
+ python-sqlalchemy,
+ python-stevedore (>= 0.7),
+ python-suds,
+ python-webob
+Standards-Version: 3.9.3
+Homepage: http://launchpad.net/cinder
+
+Package: python-cinder
+Section: python
+Architecture: all
+Depends:
+ python-amqplib,
+ python-anyjson,
+ python-eventlet,
+ python-glance,
+ python-glanceclient,
+ python-keystoneclient,
+ python-oslo.config,
+ python-greenlet,
+ python-iso8601,
+ python-kombu,
+ python-lockfile,
+ python-lxml,
+ python-migrate,
+ python-paramiko,
+ python-paste,
+ python-pastedeploy,
+ python-routes,
+ python-rtslib,
+ python-swiftclient,
+ python-sqlalchemy,
+ python-suds,
+ python-webob,
+ ${misc:Depends},
+ ${python:Depends}
+Suggests: python-hp3parclient
+Description: Cinder Python libraries
+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
+ the ubiquitous cloud computing platform that will meet the needs of public
+ and private cloud providers regardless of size, by being simple to implement
+ and massively scalable.
+ .
+ Cinder is the OpenStack Block storage service.
+ .
+ This package contains the Python library for Cinder.
+
+Package: cinder-common
+Architecture: all
+Depends:
+ adduser,
+ python-cinder (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends}
+Provides: ${python:Provides}
+Description: Cinder storage service - common files
+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
+ the ubiquitous cloud computing platform that will meet the needs of public
+ and private cloud providers regardless of size, by being simple to implement
+ and massively scalable.
+ .
+ Cinder is the OpenStack Block storage service.
+ .
+ This package contains commons components for Cinder.
+
+Package: cinder-api
+Architecture: all
+Depends: cinder-common (= ${binary:Version}), ${misc:Depends}, ${python:Depends}
+Description: Cinder storage service - API server
+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
+ the ubiquitous cloud computing platform that will meet the needs of public
+ and private cloud providers regardless of size, by being simple to implement
+ and massively scalable.
+ .
+ Cinder is the OpenStack Block storage service.
+ .
+ This package contains the Cinder API server.
+
+Package: cinder-volume
+Architecture: all
+Depends:
+ cinder-common (= ${binary:Version}),
+ lvm2,
+ tgt,
+ ${misc:Depends},
+ ${python:Depends}
+Suggests: ceph-common
+Breaks: cinder-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
+Replaces: cinder-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
+Description: Cinder storage service - Volume server
+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
+ the ubiquitous cloud computing platform that will meet the needs of public
+ and private cloud providers regardless of size, by being simple to implement
+ and massively scalable.
+ .
+ Cinder is the OpenStack Block storage service.
+ .
+ This package contains the Cinder Volume server.
+
+Package: cinder-scheduler
+Architecture: all
+Depends: cinder-common (= ${binary:Version}), ${misc:Depends}, ${python:Depends}
+Description: Cinder storage service - Scheduler server
+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
+ the ubiquitous cloud computing platform that will meet the needs of public
+ and private cloud providers regardless of size, by being simple to implement
+ and massively scalable.
+ .
+ Cinder is the OpenStack Block storage service.
+ .
+ This package contains the Cinder Scheduler server.
+
+Package: cinder-backup
+Architecture: all
+Depends: cinder-common (= ${binary:Version}), ${misc:Depends}, ${python:Depends}
+Description: Cinder storage service - Scheduler server
+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
+ the ubiquitous cloud computing platform that will meet the needs of public
+ and private cloud providers regardless of size, by being simple to implement
+ and massively scalable.
+ .
+ Cinder is the OpenStack Block storage service.
+ .
+ This package contains the Cinder backup service.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..9d7959a
--- /dev/null
@@ -0,0 +1,25 @@
+Format: http://dep.debian.net/deps/dep5-
+Upstream-Name: nova
+Source: https://code.launchpad.net/nova
+
+Files: *
+Copyright: 2010 United States Government as represented
+                by the Administrator of the National Aeronautics
+                and Space Administration.
+Copyright: 2010 OpenStack LLC
+Copyright: Others (See individual files for more details)
+License: Apache-2
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+    http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian-based systems the full text of the Apache version 2.0 license
+ can be found in `/usr/share/common-licenses/Apache-2.0'.
diff --git a/debian/docs b/debian/docs
new file mode 100644 (file)
index 0000000..a1320b1
--- /dev/null
@@ -0,0 +1 @@
+README.rst
diff --git a/debian/logging.conf b/debian/logging.conf
new file mode 100644 (file)
index 0000000..476425b
--- /dev/null
@@ -0,0 +1,76 @@
+[loggers]
+keys = root, cinder
+
+[handlers]
+keys = stderr, stdout, watchedfile, syslog, null
+
+[formatters]
+keys = legacycinder, default
+
+[logger_root]
+level = WARNING
+handlers = null
+
+[logger_cinder]
+level = INFO
+handlers = stderr
+qualname = cinder
+
+[logger_amqplib]
+level = WARNING
+handlers = stderr
+qualname = amqplib
+
+[logger_sqlalchemy]
+level = WARNING
+handlers = stderr
+qualname = sqlalchemy
+# "level = INFO" logs SQL queries.
+# "level = DEBUG" logs SQL queries and results.
+# "level = WARNING" logs neither.  (Recommended for production systems.)
+
+[logger_boto]
+level = WARNING
+handlers = stderr
+qualname = boto
+
+[logger_suds]
+level = INFO
+handlers = stderr
+qualname = suds
+
+[logger_eventletwsgi]
+level = WARNING
+handlers = stderr
+qualname = eventlet.wsgi.server
+
+[handler_stderr]
+class = StreamHandler
+args = (sys.stderr,)
+formatter = legacycinder
+
+[handler_stdout]
+class = StreamHandler
+args = (sys.stdout,)
+formatter = legacycinder
+
+[handler_watchedfile]
+class = handlers.WatchedFileHandler
+args = ('cinder.log',)
+formatter = legacycinder
+
+[handler_syslog]
+class = handlers.SysLogHandler
+args = ('/dev/log', handlers.SysLogHandler.LOG_USER)
+formatter = legacycinder
+
+[handler_null]
+class = cinder.log.NullHandler
+formatter = default
+args = ()
+
+[formatter_legacycinder]
+class = cinder.log.LegacyCinderFormatter
+
+[formatter_default]
+format = %(message)s
diff --git a/debian/man/cinder-api.8 b/debian/man/cinder-api.8
new file mode 100644 (file)
index 0000000..e3f870e
--- /dev/null
@@ -0,0 +1,20 @@
+.TH cinder\-api 8
+.SH NAME
+cinder\-api \- frontend API server for cinder
+
+.SH SYNOPSIS
+.B cinder\-api
+.B \-\-config-file=<config-filepath>
+
+.SH DESCRIPTION
+.B cinder\-api
+
+This man page is a stub. Please contribute.
+
+.SH PARAMETERS
+
+.LP
+.B \-\-config-file=<config-filepath>
+.IP
+
+Path to the file containing options.
diff --git a/debian/man/cinder-manage.8 b/debian/man/cinder-manage.8
new file mode 100644 (file)
index 0000000..687bb7b
--- /dev/null
@@ -0,0 +1,21 @@
+.TH cinder\-manage 8
+.SH NAME
+cinder\-manage \- manages the cinder daemons
+
+.SH SYNOPSIS
+.B cinder\-manage
+.B <command>
+
+.SH DESCRIPTION
+.B cinder\-manage
+
+This man page is a stub. Please contribute.
+
+.SH PARAMETERS
+
+.LP
+.B <command>
+.IP
+
+cinder-manage.8 (END)
+
diff --git a/debian/man/cinder-rootwrap.8 b/debian/man/cinder-rootwrap.8
new file mode 100644 (file)
index 0000000..94d7f29
--- /dev/null
@@ -0,0 +1,22 @@
+.TH cinder\-rootwrap 8
+.SH NAME
+cinder\-rootwrap \- Authorizes and executes sudo commands on cinder's behalf
+
+.SH SYNOPSIS
+.B cinder\-rootwrap
+.B <command>
+
+.SH DESCRIPTION
+.B cinder\-rootwrap
+
+This man page is a stub. Please contribute.
+
+.SH PARAMETERS
+
+.LP
+.B <command>
+.IP
+
+Command to be executed with sudo
+cinder-rootwrap.8 (END)
+
diff --git a/debian/man/cinder-scheduler.8 b/debian/man/cinder-scheduler.8
new file mode 100644 (file)
index 0000000..e3f870e
--- /dev/null
@@ -0,0 +1,20 @@
+.TH cinder\-api 8
+.SH NAME
+cinder\-api \- frontend API server for cinder
+
+.SH SYNOPSIS
+.B cinder\-api
+.B \-\-config-file=<config-filepath>
+
+.SH DESCRIPTION
+.B cinder\-api
+
+This man page is a stub. Please contribute.
+
+.SH PARAMETERS
+
+.LP
+.B \-\-config-file=<config-filepath>
+.IP
+
+Path to the file containing options.
diff --git a/debian/man/cinder-volume.8 b/debian/man/cinder-volume.8
new file mode 100644 (file)
index 0000000..e3f870e
--- /dev/null
@@ -0,0 +1,20 @@
+.TH cinder\-api 8
+.SH NAME
+cinder\-api \- frontend API server for cinder
+
+.SH SYNOPSIS
+.B cinder\-api
+.B \-\-config-file=<config-filepath>
+
+.SH DESCRIPTION
+.B cinder\-api
+
+This man page is a stub. Please contribute.
+
+.SH PARAMETERS
+
+.LP
+.B \-\-config-file=<config-filepath>
+.IP
+
+Path to the file containing options.
diff --git a/debian/patches/fix_cinder_dependencies.patch b/debian/patches/fix_cinder_dependencies.patch
new file mode 100644 (file)
index 0000000..cfe6f6f
--- /dev/null
@@ -0,0 +1,11 @@
+diff -Naurp cinder-2013.1.g3.orig/tools/pip-requires cinder-2013.1.g3/tools/pip-requires
+--- cinder-2013.1.g3.orig/tools/pip-requires   2013-02-21 16:08:48.000000000 -0600
++++ cinder-2013.1.g3/tools/pip-requires        2013-02-22 10:38:34.786411293 -0600
+@@ -18,7 +18,6 @@ suds>=0.4
+ paramiko
+ Babel>=0.9.6
+ iso8601>=0.1.4
+-setuptools_git>=0.4
+ python-glanceclient>=0.5.0,<2
+ python-keystoneclient>=0.2.0
+ python-swiftclient
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..8065720
--- /dev/null
@@ -0,0 +1 @@
+fix_cinder_dependencies.patch
diff --git a/debian/python-cinder.install b/debian/python-cinder.install
new file mode 100644 (file)
index 0000000..036c6b9
--- /dev/null
@@ -0,0 +1 @@
+usr/lib/python*/dist-packages/*
diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..0c37cb6
--- /dev/null
@@ -0,0 +1,25 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DEBVERS ?= $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
+VERSION ?= $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//')
+export OSLO_PACKAGE_VERSION=$(VERSION)
+
+%:
+       dh $@  --with python2
+
+get-orig-source:
+       uscan --verbose --rename --destdir=../build-area
+
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+override_dh_auto_test:
+       PYTHONPATH=$(CURDIR) bash run_tests.sh -N
+endif
+
+override_dh_install:
+       dh_install --fail-missing -Xbin/cinder-all
+
+override_dh_fixperms:
+       dh_fixperms -Xcinder_tgt.conf
diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644 (file)
index 0000000..a0f52c8
--- /dev/null
@@ -0,0 +1,3 @@
+version=3
+opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/" \
+ https://launchpad.net/cinder/+download https://launchpad.net/cinder/.*/.*/.*/cinder-(.*)\.tar\.gz