x/anvil
Code Issues Proposed changes

Merge branch 'master' of github.com:yahoo/Openstack-DevstackPy

Browse Source
This commit is contained in:
Ken Thomas
2012-03-07 16:07:28 -08:00
parent d6ad9dab43 b867cc3ac3
commit 95e9310ecb
3 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
conf/stack.ini
View File

@@ -269,7 +269,8 @@ ovs_bridge_external_name = br-int
# Root will typically not work (for apache on most distros)
# sudo adduser <username> then sudo adduser <username> admin will be what you want to set this up (in ubuntu)
# I typically use user "horizon" for ubuntu and the runtime user (who will have sudo access) for RHEL.
# If blank the currently executing user will be used.
#
# NOTE: If blank the currently executing user will be used.
apache_user = ${APACHE_USER:-}
# This is the group of the previous user (adjust as needed)
@@ -326,7 +327,7 @@ partition_power_size = ${SWIFT_PARTITION_POWER_SIZE:-9}
# cirros full disk image
#image_urls="http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img"
# uec style cirros image
# uec style cirros 0.3.0 (x86_64) and ubuntu oneiric (x86_64)
image_urls = http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-uec.tar.gz, http://uec-images.ubuntu.com/oneiric/current/oneiric-server-cloudimg-amd64.tar.gz
[passwords]

3
conf/templates/keystone/keystone.conf.tpl
View File

@@ -1,7 +1,8 @@
# From devstack commit a205b46788640b226d672293dac87432e98c81cf with modifications to parametrize
# From devstack commit 165121f7b69d9b8ad01d3256d068fdf77cebf840 with modifications to parametrize
# certain variables (ports mainly).
[DEFAULT]
bind_host = 0.0.0.0
public_port = %KEYSTONE_SERVICE_PORT%
admin_port = %KEYSTONE_AUTH_PORT%
admin_token = %SERVICE_TOKEN%

29
devstack/components/nova.py
View File

@@ -700,12 +700,11 @@ class NovaConfConfigurator(object):
def _get_extra(self, key):
extras = self._getstr(key)
cleaned_lines = list()
if extras:
extra_lines = extras.splitlines()
for line in extra_lines:
cleaned_line = line.strip()
if len(cleaned_line):
cleaned_lines.append(cleaned_line)
extra_lines = extras.splitlines()
for line in extra_lines:
cleaned_line = line.strip()
if len(cleaned_line):
cleaned_lines.append(cleaned_line)
return cleaned_lines
def _convert_extra_flags(self, extra_flags):
@@ -879,20 +878,18 @@ class NovaConf(object):
def __init__(self):
self.lines = list()
def add(self, key, *values):
def add(self, key, value, *values):
real_value = ""
key = str(key)
if len(key) == 0:
real_key = str(key)
if len(real_key) == 0:
raise exceptions.BadParamException("Can not add a empty key")
if len(values) == 0:
raise exceptions.BadParamException("Can not add a empty value for key %s" % (key))
if len(values) > 1:
str_values = [str(v) for v in values]
if len(values):
str_values = [str(value)] + [str(v) for v in values]
real_value = ",".join(str_values)
else:
real_value = str(values[0])
self.lines.append({'key': key, 'value': real_value})
LOG.debug("Added nova conf key %s with value [%s]" % (key, real_value))
real_value = str(value)
self.lines.append({'key': real_key, 'value': real_value})
LOG.debug("Added nova conf key %s with value [%s]" % (real_key, real_value))
def _form_entry(self, key, value, params=None):
real_value = utils.param_replace(str(value), params)