From d7bf44774e733f4a34abf124f64199506912a18b Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 30 Dec 2013 10:06:48 +0100 Subject: [PATCH] network: move class Signed-off-by: Emilien Macchi --- .../{network/network_common.pp => network.pp} | 2 +- .../network/{network_compute.pp => compute.pp} | 2 +- .../{network_controller.pp => controller.pp} | 2 +- manifests/network/{network_dhcp.pp => dhcp.pp} | 2 +- manifests/network/{network_l3.pp => l3.pp} | 2 +- manifests/network/{network_lbaas.pp => lbaas.pp} | 2 +- .../network/{network_metadata.pp => metadata.pp} | 2 +- manifests/network/{network_vpn.pp => vpn.pp} | 2 +- site.pp | 14 ++++++-------- 9 files changed, 14 insertions(+), 16 deletions(-) rename manifests/{network/network_common.pp => network.pp} (98%) rename manifests/network/{network_compute.pp => compute.pp} (96%) rename manifests/network/{network_controller.pp => controller.pp} (98%) rename manifests/network/{network_dhcp.pp => dhcp.pp} (95%) rename manifests/network/{network_l3.pp => l3.pp} (96%) rename manifests/network/{network_lbaas.pp => lbaas.pp} (95%) rename manifests/network/{network_metadata.pp => metadata.pp} (97%) rename manifests/network/{network_vpn.pp => vpn.pp} (95%) diff --git a/manifests/network/network_common.pp b/manifests/network.pp similarity index 98% rename from manifests/network/network_common.pp rename to manifests/network.pp index 807e9bbc..186758c2 100644 --- a/manifests/network/network_common.pp +++ b/manifests/network.pp @@ -16,7 +16,7 @@ # Common networking # -class os_network_common( +class privatecloud::network( $verbose = $os_params::verbose, $debug = $os_params::debug, $rabbit_hosts = $os_params::rabbit_hosts, diff --git a/manifests/network/network_compute.pp b/manifests/network/compute.pp similarity index 96% rename from manifests/network/network_compute.pp rename to manifests/network/compute.pp index c139ed81..46affa30 100644 --- a/manifests/network/network_compute.pp +++ b/manifests/network/compute.pp @@ -16,7 +16,7 @@ # Network Compute node (Agent) # -class os_network_compute( +class privatecloud::network::compute( $neutron_endpoint = $os_params::ks_neutron_admin_host, $neutron_protocol = $os_params::ks_neutron_public_proto, $neutron_password = $os_params::ks_neutron_password, diff --git a/manifests/network/network_controller.pp b/manifests/network/controller.pp similarity index 98% rename from manifests/network/network_controller.pp rename to manifests/network/controller.pp index f1114f1b..5756b8bb 100644 --- a/manifests/network/network_controller.pp +++ b/manifests/network/controller.pp @@ -16,7 +16,7 @@ # Network Controller node (API + Scheduler) # -class os_network_controller( +class privatecloud::network::controller( $neutron_db_host = $os_params::neutron_db_host, $neutron_db_user = $os_params::neutron_db_user, $neutron_db_password = $os_params::neutron_db_password, diff --git a/manifests/network/network_dhcp.pp b/manifests/network/dhcp.pp similarity index 95% rename from manifests/network/network_dhcp.pp rename to manifests/network/dhcp.pp index da3a5482..90267317 100644 --- a/manifests/network/network_dhcp.pp +++ b/manifests/network/dhcp.pp @@ -16,7 +16,7 @@ # Network DHCP node # -class os_network_dhcp( +class privatecloud::network::dhcp( $debug = $os_params::debug ) { diff --git a/manifests/network/network_l3.pp b/manifests/network/l3.pp similarity index 96% rename from manifests/network/network_l3.pp rename to manifests/network/l3.pp index d677f9a5..5c6c8749 100644 --- a/manifests/network/network_l3.pp +++ b/manifests/network/l3.pp @@ -16,7 +16,7 @@ # Network L3 node # -class os_network_l3( +class privatecloud::network::l3( $external_int = $os_params::external_int, $debug = $os_params::debug, ) { diff --git a/manifests/network/network_lbaas.pp b/manifests/network/lbaas.pp similarity index 95% rename from manifests/network/network_lbaas.pp rename to manifests/network/lbaas.pp index 0b658ce3..bea79875 100644 --- a/manifests/network/network_lbaas.pp +++ b/manifests/network/lbaas.pp @@ -16,7 +16,7 @@ # Network LBaaS node # -class os_network_lbaas( +class privatecloud::network::lbaas( $debug = $os_params::debug ) { diff --git a/manifests/network/network_metadata.pp b/manifests/network/metadata.pp similarity index 97% rename from manifests/network/network_metadata.pp rename to manifests/network/metadata.pp index fd64f603..11b1db7d 100644 --- a/manifests/network/network_metadata.pp +++ b/manifests/network/metadata.pp @@ -17,7 +17,7 @@ # Could be managed by spof_node manifest # -class os_network_metadata( +class privatecloud::network::metadata( $enabled = true, $debug = $os_params::debug, $ks_neutron_password = $os_params::ks_neutron_password, diff --git a/manifests/network/network_vpn.pp b/manifests/network/vpn.pp similarity index 95% rename from manifests/network/network_vpn.pp rename to manifests/network/vpn.pp index bd8b4d80..020d70d5 100644 --- a/manifests/network/network_vpn.pp +++ b/manifests/network/vpn.pp @@ -16,7 +16,7 @@ # Network VPNaaS node # -class os_network_vpn( +class privatecloud::network::vpn( $debug = $os_params::debug ) { diff --git a/site.pp b/site.pp index f7e1c7a3..c8aedf0a 100644 --- a/site.pp +++ b/site.pp @@ -92,8 +92,7 @@ node 'os-ci-test13', 'os-ci-test12', 'os-ci-test11', /mgmt\d+.enovance.com/ inhe class {'privatecloud::cache': } # Networking - class {'os_network_common': } - class {'os_network_controller': } + class {'privatecloud::network::controller': } # Orchestration 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 node 'os-ci-test8', /net\d+.enovance.com/ inherits common { - class {'os_network_common': } - class {'os_network_dhcp': } - class {'os_network_metadata': } - class {'os_network_lbaas': } - class {'os_network_l3': } - class {'os_network_vpn':} + class {'privatecloud::network::dhcp': } + class {'privatecloud::network::metadata': } + class {'privatecloud::network::lbaas': } + class {'privatecloud::network::l3': } + class {'privatecloud::network::vpn':} }