Use CIDR for network ranges, numerical netmask doesn't work

dzungdo · Jun 3, 2013 · 111d46f · 111d46f
1 parent 902cfa3
commit 111d46f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/puppet/trystack/manifests/params.pp b/puppet/trystack/manifests/params.pp
@@ -16,11 +16,11 @@
  $nova_db_password = 'CHANGEME'
  $nova_user_password = 'CHANGEME'
 
- # Networking
+ # Networking - we're assuming /24 ranges, but the user can always override
  $public_interface = 'PRIMARY'
  $private_interface = 'SECONDARY'
- $fixed_network_range = inline_template("<%= scope.lookupvar('::network_${private_interface}') + '/' + scope.lookupvar('::netmask_${private_interface}') %>")
- $floating_network_range = inline_template("<%= scope.lookupvar('::network_${public_interface}') + '/' + scope.lookupvar('::netmask_${public_interface}') %>")
+ $fixed_network_range = inline_template("<%= scope.lookupvar('::network_${private_interface}') + '/24' %>")
+ $floating_network_range = inline_template("<%= scope.lookupvar('::network_${public_interface}') + '/24' %>")
  $pacemaker_priv_floating_ip = 'PRIV_IP'
  $pacemaker_pub_floating_ip = 'PUB_IP'