Merge lp:~pabelanger/nova/dbconfig-common into lp:~ubuntu-server-dev/nova/essex

Proposed by Paul Belanger
Status: Rejected
Rejected by: Martin Pitt
Proposed branch: lp:~pabelanger/nova/dbconfig-common
Merge into: lp:~ubuntu-server-dev/nova/essex
Diff against target: 840 lines (+610/-24)
15 files modified
debian/changelog (+15/-0)
debian/control (+100/-14)
debian/gbp.conf (+5/-2)
debian/nova-backend-mysql.config (+38/-0)
debian/nova-backend-mysql.postinst (+77/-0)
debian/nova-backend-mysql.prerm (+47/-0)
debian/nova-backend-pgsql.config (+38/-0)
debian/nova-backend-pgsql.postinst (+77/-0)
debian/nova-backend-pgsql.prerm (+47/-0)
debian/nova-backend-sqlite3.config (+39/-0)
debian/nova-backend-sqlite3.postinst (+75/-0)
debian/nova-backend-sqlite3.prerm (+47/-0)
debian/nova-common.postinst (+0/-4)
debian/nova.conf (+1/-0)
debian/rules (+4/-4)
To merge this branch: bzr merge lp:~pabelanger/nova/dbconfig-common
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+97464@code.launchpad.net
To post a comment you must log in.
lp:~pabelanger/nova/dbconfig-common updated
340. By Paul Belanger

