x/anvil
Code Issues Proposed changes

Updated to be in sync with devstack v1.

Browse Source
This commit is contained in:
Joshua Harlow 2012-03-05 10:54:06 -08:00
parent fde7adf831
commit b1cab706f8
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/pips/quantum.json
View File

@ -10,9 +10,6 @@
"sqlalchemy-migrate": { "sqlalchemy-migrate": {
"version": "0.7.2" "version": "0.7.2"
}, },
"SQLAlchemy": {
"version": "0.7.5"
},
#the newest we can get is 1.3.3 from epel/rhel #the newest we can get is 1.3.3 from epel/rhel
#this causes issues like the following #this causes issues like the following
#https://answers.launchpad.net/nova/+question/174160 #https://answers.launchpad.net/nova/+question/174160

11
conf/stack.ini
View File

@ -34,17 +34,18 @@ rabbit_host = ${RABBIT_HOST:-$(host:ip)}
# Sys log enabled or not # Sys log enabled or not
syslog = 0 syslog = 0
# Which run type to use [fork (the default), upstart (WIP), screen] # Which run type to use [fork (the default), upstart, screen]
run_type = fork run_type = fork
[upstart] [upstart]
# These flags are used for starting components under upstart (if default/run_type is upstart) # These flags are used for starting components under upstart (if default/run_type is upstart)
respawn = 1 respawn = 1
# Note that we support component start/stop and "nova" is one of them, so
# we need a different name for all components # Note that we support component start/stop and "all"
start_event = all_nova_start # Start and stop, this is the "all" event name
stop_event = all_nova_stop start_event = all_os_start
stop_event = all_os_stop
[host] [host]

6
devstack/component.py
View File

@ -105,8 +105,10 @@ class PkgInstallComponent(ComponentBase):
target_loc = base_dir target_loc = base_dir
branch = None branch = None
if branch_tuple: if branch_tuple:
branch = self.cfg.get(branch_tuple[0], branch_tuple[1]) (cfg_section, cfg_key) = branch_tuple
uri = self.cfg.get(uri_tuple[0], uri_tuple[1]) 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) self.tracewriter.downloaded(target_loc, uri)
dirs_made = down.download(target_loc, uri, branch) dirs_made = down.download(target_loc, uri, branch)
#ensure this is always added so that #ensure this is always added so that

9
devstack/image/creator.py
View File

@ -14,13 +14,13 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import ConfigParser
import json import json
import os import os
import tarfile import tarfile
import tempfile import tempfile
import urllib import urllib
import urllib2 import urllib2
import ConfigParser
from devstack import log from devstack import log
from devstack import shell from devstack import shell
@ -33,13 +33,14 @@ LOG = log.getLogger("devstack.image.creator")
class Image(object): 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', \ 'name="%IMAGE_NAME%-kernel"', 'is_public=true', 'container_format=aki', \
'disk_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', \ 'name="%IMAGE_NAME%-ramdisk"', 'is_public=true', 'container_format=ari', \
'disk_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', \ 'is_public=true', 'container_format=ami', 'disk_format=ami', \
'kernel_id=%KERNEL_ID%', 'ramdisk_id=%INITRD_ID%'] 'kernel_id=%KERNEL_ID%', 'ramdisk_id=%INITRD_ID%']