openstack
/
puppet-nova
Code Issues Proposed changes

Allow floating IPs to be non /24 and start at non 0 ie 192.168.1.128/25

This commit is contained in:
Aimon Bustardo 2012-04-17 21:43:14 -07:00
parent dae10c4d50
commit 5da5a28be9
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/puppet/type/nova_floating.rb
View File

@ -5,8 +5,8 @@ Puppet::Type.newtype(:nova_floating) do
ensurable
newparam(:network, :namevar => true) do
desc "Network (ie, 192.168.1.0/24)"
newvalues(/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.0\/[0-9]{1,2}$/)
desc "Network (ie, 192.168.1.0/24 or 192.168.1.128/25 etc.)"
newvalues(/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[1-9][0-9]{0,2}\/[0-9]{1,2}$/)
end
end

3
manifests/manage/network.pp
View File

@ -1,4 +1,4 @@
define nova::manage::network ( $network, $available_ips ) {
define nova::manage::network ( $network ) {
File['/etc/nova/nova.conf'] -> Nova_network[$name]
Exec<| title == 'initial-db-sync' |> -> Nova_network[$name]
@ -6,7 +6,6 @@ define nova::manage::network ( $network, $available_ips ) {
nova_network { $name:
ensure => present,
network => $network,
available_ips => $available_ips,
notify => Exec["nova-db-sync"],
}
}