Merge pull request #88 from branan/cleanups_for_testing

Cleanups for testing
This commit is contained in:
Dan Bode
2012-07-02 18:21:12 -07:00

View File

@@ -31,6 +31,7 @@ $glance_user_password = 'glance_pass'
$rabbit_password = 'openstack_rabbit_password' $rabbit_password = 'openstack_rabbit_password'
$rabbit_user = 'openstack_rabbit_user' $rabbit_user = 'openstack_rabbit_user'
$fixed_network_range = '10.0.0.0/24' $fixed_network_range = '10.0.0.0/24'
$floating_network_range = '192.168.101.64/28'
# switch this to true to have all service log at verbose # switch this to true to have all service log at verbose
$verbose = false $verbose = false
# by default it does not enable atomatically adding floating IPs # by default it does not enable atomatically adding floating IPs
@@ -58,6 +59,7 @@ node /openstack_all/ {
rabbit_password => $rabbit_password, rabbit_password => $rabbit_password,
rabbit_user => $rabbit_user, rabbit_user => $rabbit_user,
libvirt_type => 'kvm', libvirt_type => 'kvm',
floating_range => $floating_network_range,
fixed_range => $fixed_network_range, fixed_range => $fixed_network_range,
verbose => $verbose, verbose => $verbose,
auto_assign_floating_ip => $auto_assign_floating_ip, auto_assign_floating_ip => $auto_assign_floating_ip,
@@ -90,7 +92,7 @@ node /openstack_controller/ {
public_interface => $public_interface, public_interface => $public_interface,
private_interface => $private_interface, private_interface => $private_interface,
internal_address => $controller_node_internal, internal_address => $controller_node_internal,
floating_range => '192.168.101.64/28', floating_range => $floating_network_range,
fixed_range => $fixed_network_range, fixed_range => $fixed_network_range,
# by default it does not enable multi-host mode # by default it does not enable multi-host mode
multi_host => false, multi_host => false,