x/anvil
Code Issues Proposed changes

Making more extensive use of our new ability to have cross key/option references.

Browse Source
This commit is contained in:
Joshua Harlow
2012-01-22 11:49:05 -08:00
parent 49ba5d8f66
commit 20f75f9b15
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
conf/stack.ini
View File

@@ -51,13 +51,13 @@ type = ${SQL_TYPE:-mysql}
[keystone]
# If this is empty in code it will lookup "host_ip" (from above)
keystone_auth_host = ${KEYSTONE_AUTH_HOST:-}
# Where is the keystone auth host at?
keystone_auth_host = ${KEYSTONE_AUTH_HOST:-$(host:ip)}
keystone_auth_port = ${KEYSTONE_AUTH_PORT:-35357}
keystone_auth_protocol = ${KEYSTONE_AUTH_PROTOCOL:-http}
# If this is empty in code it will lookup "host_ip" (from above)
keystone_service_host = ${KEYSTONE_SERVICE_HOST:-}
# Where is the keystone service host at?
keystone_service_host = ${KEYSTONE_SERVICE_HOST:-$(host:ip)}
keystone_service_port = ${KEYSTONE_SERVICE_PORT:-5000}
keystone_service_protocol = ${KEYSTONE_SERVICE_PROTOCOL:-http}
@@ -92,7 +92,7 @@ nova_password = ${ADMIN_PASSWORD:-secrete}
#
# *NOTE*: Using the 2.0 *auth api* does not mean that compute api is 2.0. We
# will use the 1.1 *compute api*
nova_url = ${NOVA_URL:-http://$(default:host_ip):5000/v2.0/}
nova_url = ${NOVA_URL:-http://$(host:ip):5000/v2.0/}
# Currently novaclient needs you to specify the *compute api* version. This
# needs to match the config of your catalog returned by Keystone.
@@ -115,7 +115,7 @@ flat_interface = ${FLAT_INTERFACE:-eth0}
# deal with that in the code.
vlan_interface = ${VLAN_INTERFACE:-}
vncproxy_url = ${VNCPROXY_URL:-}
ec2_dmz_host =${EC2_DMZ_HOST:-}
ec2_dmz_host =${EC2_DMZ_HOST:-$(host:ip)}
# How instances will be named
instance_name_prefix =${INSTANCE_NAME_PREFIX:-instance-}
@@ -132,8 +132,8 @@ libvirt_type =${LIBVIRT_TYPE:-kvm}
# What tyoe of image service will be used?
# We'll deal with the defaults in the code.
img_service = ${IMG_SERVICE:-}
glance_server = ${GLANCE_SERVER:-}
img_service = ${IMG_SERVICE:-nova.image.glance.GlanceImageService}
glance_server = ${GLANCE_SERVER:-$(host:ip):9292}
# Used however you want - ensure you know nova's conf file format if you use this!
extra_flags = ${NOVA_EXTRA_FLAGS:-}