From 0f6398f2447c56d06e50c30827cdbe89be77e3f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20Gagne=CC=81?= Date: Mon, 1 Jul 2013 21:27:09 -0400 Subject: [PATCH] Fix missing and misspelled parameters Missing parameters: * vncserver_listen (openstack::all) * setup_test_volume (openstack::all) Misspelled parameters: * quantum_db_name (openstack::all) * rabbit_virtual_host (openstack::cinder::all,controller) Change-Id: Id0116981bf4693b324bb2ef4255175f05c024824 --- manifests/all.pp | 4 +++- manifests/cinder/all.pp | 2 +- manifests/cinder/controller.pp | 2 +- manifests/controller.pp | 2 +- spec/classes/openstack_all_spec.rb | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/manifests/all.pp b/manifests/all.pp index 98d4eba..e63b338 100644 --- a/manifests/all.pp +++ b/manifests/all.pp @@ -177,6 +177,7 @@ class openstack::all ( # VNC $vnc_enabled = true, $vncproxy_host = false, + $vncserver_listen = false, # cinder # if the cinder management components should be installed $cinder = true, @@ -184,6 +185,7 @@ class openstack::all ( $cinder_db_dbname = 'cinder', $cinder_bind_address = '0.0.0.0', $manage_volumes = true, + $setup_test_volume = false, $volume_group = 'cinder-volumes', $iscsi_ip_address = '127.0.0.1', # Quantum @@ -270,7 +272,7 @@ class openstack::all ( quantum => $quantum, quantum_db_user => $quantum_db_user, quantum_db_password => $quantum_db_password, - quantum_db_dbname => $quantum_db_dbname, + quantum_db_dbname => $quantum_db_name, allowed_hosts => $allowed_hosts, enabled => $enabled, } diff --git a/manifests/cinder/all.pp b/manifests/cinder/all.pp index e251b3f..38a2212 100644 --- a/manifests/cinder/all.pp +++ b/manifests/cinder/all.pp @@ -49,7 +49,7 @@ class openstack::cinder::all( rabbit_host => $rabbit_host, rabbit_port => $rabbit_port, rabbit_hosts => $rabbit_hosts, - rabbit_virtual_host => $cinder_rabbit_virtual_host, + rabbit_virtual_host => $rabbit_virtual_host, package_ensure => $package_ensure, api_paste_config => $api_paste_config, verbose => $verbose, diff --git a/manifests/cinder/controller.pp b/manifests/cinder/controller.pp index 552ce1e..6530d22 100644 --- a/manifests/cinder/controller.pp +++ b/manifests/cinder/controller.pp @@ -47,7 +47,7 @@ class openstack::cinder::controller( rabbit_host => $rabbit_host, rabbit_port => $rabbit_port, rabbit_hosts => $rabbit_hosts, - rabbit_virtual_host => $cinder_rabbit_virtual_host, + rabbit_virtual_host => $rabbit_virtual_host, package_ensure => $package_ensure, api_paste_config => $api_paste_config, verbose => $verbose, diff --git a/manifests/controller.pp b/manifests/controller.pp index c2b8b6e..1226ab8 100644 --- a/manifests/controller.pp +++ b/manifests/controller.pp @@ -249,7 +249,7 @@ class openstack::controller ( quantum => $quantum, quantum_db_user => $quantum_db_user, quantum_db_password => $quantum_db_password, - quantum_db_dbname => $quantum_db_dbname, + quantum_db_dbname => $quantum_db_name, allowed_hosts => $allowed_hosts, enabled => $enabled, } diff --git a/spec/classes/openstack_all_spec.rb b/spec/classes/openstack_all_spec.rb index 73a6b0d..fde0786 100644 --- a/spec/classes/openstack_all_spec.rb +++ b/spec/classes/openstack_all_spec.rb @@ -390,7 +390,7 @@ describe 'openstack::all' do :fixed_range => '10.0.0.0/24', :floating_range => false, :network_manager => 'nova.network.manager.FlatDHCPManager', - :config_overrides => '', + :config_overrides => {}, :create_networks => true, :enabled => true, :install_service => true