debian/control: python-nova depends on openssh-client (LP: #956177)

341. By Paul Belanger

Also update control file

Revision history for this message
Adam Gandelman (gandelman-a) wrote :

Paul-

I've merged the openssh dep fix with the latest upload (2012.1~rc1~20120316.13416-0ubuntu1)

I'm going to defer the rest of the changes until next week. Chuck (zul) has been working on merging our openstack packaging with the openstack packaging in Debian. Part of that work is merging in dbconfig-common stuff they've added to their packaging. This has already been done for keystone, and started for Glance. I'd prefer you guys work together on this when he is back from vacation next week to avoid conflicts and reduce any potential delta between the Ubuntu and Debian work.

Thanks
Adam

Revision history for this message
Paul Belanger (pabelanger) wrote :

Adam,
Okay, wish I knew that before working on this; oh well. Which version syncs with which? Is Ubuntu master or is Debian?

Revision history for this message
Martin Pitt (pitti) wrote :

This was "wontfix"ed by the server team two years ago, so I suppose this can be closed now?

Unmerged revisions

341. By Paul Belanger

Also update control file

340. By Paul Belanger

debian/control: python-nova depends on openssh-client (LP: #956177)

339. By Paul Belanger

* debian/control, debian/nova-backend-mysql,
  debian/nova-backend-pgsql, debian/nova-backend-sqlite3:
  - Add dbconfig-common support to nova (LP: #954915)
* debian/rules get-orig-source:
  - Download tarballs to '../tarballs'
  - Check if '../tarballs' exists, if not create it
  - Download current version not latest.
* debian/nova.conf: Add sql_connection setting
* debian/gbp.conf: Update for overlay

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2012-03-09 18:07:23 +0000
+++ debian/changelog 2012-03-15 17:59:22 +0000
@@ -1,3 +1,18 @@
1nova (2012.1~rc1~20120309.13261-0ubuntu2) UNRELEASED; urgency=low
2
3 * debian/control, debian/nova-backend-mysql,
4 debian/nova-backend-pgsql, debian/nova-backend-sqlite3:
5 - Add dbconfig-common support to nova (LP: #954915)
6 * debian/rules get-orig-source:
7 - Download tarballs to '../tarballs'
8 - Check if '../tarballs' exists, if not create it
9 - Download current version not latest.
10 * debian/nova.conf: Add sql_connection setting
11 * debian/gbp.conf: Adding git-buildpackage config file
12 * debian/control: python-nova depends on openssh-client (LP: #956177)
13
14 -- Paul Belanger <paul.belanger@polybeacon.com> Thu, 15 Mar 2012 13:54:58 -0400
15
1nova (2012.1~rc1~20120309.13261-0ubuntu1) precise; urgency=low16nova (2012.1~rc1~20120309.13261-0ubuntu1) precise; urgency=low
217
3 [ Chuck Short ]18 [ Chuck Short ]
419
=== modified file 'debian/control'
--- debian/control 2012-02-29 20:34:53 +0000
+++ debian/control 2012-03-15 17:59:22 +0000
@@ -50,7 +50,6 @@
50Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/nova/essex/debian/files50Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/nova/essex/debian/files
51Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-server-dev/nova/essex51Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-server-dev/nova/essex
5252
53
54Package: python-nova53Package: python-nova
55Architecture: all54Architecture: all
56Section: python55Section: python
@@ -87,6 +86,7 @@
87 python-suds,86 python-suds,
88 python-iso8601,87 python-iso8601,
89 sudo,88 sudo,
89 openssh-client,
90 ${misc:Depends}90 ${misc:Depends}
91Suggests: python-suds (>= 0.4.0),91Suggests: python-suds (>= 0.4.0),
92Conflicts: python-cjson92Conflicts: python-cjson
@@ -132,9 +132,83 @@
132 .132 .
133 This package contains things that are needed by all parts of Nova.133 This package contains things that are needed by all parts of Nova.
134134
135Package: nova-backend-mysql
136Architecture: all
137Depends: ${python:Depends}, ${misc:Depends}, nova-common (= ${binary:Version}), dbconfig-common, mysql-client, python-mysqldb
138Provides: nova-backend
139Conflicts: nova-backend
140Suggests: mysql-server
141Description: OpenStack Compute - Backend (MySQL)
142 OpenStack is a reliable cloud infrastructure. Its mission is to produce
143 the ubiquitous cloud computing platform that will meet the needs of public
144 and private cloud providers regardless of size, by being simple to implement
145 and massively scalable.
146 .
147 OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
148 addition to its "native" API (the OpenStack API), it also supports the Amazon
149 EC2 API.
150 .
151 Nova is intended to be modular and easy to extend and adapt. It supports many
152 different hypervisors (KVM and Xen to name a few), different database backends
153 (SQLite, MySQL, and PostgreSQL, for instance), different types of user
154 databases (LDAP or SQL), etc.
155 .
156 This version sets nova's backend to a MySQL database, and thus is suited
157 for large installations.
158
159
160Package: nova-backend-pgsql
161Architecture: all
162Depends: ${python:Depends}, ${misc:Depends}, nova-common (= ${binary:Version}), dbconfig-common, postgresql-client, python-psycopg2
163Provides: nova-backend
164Conflicts: nova-backend
165Suggests: mysql-server
166Description: OpenStack Compute - Backend (PostgreSQL)
167 OpenStack is a reliable cloud infrastructure. Its mission is to produce
168 the ubiquitous cloud computing platform that will meet the needs of public
169 and private cloud providers regardless of size, by being simple to implement
170 and massively scalable.
171 .
172 OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
173 addition to its "native" API (the OpenStack API), it also supports the Amazon
174 EC2 API.
175 .
176 Nova is intended to be modular and easy to extend and adapt. It supports many
177 different hypervisors (KVM and Xen to name a few), different database backends
178 (SQLite, MySQL, and PostgreSQL, for instance), different types of user
179 databases (LDAP or SQL), etc.
180 .
181 This version sets nova's backend to a MySQL database, and thus is suited
182 for large installations.
183
184Package: nova-backend-sqlite3
185Architecture: all
186Depends: ${python:Depends}, ${misc:Depends}, nova-common (= ${binary:Version}), dbconfig-common, sqlite3
187Provides: nova-backend
188Conflicts: nova-backend
189Suggests: mysql-server
190Description: OpenStack Compute - Backend (SQLite3)
191 OpenStack is a reliable cloud infrastructure. Its mission is to produce
192 the ubiquitous cloud computing platform that will meet the needs of public
193 and private cloud providers regardless of size, by being simple to implement
194 and massively scalable.
195 .
196 OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
197 addition to its "native" API (the OpenStack API), it also supports the Amazon
198 EC2 API.
199 .
200 Nova is intended to be modular and easy to extend and adapt. It supports many
201 different hypervisors (KVM and Xen to name a few), different database backends
202 (SQLite, MySQL, and PostgreSQL, for instance), different types of user
203 databases (LDAP or SQL), etc.
204 .
205 This version sets nova's backend to a MySQL database, and thus is suited
206 for smaller installations.
207
135Package: nova-compute208Package: nova-compute
136Architecture: all209Architecture: all
137Depends: lsb-base (>= 3.0.6), nova-common (= ${binary:Version}), qemu-utils, kpartx, curl, parted, vlan, 210Pre-Depends: nova-backend-sqlite3 (= ${binary:Version}) | nova-backend
211Depends: lsb-base (>= 3.0.6), qemu-utils, kpartx, curl, parted, vlan,
138 ebtables, gawk, iptables, open-iscsi, nova-compute-kvm | nova-compute-hypervisor,212 ebtables, gawk, iptables, open-iscsi, nova-compute-kvm | nova-compute-hypervisor,
139 ${python:Depends}, ${misc:Depends}213 ${python:Depends}, ${misc:Depends}
140Description: OpenStack Compute - compute node214Description: OpenStack Compute - compute node
@@ -330,7 +404,8 @@
330404
331Package: nova-cert405Package: nova-cert
332Architecture: all406Architecture: all
333Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}407Pre-Depends: nova-backend-sqlite3 (= ${binary:Version}) | nova-backend
408Depends: ${ostack-lsb-base}, ${python:Depends}, ${misc:Depends}
334Description: OpenStack Compute - virtual machine scheduler409Description: OpenStack Compute - virtual machine scheduler
335 OpenStack is a reliable cloud infrastructure. Its mission is to produce410 OpenStack is a reliable cloud infrastructure. Its mission is to produce
336 the ubiquitous cloud computing platform that will meet the needs of public411 the ubiquitous cloud computing platform that will meet the needs of public
@@ -350,7 +425,8 @@
350425
351Package: nova-scheduler426Package: nova-scheduler
352Architecture: all427Architecture: all
353Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}428Pre-Depends: nova-backend-sqlite3 (= ${binary:Version}) | nova-backend
429Depends: ${ostack-lsb-base}, ${python:Depends}, ${misc:Depends}
354Description: OpenStack Compute - virtual machine scheduler430Description: OpenStack Compute - virtual machine scheduler
355 OpenStack is a reliable cloud infrastructure. Its mission is to produce431 OpenStack is a reliable cloud infrastructure. Its mission is to produce
356 the ubiquitous cloud computing platform that will meet the needs of public432 the ubiquitous cloud computing platform that will meet the needs of public
@@ -370,7 +446,8 @@
370446
371Package: nova-volume447Package: nova-volume
372Architecture: all448Architecture: all
373Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), lvm2, tgt, ${python:Depends}, ${misc:Depends}449Pre-Depends: nova-backend-sqlite3 (= ${binary:Version}) | nova-backend
450Depends: ${ostack-lsb-base}, lvm2, tgt, ${python:Depends}, ${misc:Depends}
374Suggests: sheepdog451Suggests: sheepdog
375Description: OpenStack Compute - storage452Description: OpenStack Compute - storage
376 OpenStack is a reliable cloud infrastructure. Its mission is to produce453 OpenStack is a reliable cloud infrastructure. Its mission is to produce
@@ -410,7 +487,8 @@
410487
411Package: nova-vncproxy488Package: nova-vncproxy
412Architecture: all489Architecture: all
413Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}490Pre-Depends: nova-backend-sqlite3 (= ${binary:Version}) | nova-backend
491Depends: ${ostack-lsb-base}, ${python:Depends}, ${misc:Depends}
414Description: OpenStack Compute - VNC proxy492Description: OpenStack Compute - VNC proxy
415 OpenStack is a reliable cloud infrastructure. Its mission is to produce493 OpenStack is a reliable cloud infrastructure. Its mission is to produce
416 the ubiquitous cloud computing platform that will meet the needs of public494 the ubiquitous cloud computing platform that will meet the needs of public
@@ -431,7 +509,8 @@
431509
432Package: nova-api510Package: nova-api
433Architecture: all511Architecture: all
434Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), nova-cert, ${python:Depends}, ${misc:Depends}512Pre-Depends: nova-backend-sqlite3 (= ${binary:Version}) | nova-backend
513Depends: ${ostack-lsb-base}, nova-cert, ${python:Depends}, ${misc:Depends}
435Description: OpenStack Compute - API frontend514Description: OpenStack Compute - API frontend
436 OpenStack is a reliable cloud infrastructure. Its mission is to produce515 OpenStack is a reliable cloud infrastructure. Its mission is to produce
437 the ubiquitous cloud computing platform that will meet the needs of public516 the ubiquitous cloud computing platform that will meet the needs of public
@@ -451,7 +530,8 @@
451530
452Package: nova-network531Package: nova-network
453Architecture: all532Architecture: all
454Depends: ${ostack-lsb-base}, netcat, vlan, bridge-utils, dnsmasq-base, iputils-arping, dnsmasq-utils, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}533Pre-Depends: nova-backend-sqlite3 (= ${binary:Version}) | nova-backend
534Depends: ${ostack-lsb-base}, netcat, vlan, bridge-utils, dnsmasq-base, iputils-arping, dnsmasq-utils, ${python:Depends}, ${misc:Depends}
455Suggests: radvd535Suggests: radvd
456Description: OpenStack Compute - Network manager536Description: OpenStack Compute - Network manager
457 OpenStack is a reliable cloud infrastructure. Its mission is to produce537 OpenStack is a reliable cloud infrastructure. Its mission is to produce
@@ -476,7 +556,8 @@
476556
477Package: nova-objectstore557Package: nova-objectstore
478Architecture: all558Architecture: all
479Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}559Pre-Depends: nova-backend-sqlite3 (= ${binary:Version}) | nova-backend
560Depends: ${ostack-lsb-base}, ${python:Depends}, ${misc:Depends}
480Description: OpenStack Compute - object store561Description: OpenStack Compute - object store
481 OpenStack is a reliable cloud infrastructure. Its mission is to produce562 OpenStack is a reliable cloud infrastructure. Its mission is to produce
482 the ubiquitous cloud computing platform that will meet the needs of public563 the ubiquitous cloud computing platform that will meet the needs of public
@@ -497,7 +578,8 @@
497578
498Package: nova-console579Package: nova-console
499Architecture: all580Architecture: all
500Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}581Pre-Depends: nova-backend-sqlite3 (= ${binary:Version}) | nova-backend
582Depends: ${ostack-lsb-base}, ${python:Depends}, ${misc:Depends}
501Description: OpenStack Compute - Console583Description: OpenStack Compute - Console
502 OpenStack is a reliable cloud infrastructure. Its mission is to produce584 OpenStack is a reliable cloud infrastructure. Its mission is to produce
503 the ubiquitous cloud computing platform that will meet the needs of public585 the ubiquitous cloud computing platform that will meet the needs of public
@@ -541,7 +623,8 @@
541623
542Package: nova-api-metadata624Package: nova-api-metadata
543Architecture: all625Architecture: all
544Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}626Pre-Depends: nova-backend-sqlite3 (= ${binary:Version}) | nova-backend
627Depends: ${ostack-lsb-base}, ${python:Depends}, ${misc:Depends}
545Description: OpenStack Compute - metadata API frontend628Description: OpenStack Compute - metadata API frontend
546 OpenStack is a reliable cloud infrastructure. Its mission is to produce629 OpenStack is a reliable cloud infrastructure. Its mission is to produce
547 the ubiquitous cloud computing platform that will meet the needs of public630 the ubiquitous cloud computing platform that will meet the needs of public
@@ -556,7 +639,8 @@
556639
557Package: nova-api-os-compute640Package: nova-api-os-compute
558Architecture: all641Architecture: all
559Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}642Pre-Depends: nova-backend-sqlite3 (= ${binary:Version}) | nova-backend
643Depends: ${ostack-lsb-base}, ${python:Depends}, ${misc:Depends}
560Description: OpenStack Compute - OpenStack Compute API frontend644Description: OpenStack Compute - OpenStack Compute API frontend
561 OpenStack is a reliable cloud infrastructure. Its mission is to produce645 OpenStack is a reliable cloud infrastructure. Its mission is to produce
562 the ubiquitous cloud computing platform that will meet the needs of public646 the ubiquitous cloud computing platform that will meet the needs of public
@@ -571,7 +655,8 @@
571655
572Package: nova-api-os-volume656Package: nova-api-os-volume
573Architecture: all657Architecture: all
574Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}658Pre-Depends: nova-backend-sqlite3 (= ${binary:Version}) | nova-backend
659Depends: ${ostack-lsb-base}, ${python:Depends}, ${misc:Depends}
575Description: OpenStack Compute - OpenStack Volume API frontend660Description: OpenStack Compute - OpenStack Volume API frontend
576 OpenStack is a reliable cloud infrastructure. Its mission is to produce661 OpenStack is a reliable cloud infrastructure. Its mission is to produce
577 the ubiquitous cloud computing platform that will meet the needs of public662 the ubiquitous cloud computing platform that will meet the needs of public
@@ -586,7 +671,8 @@
586671
587Package: nova-api-ec2672Package: nova-api-ec2
588Architecture: all673Architecture: all
589Depends: ${ostack-lsb-base}, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}674Pre-Depends: nova-backend-sqlite3 (= ${binary:Version}) | nova-backend
675Depends: ${ostack-lsb-base}, ${python:Depends}, ${misc:Depends}
590Description: OpenStack Compute - EC2 API frontend676Description: OpenStack Compute - EC2 API frontend
591 OpenStack is a reliable cloud infrastructure. Its mission is to produce677 OpenStack is a reliable cloud infrastructure. Its mission is to produce
592 the ubiquitous cloud computing platform that will meet the needs of public678 the ubiquitous cloud computing platform that will meet the needs of public
593679
=== modified file 'debian/gbp.conf'
--- debian/gbp.conf 2012-02-20 01:43:23 +0000
+++ debian/gbp.conf 2012-03-15 17:59:22 +0000
@@ -1,6 +1,9 @@
1[DEFAULT]1[DEFAULT]
2upstream-branch = master2cleaner = /bin/true
3debian-branch = debian/unstable
43
5[git-buildpackage]4[git-buildpackage]
6export-dir = ../build-area/5export-dir = ../build-area/
6tarball-dir = ../tarballs/
7overlay = True
8pristine-tar = False
9compression = gzip
710
=== added file 'debian/nova-backend-mysql.config'
--- debian/nova-backend-mysql.config 1970-01-01 00:00:00 +0000
+++ debian/nova-backend-mysql.config 2012-03-15 17:59:22 +0000
@@ -0,0 +1,38 @@
1#!/bin/sh
2# config script for nova-backend-mysql
3#
4# see: dh_installdeb(1)
5
6# source debconf stuff
7. /usr/share/debconf/confmodule
8
9set -e
10
11if [ -f /usr/share/dbconfig-common/dpkg/config.mysql ]; then
12 dbc_dbname=nova
13 dbc_dbuser=nova
14 dbc_first_version=2012.1~rc1~20120309.13261-0ubuntu2
15
16 . /usr/share/dbconfig-common/dpkg/config.mysql
17 dbc_go nova-backend-mysql $@
18fi
19
20case "$1" in
21 configure)
22 ;;
23
24 reconfigure)
25 ;;
26
27 *)
28 echo "config called with unknown argument \`$1'" >&2
29 exit 1
30 ;;
31esac
32
33# dh_installdeb will replace this with shell code automatically
34# generated by other debhelper scripts.
35
36#DEBHELPER#
37
38exit 0
039
=== added file 'debian/nova-backend-mysql.postinst'
--- debian/nova-backend-mysql.postinst 1970-01-01 00:00:00 +0000
+++ debian/nova-backend-mysql.postinst 2012-03-15 17:59:22 +0000
@@ -0,0 +1,77 @@
1#!/bin/sh
2# postinst script for nova-backend-mysql
3#
4# see: dh_installdeb(1)
5
6# source debconf stuff
7. /usr/share/debconf/confmodule
8
9set -e
10
11# summary of how this script can be called:
12# * <postinst> `configure' <most-recently-configured-version>
13# * <old-postinst> `abort-upgrade' <new version>
14# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
15# <new-version>
16# * <postinst> `abort-remove'
17# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
18# <failed-install-package> <version> `removing'
19# <conflicting-package> <version>
20# for details, see http://www.debian.org/doc/debian-policy/ or
21# the debian-policy package
22
23if [ -f /usr/share/dbconfig-common/dpkg/postinst.mysql ]; then
24 dbc_first_version=2012.1~rc1~20120309.13261-0ubuntu2
25
26 . /usr/share/dbconfig-common/dpkg/postinst.mysql
27 dbc_go nova-backend-mysql $@
28fi
29
30PACKAGES="nova-api nova-api-ec2 nova-api-metadata nova-api-os-compute \
31nova-api-os-volume nova-cert nova-compute nova-console nova-network \
32nova-objectstore nova-scheduler nova-volume nova-vpnproxy"
33
34CFGFILE="/etc/nova/nova.conf"
35
36case "$1" in
37 configure)
38 echo -n "Processing configuration..."
39 . /etc/dbconfig-common/nova-backend-mysql.conf
40
41 if [ "$dbc_install" = "true" ]; then
42 TARGET=$CFGFILE.dpkg-tmp
43 if [ "$dbc_dbserver" = "" ]; then
44 dbc_dbserver=localhost
45 fi
46
47 SQLCONN="$dbc_dbtype://$dbc_dbuser:$dbc_dbpass@$dbc_dbserver/$dbc_dbname"
48 sed -e "s|^--sql_connection=.*|--sql_connection=$SQLCONN|" \
49 $CFGFILE > $TARGET
50 mv $TARGET $CFGFILE
51
52 su -s /bin/sh -c 'nova-manage db sync' nova
53 fi
54
55 echo "Ok."
56 ;;
57
58 abort-upgrade|abort-remove|abort-deconfigure)
59 ;;
60
61 *)
62 echo "postinst called with unknown argument \`$1'" >&2
63 exit 1
64 ;;
65esac
66
67# Do start daemon(s)
68for PKG in $PACKAGES; do
69 invoke-rc.d --quiet $PKG start || true
70done
71
72# dh_installdeb will replace this with shell code automatically
73# generated by other debhelper scripts.
74
75#DEBHELPER#
76
77exit 0
078
=== added file 'debian/nova-backend-mysql.prerm'
--- debian/nova-backend-mysql.prerm 1970-01-01 00:00:00 +0000
+++ debian/nova-backend-mysql.prerm 2012-03-15 17:59:22 +0000
@@ -0,0 +1,47 @@
1#!/bin/sh
2# prerm script for nova-backend-mysql
3#
4# see: dh_installdeb(1)
5
6set -e
7
8# summary of how this script can be called:
9# * <prerm> `remove'
10# * <old-prerm> `upgrade' <new-version>
11# * <new-prerm> `failed-upgrade' <old-version>
12# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
13# * <deconfigured's-prerm> `deconfigure' `in-favour'
14# <package-being-installed> <version> `removing'
15# <conflicting-package> <version>
16# for details, see http://www.debian.org/doc/debian-policy/ or
17# the debian-policy package
18
19PACKAGES="nova-api nova-api-ec2 nova-api-metadata nova-api-os-compute \
20nova-api-os-volume nova-cert nova-compute nova-console nova-network \
21nova-objectstore nova-scheduler nova-volume nova-vpnproxy"
22
23case "$1" in
24 remove|deconfigure)
25 for PKG in $PACKAGES; do
26 invoke-rc.d --quiet $PKG stop || true
27 done;
28 ;;
29
30 upgrade)
31 ;;
32
33 failed-upgrade)
34 ;;
35
36 *)
37 echo "prerm called with unknown argument \`$1'" >&2
38 exit 1
39 ;;
40esac
41
42# dh_installdeb will replace this with shell code automatically
43# generated by other debhelper scripts.
44
45#DEBHELPER#
46
47exit 0
048
=== added file 'debian/nova-backend-pgsql.config'
--- debian/nova-backend-pgsql.config 1970-01-01 00:00:00 +0000
+++ debian/nova-backend-pgsql.config 2012-03-15 17:59:22 +0000
@@ -0,0 +1,38 @@
1#!/bin/sh
2# config script for nova-backend-pgsql
3#
4# see: dh_installdeb(1)
5
6# source debconf stuff
7. /usr/share/debconf/confmodule
8
9set -e
10
11if [ -f /usr/share/dbconfig-common/dpkg/config.pgsql ]; then
12 dbc_dbname=nova
13 dbc_dbuser=nova
14 dbc_first_version=2012.1~rc1~20120309.13261-0ubuntu2
15
16 . /usr/share/dbconfig-common/dpkg/config.pgsql
17 dbc_go nova-backend-pgsql $@
18fi
19
20case "$1" in
21 configure)
22 ;;
23
24 reconfigure)
25 ;;
26
27 *)
28 echo "config called with unknown argument \`$1'" >&2
29 exit 1
30 ;;
31esac
32
33# dh_installdeb will replace this with shell code automatically
34# generated by other debhelper scripts.
35
36#DEBHELPER#
37
38exit 0
039
=== added file 'debian/nova-backend-pgsql.postinst'
--- debian/nova-backend-pgsql.postinst 1970-01-01 00:00:00 +0000
+++ debian/nova-backend-pgsql.postinst 2012-03-15 17:59:22 +0000
@@ -0,0 +1,77 @@
1#!/bin/sh
2# postinst script for nova-backend-pgsql
3#
4# see: dh_installdeb(1)
5
6# source debconf stuff
7. /usr/share/debconf/confmodule
8
9set -e
10
11# summary of how this script can be called:
12# * <postinst> `configure' <most-recently-configured-version>
13# * <old-postinst> `abort-upgrade' <new version>
14# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
15# <new-version>
16# * <postinst> `abort-remove'
17# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
18# <failed-install-package> <version> `removing'
19# <conflicting-package> <version>
20# for details, see http://www.debian.org/doc/debian-policy/ or
21# the debian-policy package
22
23if [ -f /usr/share/dbconfig-common/dpkg/postinst.pgsql ]; then
24 dbc_first_version=2012.1~rc1~20120309.13261-0ubuntu2
25
26 . /usr/share/dbconfig-common/dpkg/postinst.pgsql
27 dbc_go nova-backend-pgsql $@
28fi
29
30PACKAGES="nova-api nova-api-ec2 nova-api-metadata nova-api-os-compute \
31nova-api-os-volume nova-cert nova-compute nova-console nova-network \
32nova-objectstore nova-scheduler nova-volume nova-vpnproxy"
33
34CFGFILE="/etc/nova/nova.conf"
35
36case "$1" in
37 configure)
38 echo -n "Processing configuration..."
39 . /etc/dbconfig-common/nova-backend-pgsql.conf
40
41 if [ "$dbc_install" = "true" ]; then
42 TARGET=$CFGFILE.dpkg-tmp
43 if [ "$dbc_dbserver" = "" ]; then
44 dbc_dbserver=localhost
45 fi
46
47 SQLCONN="postgresql://$dbc_dbuser:$dbc_dbpass@$dbc_dbserver/$dbc_dbname"
48 sed -e "s|^--sql_connection=.*|--sql_connection=$SQLCONN|" \
49 $CFGFILE > $TARGET
50 mv $TARGET $CFGFILE
51
52 su -s /bin/sh -c 'nova-manage db sync' nova
53 fi
54
55 echo "Ok."
56 ;;
57
58 abort-upgrade|abort-remove|abort-deconfigure)
59 ;;
60
61 *)
62 echo "postinst called with unknown argument \`$1'" >&2
63 exit 1
64 ;;
65esac
66
67# Do start daemon(s)
68for PKG in $PACKAGES; do
69 invoke-rc.d --quiet $PKG start || true
70done
71
72# dh_installdeb will replace this with shell code automatically
73# generated by other debhelper scripts.
74
75#DEBHELPER#
76
77exit 0
078
=== added file 'debian/nova-backend-pgsql.prerm'
--- debian/nova-backend-pgsql.prerm 1970-01-01 00:00:00 +0000
+++ debian/nova-backend-pgsql.prerm 2012-03-15 17:59:22 +0000
@@ -0,0 +1,47 @@
1#!/bin/sh
2# prerm script for nova-backend-pgsql
3#
4# see: dh_installdeb(1)
5
6set -e
7
8# summary of how this script can be called:
9# * <prerm> `remove'
10# * <old-prerm> `upgrade' <new-version>
11# * <new-prerm> `failed-upgrade' <old-version>
12# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
13# * <deconfigured's-prerm> `deconfigure' `in-favour'
14# <package-being-installed> <version> `removing'
15# <conflicting-package> <version>
16# for details, see http://www.debian.org/doc/debian-policy/ or
17# the debian-policy package
18
19PACKAGES="nova-api nova-api-ec2 nova-api-metadata nova-api-os-compute \
20nova-api-os-volume nova-cert nova-compute nova-console nova-network \
21nova-objectstore nova-scheduler nova-volume nova-vpnproxy"
22
23case "$1" in
24 remove|deconfigure)
25 for PKG in $PACKAGES; do
26 invoke-rc.d --quiet $PKG stop || true
27 done;
28 ;;
29
30 upgrade)
31 ;;
32
33 failed-upgrade)
34 ;;
35
36 *)
37 echo "prerm called with unknown argument \`$1'" >&2
38 exit 1
39 ;;
40esac
41
42# dh_installdeb will replace this with shell code automatically
43# generated by other debhelper scripts.
44
45#DEBHELPER#
46
47exit 0
048
=== added file 'debian/nova-backend-sqlite3.config'
--- debian/nova-backend-sqlite3.config 1970-01-01 00:00:00 +0000
+++ debian/nova-backend-sqlite3.config 2012-03-15 17:59:22 +0000
@@ -0,0 +1,39 @@
1#!/bin/sh
2# config script for nova-backend-sqlite3
3#
4# see: dh_installdeb(1)
5
6# source debconf stuff
7. /usr/share/debconf/confmodule
8
9set -e
10
11if [ -f /usr/share/dbconfig-common/dpkg/config.sqlite3 ]; then
12 dbc_basepath=/var/lib/nova
13 dbc_dbname=nova.sqlite
14 dbc_dbuser=nova
15 dbc_first_version=2012.1~rc1~20120309.13261-0ubuntu2
16
17 . /usr/share/dbconfig-common/dpkg/config.sqlite3
18 dbc_go nova-backend-sqlite3 $@
19fi
20
21case "$1" in
22 configure)
23 ;;
24
25 reconfigure)
26 ;;
27
28 *)
29 echo "config called with unknown argument \`$1'" >&2
30 exit 1
31 ;;
32esac
33
34# dh_installdeb will replace this with shell code automatically
35# generated by other debhelper scripts.
36
37#DEBHELPER#
38
39exit 0
040
=== added file 'debian/nova-backend-sqlite3.postinst'
--- debian/nova-backend-sqlite3.postinst 1970-01-01 00:00:00 +0000
+++ debian/nova-backend-sqlite3.postinst 2012-03-15 17:59:22 +0000
@@ -0,0 +1,75 @@
1#!/bin/sh
2# postinst script for nova-backend-sqlite3
3#
4# see: dh_installdeb(1)
5
6# source debconf stuff
7. /usr/share/debconf/confmodule
8
9set -e
10
11# summary of how this script can be called:
12# * <postinst> `configure' <most-recently-configured-version>
13# * <old-postinst> `abort-upgrade' <new version>
14# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
15# <new-version>
16# * <postinst> `abort-remove'
17# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
18# <failed-install-package> <version> `removing'
19# <conflicting-package> <version>
20# for details, see http://www.debian.org/doc/debian-policy/ or
21# the debian-policy package
22
23if [ -f /usr/share/dbconfig-common/dpkg/postinst.sqlite3 ]; then
24 dbc_first_version=2012.1~rc1~20120309.13261-0ubuntu2
25
26 . /usr/share/dbconfig-common/dpkg/postinst.sqlite3
27 dbc_go nova-backend-sqlite3 $@
28fi
29
30PACKAGES="nova-api nova-api-ec2 nova-api-metadata nova-api-os-compute \
31nova-api-os-volume nova-cert nova-compute nova-console nova-network \
32nova-objectstore nova-scheduler nova-volume nova-vpnproxy"
33
34CFGFILE="/etc/nova/nova.conf"
35
36case "$1" in
37 configure)
38 echo -n "Processing configuration..."
39 . /etc/dbconfig-common/nova-backend-sqlite3.conf
40
41 if [ "$dbc_install" = "true" ]; then
42 TARGET=$CFGFILE.dpkg-tmp
43 DB="$dbc_basepath/$dbc_dbname"
44 SQLCONN="sqlite:///$DB"
45 sed -e "s|^--sql_connection=.*|--sql_connection=$SQLCONN|" \
46 $CFGFILE > $TARGET
47 mv $TARGET $CFGFILE
48
49 chown nova: $dbc_basepath $DB
50 su -s /bin/sh -c 'nova-manage db sync' nova
51 fi
52
53 echo "Ok."
54 ;;
55
56 abort-upgrade|abort-remove|abort-deconfigure)
57 ;;
58
59 *)
60 echo "postinst called with unknown argument \`$1'" >&2
61 exit 1
62 ;;
63esac
64
65# Do start daemon(s)
66for PKG in $PACKAGES; do
67 invoke-rc.d --quiet $PKG start || true
68done
69
70# dh_installdeb will replace this with shell code automatically
71# generated by other debhelper scripts.
72
73#DEBHELPER#
74
75exit 0
076
=== added file 'debian/nova-backend-sqlite3.prerm'
--- debian/nova-backend-sqlite3.prerm 1970-01-01 00:00:00 +0000
+++ debian/nova-backend-sqlite3.prerm 2012-03-15 17:59:22 +0000
@@ -0,0 +1,47 @@
1#!/bin/sh
2# prerm script for nova-backend-sql
3#
4# see: dh_installdeb(1)
5
6set -e
7
8# summary of how this script can be called:
9# * <prerm> `remove'
10# * <old-prerm> `upgrade' <new-version>
11# * <new-prerm> `failed-upgrade' <old-version>
12# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
13# * <deconfigured's-prerm> `deconfigure' `in-favour'
14# <package-being-installed> <version> `removing'
15# <conflicting-package> <version>
16# for details, see http://www.debian.org/doc/debian-policy/ or
17# the debian-policy package
18
19PACKAGES="nova-api nova-api-ec2 nova-api-metadata nova-api-os-compute \
20nova-api-os-volume nova-cert nova-compute nova-console nova-network \
21nova-objectstore nova-scheduler nova-volume nova-vpnproxy"
22
23case "$1" in
24 remove|deconfigure)
25 for PKG in $PACKAGES; do
26 invoke-rc.d --quiet $PKG stop || true
27 done;
28 ;;
29
30 upgrade)
31 ;;
32
33 failed-upgrade)
34 ;;
35
36 *)
37 echo "prerm called with unknown argument \`$1'" >&2
38 exit 1
39 ;;
40esac
41
42# dh_installdeb will replace this with shell code automatically
43# generated by other debhelper scripts.
44
45#DEBHELPER#
46
47exit 0
048
=== modified file 'debian/nova-common.postinst'
--- debian/nova-common.postinst 2012-02-13 17:01:11 +0000
+++ debian/nova-common.postinst 2012-03-15 17:59:22 +0000
@@ -44,10 +44,6 @@
44 chmod 600 /etc/nova/policy.json44 chmod 600 /etc/nova/policy.json
45 chmod 0440 /etc/sudoers.d/nova_sudoers45 chmod 0440 /etc/sudoers.d/nova_sudoers
46 chmod 0700 /var/log/nova46 chmod 0700 /var/log/nova
47 if ! grep -q sql_connection /etc/nova/nova.conf
48 then
49 su -s /bin/sh -c 'nova-manage db sync' nova
50 fi
51fi47fi
5248
53#DEBHELPER#49#DEBHELPER#
5450
=== modified file 'debian/nova.conf'
--- debian/nova.conf 2012-02-13 19:38:28 +0000
+++ debian/nova.conf 2012-03-15 17:59:22 +0000
@@ -9,3 +9,4 @@
9--connection_type=libvirt9--connection_type=libvirt
10--root_helper=sudo nova-rootwrap10--root_helper=sudo nova-rootwrap
11--verbose11--verbose
12--sql_connection=sqlite:////var/lib/nova/nova.sqlite
1213
=== modified file 'debian/rules'
--- debian/rules 2012-03-06 23:31:34 +0000
+++ debian/rules 2012-03-15 17:59:22 +0000
@@ -35,10 +35,6 @@
35 mkdir -p $(CURDIR)/doc/build/html35 mkdir -p $(CURDIR)/doc/build/html
36endif36endif
3737
38get-orig-source:
39 uscan --verbose --force-download --rename --destdir=../build-area
40
41
42UPSTREAM_GIT=git://github.com/openstack/nova.git38UPSTREAM_GIT=git://github.com/openstack/nova.git
43DEBIAN_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')39DEBIAN_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
44DEBIAN_NAME=nova40DEBIAN_NAME=nova
@@ -82,3 +78,7 @@
82override_dh_python2:78override_dh_python2:
83 dh_python279 dh_python2
84 dh_python2 /usr/lib/xcp80 dh_python2 /usr/lib/xcp
81
82get-orig-source:
83 @@[ -d ../tarballs/. ] || mkdir -p ../tarballs
84 uscan --verbose --force-download --download-current-version --destdir=../tarballs

Subscribers

People subscribed via source and target branches