x/packstack
Code Issues Proposed changes

Merge "Now using ini_file to parse nova.conf"

Browse Source
This commit is contained in:
Jenkins
2013-02-22 14:25:37 +00:00
committed by Gerrit Code Review
parent 809d4fe7d7 08789dcbdf
commit 17fd693932
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packstack/plugins/nova_300.py
View File

@@ -266,7 +266,7 @@ def createcomputemanifest():
nova_config_options = NovaConfig()
if host != controller.CONF["CONFIG_NOVA_NETWORK_HOST"]:
nova_config_options.addOption("flat_interface", controller.CONF['CONFIG_NOVA_COMPUTE_PRIVIF'])
nova_config_options.addOption("DEFAULT/flat_interface", controller.CONF['CONFIG_NOVA_COMPUTE_PRIVIF'])
check_ifcfg(host, controller.CONF['CONFIG_NOVA_COMPUTE_PRIVIF'])
try:
bring_up_ifcfg(host, controller.CONF['CONFIG_NOVA_COMPUTE_PRIVIF'])

2
packstack/puppet/modules/nova

Submodule packstack/puppet/modules/nova updated: d57619fadd...c69dad9e2d

6
packstack/puppet/templates/nova_common.pp
View File

@@ -4,12 +4,12 @@
Firewall <| |> -> Class['nova']
nova_config{
"metadata_host": value => "%(CONFIG_NOVA_API_HOST)s";
"qpid_hostname": value => "%(CONFIG_QPID_HOST)s";
"rpc_backend": value => "nova.rpc.impl_qpid";
"DEFAULT/metadata_host": value => "%(CONFIG_NOVA_API_HOST)s";
}
class {"nova":
glance_api_servers => "%(CONFIG_GLANCE_HOST)s:9292",
sql_connection => "mysql://nova:%(CONFIG_NOVA_DB_PW)s@%(CONFIG_MYSQL_HOST)s/nova",
qpid_hostname => "%(CONFIG_QPID_HOST)s",
rpc_backend => 'nova.rpc.impl_qpid',
}

8
packstack/puppet/templates/nova_compute.pp
View File

@@ -3,7 +3,7 @@
if $::is_virtual_packstack == "true" {
$libvirt_type = "qemu"
nova_config{
"libvirt_cpu_mode": value => "none";
"DEFAULT/libvirt_cpu_mode": value => "none";
}
}else{
$libvirt_type = "kvm"
@@ -14,9 +14,9 @@ package{'python-cinderclient':
}
nova_config{
"network_host": value => "%(CONFIG_NOVA_NETWORK_HOST)s";
"libvirt_inject_partition": value => "-1";
"volume_api_class": value => "nova.volume.cinder.API";
"DEFAULT/network_host": value => "%(CONFIG_NOVA_NETWORK_HOST)s";
"DEFAULT/libvirt_inject_partition": value => "-1";
"DEFAULT/volume_api_class": value => "nova.volume.cinder.API";
}
class {"nova::compute":