[Python-apps-commits] r9386 - in packages/cloud-init/trunk/debian (11 files)
acid at users.alioth.debian.org
acid at users.alioth.debian.org
Mon Jan 28 17:04:43 UTC 2013
Date: Monday, January 28, 2013 @ 17:04:32
Author: acid
Revision: 9386
New upstream release.
Added:
packages/cloud-init/trunk/debian/00_debian.cfg
packages/cloud-init/trunk/debian/clean
packages/cloud-init/trunk/debian/cloud-init.install
packages/cloud-init/trunk/debian/cloud.cfg
packages/cloud-init/trunk/debian/source/options
Modified:
packages/cloud-init/trunk/debian/changelog
packages/cloud-init/trunk/debian/cloud-init.postinst
packages/cloud-init/trunk/debian/control
packages/cloud-init/trunk/debian/rules
Deleted:
packages/cloud-init/trunk/debian/patches/fix-cfg-builtin.patch
packages/cloud-init/trunk/debian/patches/series
Added: packages/cloud-init/trunk/debian/00_debian.cfg
===================================================================
--- packages/cloud-init/trunk/debian/00_debian.cfg (rev 0)
+++ packages/cloud-init/trunk/debian/00_debian.cfg 2013-01-28 17:04:32 UTC (rev 9386)
@@ -0,0 +1 @@
+syslog_fix_perms: root:adm
\ No newline at end of file
Modified: packages/cloud-init/trunk/debian/changelog
===================================================================
--- packages/cloud-init/trunk/debian/changelog 2013-01-28 04:17:00 UTC (rev 9385)
+++ packages/cloud-init/trunk/debian/changelog 2013-01-28 17:04:32 UTC (rev 9386)
@@ -1,4 +1,4 @@
-cloud-init (0.6.3-3) UNRELEASED; urgency=low
+cloud-init (0.7.1-1) UNRELEASED; urgency=low
[ Miguel Landaeta ]
* Remove unowned files in /etc/apt/apt.conf.d/ after purge. (Closes: #674237).
@@ -7,14 +7,16 @@
* Add myself as Uploader.
[ Julien Danjou ]
+ * New upstream release.
* Add myself as Uploader.
* Add missing python-boto dependency.
* Add fix-cfg-builtin.patch to set syslog_fix_perms to root:adm by
default since we don't have any syslog user in Debian.
* Depends on Python >= 2.7, at least because subprocess needs
check_output method.
+ * Drop CDBS
- -- Miguel Landaeta <miguel at miguel.cc> Sun, 05 Aug 2012 21:15:36 -0430
+ -- Julien Danjou <acid at debian.org> Mon, 28 Jan 2013 10:49:10 +0100
cloud-init (0.6.3-2) experimental; urgency=low
Added: packages/cloud-init/trunk/debian/clean
===================================================================
--- packages/cloud-init/trunk/debian/clean (rev 0)
+++ packages/cloud-init/trunk/debian/clean 2013-01-28 17:04:32 UTC (rev 9386)
@@ -0,0 +1 @@
+cloud_init.egg-info/*
\ No newline at end of file
Added: packages/cloud-init/trunk/debian/cloud-init.install
===================================================================
--- packages/cloud-init/trunk/debian/cloud-init.install (rev 0)
+++ packages/cloud-init/trunk/debian/cloud-init.install 2013-01-28 17:04:32 UTC (rev 9386)
@@ -0,0 +1,4 @@
+tools/21-cloudinit.conf etc/rsyslog.d/21-cloudinit.conf
+tools/Z99-cloud-locale-test.sh etc/profile.d
+debian/00_debian.cfg etc/cloud/cloud.cfg.d
+debian/cloud.cfg etc/cloud
\ No newline at end of file
Modified: packages/cloud-init/trunk/debian/cloud-init.postinst
===================================================================
--- packages/cloud-init/trunk/debian/cloud-init.postinst 2013-01-28 04:17:00 UTC (rev 9385)
+++ packages/cloud-init/trunk/debian/cloud-init.postinst 2013-01-28 17:04:32 UTC (rev 9386)
@@ -115,7 +115,7 @@
}
if [ "$1" = "configure" ]; then
- # disable ureadahead (LP: #499520, see also LP: #997838).
+ # disable ureadahead (LP: #499520)
dpkg-divert --package cloud-init --rename --divert \
/etc/init/ureadahead.conf.disabled --add /etc/init/ureadahead.conf
if db_get cloud-init/datasources; then
@@ -135,7 +135,7 @@
# cloud-init to run it on next boot.
pipeline_f="/etc/apt/apt.conf.d/90cloud-init-pipelining"
if [ -f /var/lib/cloud/instance/obj.pkl ]; then
- cloud-init-cfg apt-pipelining once-per-instance >/dev/null 2>&1 ||
+ cloud-init single --name apt-pipelining --frequency once >/dev/null 2>&1 ||
echo "Warning: failed to setup apt-pipelining" 1>&2
elif [ ! -f "$pipeline_f" ]; then
# there was no cloud available, so populate it ourselves.
Added: packages/cloud-init/trunk/debian/cloud.cfg
===================================================================
--- packages/cloud-init/trunk/debian/cloud.cfg (rev 0)
+++ packages/cloud-init/trunk/debian/cloud.cfg 2013-01-28 17:04:32 UTC (rev 9386)
@@ -0,0 +1,93 @@
+# The top level settings are used as module
+# and system configuration.
+
+# A set of users which may be applied and/or used by various modules
+# when a 'default' entry is found it will reference the 'default_user'
+# from the distro configuration specified below
+users:
+ - default
+
+# If this is set, 'root' will not be able to ssh in and they
+# will get a message to login instead as the above $user (ubuntu)
+disable_root: true
+
+# This will cause the set+update hostname module to not operate (if true)
+preserve_hostname: false
+
+# Example datasource config
+# datasource:
+# Ec2:
+# metadata_urls: [ 'blah.com' ]
+# timeout: 5 # (defaults to 50 seconds)
+# max_wait: 10 # (defaults to 120 seconds)
+
+# The modules that run in the 'init' stage
+cloud_init_modules:
+ - migrator
+ - bootcmd
+ - write-files
+ - resizefs
+ - set_hostname
+ - update_hostname
+ - update_etc_hosts
+ - ca-certs
+ - rsyslog
+ - users-groups
+ - ssh
+
+# The modules that run in the 'config' stage
+cloud_config_modules:
+# Emit the cloud config ready event
+# this can be used by upstart jobs for 'start on cloud-config'.
+ - emit_upstart
+ - mounts
+ - ssh-import-id
+ - locale
+ - set-passwords
+ - grub-dpkg
+ - apt-pipelining
+ - apt-configure
+ - package-update-upgrade-install
+ - landscape
+ - timezone
+ - puppet
+ - chef
+ - salt-minion
+ - mcollective
+ - disable-ec2-metadata
+ - runcmd
+ - byobu
+
+# The modules that run in the 'final' stage
+cloud_final_modules:
+ - rightscale_userdata
+ - scripts-per-once
+ - scripts-per-boot
+ - scripts-per-instance
+ - scripts-user
+ - ssh-authkey-fingerprints
+ - keys-to-console
+ - phone-home
+ - final-message
+ - power-state-change
+
+# System and/or distro specific settings
+# (not accessible to handlers/transforms)
+system_info:
+ # This will affect which distro class gets used
+ distro: debian
+ # Default user name + that default users groups (if added/used)
+ default_user:
+ name: debian
+ lock_passwd: True
+ gecos: Debian
+ groups: [adm, audio, cdrom, dialout, floppy, video, plugdev, dip]
+ # Other config here will be given to the distro class and/or path classes
+ paths:
+ cloud_dir: /var/lib/cloud/
+ templates_dir: /etc/cloud/templates/
+ upstart_dir: /etc/init/
+ package_mirrors:
+ - arches: [default]
+ failsafe:
+ primary: http://ftp.debian.org/debian
Modified: packages/cloud-init/trunk/debian/control
===================================================================
--- packages/cloud-init/trunk/debian/control 2013-01-28 04:17:00 UTC (rev 9385)
+++ packages/cloud-init/trunk/debian/control 2013-01-28 17:04:32 UTC (rev 9386)
@@ -2,14 +2,18 @@
Section: admin
Priority: optional
Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Uploaders: Charles Plessy <plessy at debian.org>, Miguel Landaeta <miguel at miguel.cc>
-Build-Depends: cdbs (>= 0.4.90~),
- debhelper (>= 9),
+Uploaders: Charles Plessy <plessy at debian.org>, Miguel Landaeta <miguel at miguel.cc>,
+ Julien Danjou <acid at debian.org>
+Build-Depends: debhelper (>= 9),
pyflakes,
pylint,
python (>= 2.6.6-3~),
python-nose,
python-mocker,
+ python-configobj,
+ python-oauth,
+ python-boto,
+ python-cheetah
Standards-Version: 3.9.3
Homepage: https://launchpad.net/cloud-init
Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/cloud-init/trunk/
Deleted: packages/cloud-init/trunk/debian/patches/fix-cfg-builtin.patch
===================================================================
--- packages/cloud-init/trunk/debian/patches/fix-cfg-builtin.patch 2013-01-28 04:17:00 UTC (rev 9385)
+++ packages/cloud-init/trunk/debian/patches/fix-cfg-builtin.patch 2013-01-28 17:04:32 UTC (rev 9386)
@@ -1,11 +0,0 @@
---- a/cloudinit/__init__.py
-+++ b/cloudinit/__init__.py
-@@ -31,7 +31,7 @@
- log_cfgs: []
- datasource_list: ["NoCloud", "ConfigDrive", "OVF", "MAAS", "Ec2", "CloudStack"]
- def_log_file: /var/log/cloud-init.log
--syslog_fix_perms: syslog:adm
-+syslog_fix_perms: root:adm
- """
- logger_name = "cloudinit"
-
Deleted: packages/cloud-init/trunk/debian/patches/series
===================================================================
--- packages/cloud-init/trunk/debian/patches/series 2013-01-28 04:17:00 UTC (rev 9385)
+++ packages/cloud-init/trunk/debian/patches/series 2013-01-28 17:04:32 UTC (rev 9386)
@@ -1 +0,0 @@
-fix-cfg-builtin.patch
Modified: packages/cloud-init/trunk/debian/rules
===================================================================
--- packages/cloud-init/trunk/debian/rules 2013-01-28 04:17:00 UTC (rev 9385)
+++ packages/cloud-init/trunk/debian/rules 2013-01-28 17:04:32 UTC (rev 9386)
@@ -1,26 +1,12 @@
#!/usr/bin/make -f
-DEB_PYTHON2_MODULE_PACKAGES = cloud-init
+%:
+ dh $@ --with python2 --buildsystem=python_distutils
-binary-install/cloud-init::cloud-init-fixups
+override_dh_install:
+ dh_install
+ rm -rf debian/cloud-init/usr/lib/python?.?/dist-packages/tests
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
-cloud-init-fixups:
- for x in $(DEB_DESTDIR)/usr/bin/*.py; do mv "$$x" "$${x%.py}"; done
- install -d $(DEB_DESTDIR)/etc/rsyslog.d
- cp tools/21-cloudinit.conf $(DEB_DESTDIR)/etc/rsyslog.d/21-cloudinit.conf
-
-# You only need to run this immediately after checking out the package from
-# revision control.
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572204
-quilt-setup:
- @[ ! -d .pc ] || { echo ".pc exists. remove it and re-run to start fresh"; exit 1; }
- set -e; for patch in $$(quilt series | tac); do \
- patch -p1 -R --no-backup-if-mismatch <"debian/patches/$$patch"; \
- done
- quilt push -a
-
-.PHONY: quilt-setup
-
+override_dh_auto_test:
+ dh_auto_test
+ $(MAKE) test
Added: packages/cloud-init/trunk/debian/source/options
===================================================================
--- packages/cloud-init/trunk/debian/source/options (rev 0)
+++ packages/cloud-init/trunk/debian/source/options 2013-01-28 17:04:32 UTC (rev 9386)
@@ -0,0 +1 @@
+extend-diff-ignore = "\.pyc$"
\ No newline at end of file
More information about the Python-apps-commits
mailing list