From 6f6c941ebfb2942b1ffa3a801d832347931b20fb Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Wed, 10 Apr 2013 17:07:06 -0700 Subject: [PATCH] fix quantum issues This commit resolves a variety of quantum related issues. * Ensures that network type is actually read from hiera. * Ensure $nova_network is correctly set Change-Id: I61f65b8271039b20fb0b15be0d3e84bc7bc4ad6e --- manifests/site.pp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 0fdd456..828fefb 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -40,11 +40,13 @@ $secret_key = hiera('secret_key', 'secret_key') $libvirt_type = hiera('libvirt_type', 'qemu') #$network_type = hiera('', 'quantum') -$network_type = hiera('', 'nova') +$network_type = hiera('network_type', 'nova') if $network_type == 'nova' { - $use_quantum = false - $multi_host = true + $use_quantum = false + $multi_host = true + $nova_network = true } else { + $nova_network = false $use_quantum = true } @@ -72,8 +74,9 @@ node /openstack-controller/ { # deploy a script that can be used to test nova class { 'openstack::test_file': - quantum => $use_quantum, - sleep_time => 120, + quantum => $use_quantum, + sleep_time => 120, + floating_ip => $nova_network, } if $::osfamily == 'Redhat' { @@ -274,7 +277,6 @@ node /compute/ { libvirt_type => $libvirt_type, sql_connection => "mysql://nova:${nova_db_password}@${openstack_controller}/nova", cinder_sql_connection => "mysql://cinder:${cinder_db_password}@${openstack_controller}/cinder", - quantum_sql_connection => "mysql://quantum:${quantum_db_password}@${openstack_controller}/quantum?charset=utf8", multi_host => $multi_host, fixed_range => $fixed_network_range, nova_user_password => $nova_user_password,