Skip to content
Browse files

Temporary commit

Saving my current progress
  • Loading branch information...
1 parent 9f45813 commit 7b9cac2c5cb4a929092d0744293302eefe3ba98c @bodepd committed
Showing with 43 additions and 38 deletions.
  1. +25 −29 manifests/all.pp
  2. +0 −1 manifests/compute.pp
  3. +18 −8 manifests/controller.pp
View
54 manifests/all.pp
@@ -6,6 +6,12 @@
class openstack::all(
# passing in the public ipaddress is required
$public_address,
+ $public_interface,
+ $private_interface,
+ $floating_range = false,
+ $fixed_range = '10.0.0.0/16',
+ $network_manager = 'nova.network.manager.FlatDHCPManager',
+ $network_config = {},
# middleware credentials
$mysql_root_password = 'sql_pass',
$rabbit_password = 'rabbit_pw',
@@ -137,7 +143,6 @@
rabbit_password => $rabbit_password,
image_service => 'nova.image.glance.GlanceImageService',
glance_api_servers => '127.0.0.1:9292',
- network_manager => 'nova.network.manager.FlatDHCPManager',
}
class { 'nova::api':
@@ -145,35 +150,26 @@
admin_password => $nova_user_password,
}
- class { 'nova::scheduler':
- enabled => true
- }
-
+ # set up networking
class { 'nova::network':
- enabled => true
- }
-
- nova::manage::network { "nova-vm-net":
- network => '11.0.0.0/24',
- }
-
- nova::manage::floating { "nova-vm-floating":
- network => '10.128.0.0/24',
- }
-
- class { 'nova::objectstore':
- enabled => true
- }
-
- class { 'nova::volume':
- enabled => true
- }
-
- class { 'nova::cert':
- enabled => true
- }
-
- class { 'nova::consoleauth':
+ private_interface => $private_interface,
+ public_interface => $public_interface,
+ fixed_range => $fixed_range,
+ floating_range => $floating_range,
+ enabled => true,
+ network_manager => $network_manager,
+ config_overrides => $network_config,
+ create_networks => true,
+ }
+
+ # a bunch of nova services that require no configuration
+ class { [
+ 'nova::scheduler',
+ 'nova::objectstore',
+ 'nova::volume',
+ 'nova::cert',
+ 'nova::consoleauth'
+ ]:
enabled => true
}
View
1 manifests/compute.pp
@@ -33,7 +33,6 @@
rabbit_password => $rabbit_password,
image_service => 'nova.image.glance.GlanceImageService',
glance_api_servers => $glance_api_servers,
- network_manager => 'nova.network.manager.FlatDHCPManager',
}
class { 'nova::compute':
View
26 manifests/controller.pp
@@ -8,6 +8,8 @@
class openstack::controller(
# my address
$public_address,
+ $public_interface,
+ $private_interface,
$internal_address,
$admin_address = $internal_address,
# connection information
@@ -25,6 +27,12 @@
# network configuration
# this assumes that it is a flat network manager
$network_manager = 'nova.network.manager.FlatDHCPManager',
+ $fixed_range = '10.0.0.0/12',
+ $floating_range = false,
+ # TODO need to reconsider this design...
+ # this is where the config options that are specific to the network
+ # types go. I am not extremely happy with this....
+ $network_config = {},
# I do not think that this needs a bridge?
$bridge_ip = '192.168.188.1',
$bridge_netmask = '255.255.255.0',
@@ -171,7 +179,6 @@
rabbit_password => $rabbit_password,
image_service => 'nova.image.glance.GlanceImageService',
glance_api_servers => $glance_connection,
- network_manager => 'nova.network.manager.FlatDHCPManager',
}
class { 'nova::api':
@@ -190,19 +197,22 @@
'nova::cert',
'nova::consoleauth',
'nova::scheduler',
- 'nova::network',
'nova::objectstore',
'nova::vncproxy'
]:
enabled => true,
}
- nova::manage::network { 'nova-vm-net':
- network => '11.0.0.0/24',
- }
-
- nova::manage::floating { 'nova-vm-floating':
- network => '10.128.0.0/24',
+ # set up networking
+ class { 'nova::network':
+ private_interface => $private_interface,
+ public_interface => $public_interface,
+ fixed_range => $fixed_range,
+ floating_range => $floating_range,
+ enabled => true,
+ network_manager => $network_manager,
+ config_overrides => $network_config,
+ create_networks => true,
}
######## Horizon ########

0 comments on commit 7b9cac2

Please sign in to comment.
Something went wrong with that request. Please try again.