nova.conf: use explicit IPs, less localhost and disable the firewall

To allow both a controller and compute node to use the same nova.conf,
we can switch in more use of %CONTROLLER_IP% and less use of localhost.

We also disable the firewall configuration by default, it can be re-enabled
by subsequent layers.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

1 files changed, 7 insertions, 5 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova.conf b/meta-openstack/recipes-devtools/python/python-nova/nova.conf
index f698349..695f084 100644
--- a/meta-openstack/recipes-devtools/python/python-nova/nova.conf
+++ b/meta-openstack/recipes-devtools/python/python-nova/nova.conf
@@ -1,5 +1,6 @@
 [DEFAULT]
-firewall_driver = nova.virt.libvirt.firewall.IptablesFirewallDriver
+# firewall_driver = nova.virt.libvirt.firewall.IptablesFirewallDriver
+firewall_driver = nova.virt.firewall.NoopFirewallDriver
 compute_driver = libvirt.LibvirtDriver
 libvirt_type = kvm
 libvirt_cpu_mode = none
@@ -16,8 +17,8 @@ auth_strategy = keystone
 instances_path = /etc/nova/instances
 debug = True
 verbose = True
-my_ip = 127.0.0.1
-glance_host = 127.0.0.1
+my_ip = %CONTROLLER_IP%
+glance_host = %CONTROLLER_IP%
 
 #VNC
 vnc_enabled = true
@@ -35,7 +36,7 @@ dhcpbridge=/usr/bin/nova-dhcpbridge
 
 #Database configuration
 # sql_connection = postgresql://%DB_USER%:%DB_PASSWORD%@localhost/nova
-sql_connection = postgresql://%DB_USER%:%DB_PASSWORD%@%CONTROLLER_HOST%/nova
+sql_connection = postgresql://%DB_USER%:%DB_PASSWORD%@%CONTROLLER_IP%/nova
 
 #RabbitMQ configuration
 rpc_backend = nova.rpc.impl_kombu
@@ -43,10 +44,11 @@ rabbit_host = %CONTROLLER_IP%
 rabbit_port = 5672
 
 #Quantum
+quantum_url=http://%CONTROLLER_IP%:9696
 network_api_class=nova.network.quantumv2.api.API
 quantum_auth_strategy=keystone
 quantum_admin_tenant_name=service
 quantum_admin_username=quantum
 quantum_admin_password=password
-quantum_admin_auth_url=http://localhost:5000/v2.0/
+quantum_admin_auth_url=http://%CONTROLLER_IP%:5000/v2.0/