From b1cab706f8d195b0fab5d66df1d16c91f3062e59 Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Mon, 5 Mar 2012 10:54:06 -0800 Subject: [PATCH] Updated to be in sync with devstack v1. --- conf/pips/quantum.json | 3 --- conf/stack.ini | 13 +++++++------ devstack/component.py | 6 ++++-- devstack/image/creator.py | 9 +++++---- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/conf/pips/quantum.json b/conf/pips/quantum.json index cfe660a9..59f4e762 100644 --- a/conf/pips/quantum.json +++ b/conf/pips/quantum.json @@ -10,9 +10,6 @@ "sqlalchemy-migrate": { "version": "0.7.2" }, - "SQLAlchemy": { - "version": "0.7.5" - }, #the newest we can get is 1.3.3 from epel/rhel #this causes issues like the following #https://answers.launchpad.net/nova/+question/174160 diff --git a/conf/stack.ini b/conf/stack.ini index d1ff8159..061402e9 100644 --- a/conf/stack.ini +++ b/conf/stack.ini @@ -34,17 +34,18 @@ rabbit_host = ${RABBIT_HOST:-$(host:ip)} # Sys log enabled or not syslog = 0 -# Which run type to use [fork (the default), upstart (WIP), screen] -run_type = fork +# Which run type to use [fork (the default), upstart, screen] +run_type = fork [upstart] # These flags are used for starting components under upstart (if default/run_type is upstart) respawn = 1 -# Note that we support component start/stop and "nova" is one of them, so -# we need a different name for all components -start_event = all_nova_start -stop_event = all_nova_stop + +# Note that we support component start/stop and "all" +# Start and stop, this is the "all" event name +start_event = all_os_start +stop_event = all_os_stop [host] diff --git a/devstack/component.py b/devstack/component.py index 5f92cfd3..359e00b2 100644 --- a/devstack/component.py +++ b/devstack/component.py @@ -105,8 +105,10 @@ class PkgInstallComponent(ComponentBase): target_loc = base_dir branch = None if branch_tuple: - branch = self.cfg.get(branch_tuple[0], branch_tuple[1]) - uri = self.cfg.get(uri_tuple[0], uri_tuple[1]) + (cfg_section, cfg_key) = branch_tuple + branch = self.cfg.get(cfg_section, cfg_key) + (cfg_section, cfg_key) = uri_tuple + uri = self.cfg.get(cfg_section, cfg_key) self.tracewriter.downloaded(target_loc, uri) dirs_made = down.download(target_loc, uri, branch) #ensure this is always added so that diff --git a/devstack/image/creator.py b/devstack/image/creator.py index ca0d698e..aaa6c78e 100644 --- a/devstack/image/creator.py +++ b/devstack/image/creator.py @@ -14,13 +14,13 @@ # License for the specific language governing permissions and limitations # under the License. +import ConfigParser import json import os import tarfile import tempfile import urllib import urllib2 -import ConfigParser from devstack import log from devstack import shell @@ -33,13 +33,14 @@ LOG = log.getLogger("devstack.image.creator") class Image(object): - KERNEL_FORMAT = ['glance', '-A', '%TOKEN%', 'add', \ + KERNEL_FORMAT = ['glance', 'add', '-A', '%TOKEN%', '--silent-upload', \ 'name="%IMAGE_NAME%-kernel"', 'is_public=true', 'container_format=aki', \ 'disk_format=aki'] - INITRD_FORMAT = ['glance', 'add', '-A', '%TOKEN%', \ + INITRD_FORMAT = ['glance', 'add', '-A', '%TOKEN%', '--silent-upload', \ 'name="%IMAGE_NAME%-ramdisk"', 'is_public=true', 'container_format=ari', \ 'disk_format=ari'] - IMAGE_FORMAT = ['glance', 'add', '-A', '%TOKEN%', 'name="%IMAGE_NAME%.img"', \ + IMAGE_FORMAT = ['glance', 'add', '-A', '%TOKEN%', '--silent-upload', + 'name="%IMAGE_NAME%.img"', 'is_public=true', 'container_format=ami', 'disk_format=ami', \ 'kernel_id=%KERNEL_ID%', 'ramdisk_id=%INITRD_ID%']