x/anvil
Code Issues Proposed changes

More usage of param replacement + xen api connection password addition.

Browse Source
This commit is contained in:
Joshua Harlow
2012-01-22 12:01:48 -08:00
parent d1149b87d1
commit 252a076bda
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
conf/stack.ini
View File

@@ -13,6 +13,7 @@
# For this example, the RUNNING_HOST enviroment variable will be referenced. # For this example, the RUNNING_HOST enviroment variable will be referenced.
# If it is not found (no value exists), then "http://$(X:Y)" will be # If it is not found (no value exists), then "http://$(X:Y)" will be
# examined and found to be contain a expression (denoted by "$(X:Y)"). # examined and found to be contain a expression (denoted by "$(X:Y)").
#
# Then in that expression there are components of the format "X:Y" which the # Then in that expression there are components of the format "X:Y" which the
# configuration class will attempt to resolve those values by looking up in the # configuration class will attempt to resolve those values by looking up in the
# configuration file for a value in section "X" with option "Y" and replacing the # configuration file for a value in section "X" with option "Y" and replacing the
@@ -106,14 +107,14 @@ scheduler = ${NOVA_SCHEDULER:-nova.scheduler.simple.SimpleScheduler}
fixed_range = ${NOVA_FIXED_RANGE:-10.0.0.0/24} fixed_range = ${NOVA_FIXED_RANGE:-10.0.0.0/24}
network_manager = ${NET_MAN:-FlatDHCPManager} network_manager = ${NET_MAN:-FlatDHCPManager}
volume_group = ${VOLUME_GROUP:-nova-volumes} volume_group = ${VOLUME_GROUP:-nova-volumes}
volume_name_prefix =${VOLUME_NAME_PREFIX:-volume-} volume_name_prefix = ${VOLUME_NAME_PREFIX:-volume-}
public_interface = ${PUBLIC_INTERFACE:-eth0} public_interface = ${PUBLIC_INTERFACE:-eth0}
flat_network_bridge = ${FLAT_NETWORK_BRIDGE:-br100} flat_network_bridge = ${FLAT_NETWORK_BRIDGE:-br100}
flat_interface = ${FLAT_INTERFACE:-eth0} flat_interface = ${FLAT_INTERFACE:-eth0}
vlan_interface = ${VLAN_INTERFACE:-$(nova:public_interface)} vlan_interface = ${VLAN_INTERFACE:-$(nova:public_interface)}
# TODO document these # TODO document these
vncproxy_url = ${VNCPROXY_URL:-} vncproxy_url = ${VNCPROXY_URL:-http://$(host:ip):6080}
ec2_dmz_host = ${EC2_DMZ_HOST:-$(host:ip)} ec2_dmz_host = ${EC2_DMZ_HOST:-$(host:ip)}
# How instances will be named # How instances will be named
@@ -256,6 +257,8 @@ image_urls = http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_
# in code in that the configuration class we use will look in this section for passwords # in code in that the configuration class we use will look in this section for passwords
# and if no password is found (ie an empty string) then the user will be prompted to enter # and if no password is found (ie an empty string) then the user will be prompted to enter
# a password, if they do not enter one (or its blank) then one will be generated for the user. # a password, if they do not enter one (or its blank) then one will be generated for the user.
#
# *You can set the enviroment variable "PASS_ASK" to 1 to not be prompted at all.*
# You will need to send the same MYSQL_PASSWORD to every host if you are doing a multi-node devstack installation. # You will need to send the same MYSQL_PASSWORD to every host if you are doing a multi-node devstack installation.
sql = ${MYSQL_PASSWORD:-} sql = ${MYSQL_PASSWORD:-}
@@ -269,3 +272,6 @@ horizon_keystone_admin = ${ADMIN_PASSWORD:-}
# Openstack components need to have an admin token to validate user tokens. # Openstack components need to have an admin token to validate user tokens.
service_token = ${SERVICE_TOKEN:-} service_token = ${SERVICE_TOKEN:-}
# The xen api connection password
xenapi_connection = ${XENAPI_CONNECTION:-}

1
devstack/components/nova_conf.py
View File

@@ -204,7 +204,6 @@ class NovaConfigurator():
nova_conf.add('connection_type', 'xenapi') nova_conf.add('connection_type', 'xenapi')
nova_conf.add('xenapi_connection_url', 'http://169.254.0.1') nova_conf.add('xenapi_connection_url', 'http://169.254.0.1')
nova_conf.add('xenapi_connection_username', 'root') nova_conf.add('xenapi_connection_username', 'root')
# TODO, check that this is the right way to get the password
nova_conf.add('xenapi_connection_password', self.cfg.get("passwords", "xenapi")) nova_conf.add('xenapi_connection_password', self.cfg.get("passwords", "xenapi"))
nova_conf.add_simple('noflat_injected') nova_conf.add_simple('noflat_injected')
nova_conf.add('flat_interface', 'eth1') nova_conf.add('flat_interface', 'eth1')