Merge pull request redhat-openstack#69 from cwolferh/smoke_test

workaround to convert enable_tunneling into a boolean

puppet/modules/quickstack/manifests/neutron/compute.pp

@@ -17,6 +17,14 @@
  $tunnel_id_ranges = '1:1000',
 ) inherits quickstack::params {
 
+ # str2bool expects the string to already be downcased. all-righty.
+ # (i.e. str2bool('True') would blow up, so work around it.)
+ $enable_tunneling_bool = $enable_tunneling ? {
+ /(?i:true)/ => true,
+ /(?i:false)/ => false,
+ default => str2bool("$enable_tunneling"),
+ }
+
  class { '::neutron':
  allow_overlapping_ips => true,
  rpc_backend => 'neutron.openstack.common.rpc.impl_qpid',
@@ -43,7 +51,7 @@
  bridge_uplinks => $ovs_bridge_uplinks,
  bridge_mappings => $ovs_bridge_mappings,
  local_ip => getvar("ipaddress_${private_interface}"),
- enable_tunneling => str2bool("$enable_tunneling"),
+ enable_tunneling => $enable_tunneling_bool,
  }
 
  class { '::nova::network::neutron':

puppet/modules/quickstack/manifests/neutron/networker.pp

@@ -22,6 +22,14 @@
  $verbose = $quickstack::params::verbose,
 ) inherits quickstack::params {
 
+ # str2bool expects the string to already be downcased. all-righty.
+ # (i.e. str2bool('True') would blow up, so work around it.)
+ $enable_tunneling_bool = $enable_tunneling ? {
+ /(?i:true)/ => true,
+ /(?i:false)/ => false,
+ default => str2bool("$enable_tunneling"),
+ }
+
  if str2bool("$configure_ovswitch") {
  vs_bridge { $bridge_name:
  provider => ovs_redhat,
@@ -62,7 +70,7 @@
  class { '::neutron::agents::ovs':
  local_ip => getvar("ipaddress_${private_interface}"),
  bridge_mappings => $ovs_bridge_mappings,
- enable_tunneling => str2bool("$enable_tunneling"),
+ enable_tunneling => $enable_tunneling_bool,
  }
 
  class { '::neutron::agents::dhcp': }