stackforge/puppet-openstack-cloud
Code Issues Proposed changes

network: move class

Browse Source 
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2013-12-30 10:06:48 +01:00
parent 6f8daa9243
commit d7bf44774e
9 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/network/network_common.pp → manifests/network.pp
View File

@ -16,7 +16,7 @@
# Common networking # Common networking
# #
class os_network_common( class privatecloud::network(
$verbose = $os_params::verbose, $verbose = $os_params::verbose,
$debug = $os_params::debug, $debug = $os_params::debug,
$rabbit_hosts = $os_params::rabbit_hosts, $rabbit_hosts = $os_params::rabbit_hosts,

2
manifests/network/network_compute.pp → manifests/network/compute.pp
View File

@ -16,7 +16,7 @@
# Network Compute node (Agent) # Network Compute node (Agent)
# #
class os_network_compute( class privatecloud::network::compute(
$neutron_endpoint = $os_params::ks_neutron_admin_host, $neutron_endpoint = $os_params::ks_neutron_admin_host,
$neutron_protocol = $os_params::ks_neutron_public_proto, $neutron_protocol = $os_params::ks_neutron_public_proto,
$neutron_password = $os_params::ks_neutron_password, $neutron_password = $os_params::ks_neutron_password,

2
manifests/network/network_controller.pp → manifests/network/controller.pp
View File

@ -16,7 +16,7 @@
# Network Controller node (API + Scheduler) # Network Controller node (API + Scheduler)
# #
class os_network_controller( class privatecloud::network::controller(
$neutron_db_host = $os_params::neutron_db_host, $neutron_db_host = $os_params::neutron_db_host,
$neutron_db_user = $os_params::neutron_db_user, $neutron_db_user = $os_params::neutron_db_user,
$neutron_db_password = $os_params::neutron_db_password, $neutron_db_password = $os_params::neutron_db_password,

2
manifests/network/network_dhcp.pp → manifests/network/dhcp.pp
View File

@ -16,7 +16,7 @@
# Network DHCP node # Network DHCP node
# #
class os_network_dhcp( class privatecloud::network::dhcp(
$debug = $os_params::debug $debug = $os_params::debug
) { ) {

2
manifests/network/network_l3.pp → manifests/network/l3.pp
View File

@ -16,7 +16,7 @@
# Network L3 node # Network L3 node
# #
class os_network_l3( class privatecloud::network::l3(
$external_int = $os_params::external_int, $external_int = $os_params::external_int,
$debug = $os_params::debug, $debug = $os_params::debug,
) { ) {

2
manifests/network/network_lbaas.pp → manifests/network/lbaas.pp
View File

@ -16,7 +16,7 @@
# Network LBaaS node # Network LBaaS node
# #
class os_network_lbaas( class privatecloud::network::lbaas(
$debug = $os_params::debug $debug = $os_params::debug
) { ) {

2
manifests/network/network_metadata.pp → manifests/network/metadata.pp
View File

@ -17,7 +17,7 @@
# Could be managed by spof_node manifest # Could be managed by spof_node manifest
# #
class os_network_metadata( class privatecloud::network::metadata(
$enabled = true, $enabled = true,
$debug = $os_params::debug, $debug = $os_params::debug,
$ks_neutron_password = $os_params::ks_neutron_password, $ks_neutron_password = $os_params::ks_neutron_password,

2
manifests/network/network_vpn.pp → manifests/network/vpn.pp
View File

@ -16,7 +16,7 @@
# Network VPNaaS node # Network VPNaaS node
# #
class os_network_vpn( class privatecloud::network::vpn(
$debug = $os_params::debug $debug = $os_params::debug
) { ) {

14
site.pp
View File

@ -92,8 +92,7 @@ node 'os-ci-test13', 'os-ci-test12', 'os-ci-test11', /mgmt\d+.enovance.com/ inhe
class {'privatecloud::cache': } class {'privatecloud::cache': }
# Networking # Networking
class {'os_network_common': } class {'privatecloud::network::controller': }
class {'os_network_controller': }
# Orchestration # Orchestration
class {'os_orchestration_common': } class {'os_orchestration_common': }
@ -106,12 +105,11 @@ node 'os-ci-test13', 'os-ci-test12', 'os-ci-test11', /mgmt\d+.enovance.com/ inhe
# We need at least two nodes for DHCP High availability # We need at least two nodes for DHCP High availability
node 'os-ci-test8', /net\d+.enovance.com/ inherits common { node 'os-ci-test8', /net\d+.enovance.com/ inherits common {
class {'os_network_common': } class {'privatecloud::network::dhcp': }
class {'os_network_dhcp': } class {'privatecloud::network::metadata': }
class {'os_network_metadata': } class {'privatecloud::network::lbaas': }
class {'os_network_lbaas': } class {'privatecloud::network::l3': }
class {'os_network_l3': } class {'privatecloud::network::vpn':}
class {'os_network_vpn':}
} }