From 4b59a9c5d337391e5134ccdb4b181d32ab318a45 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Sun, 29 Dec 2013 22:10:22 +0100 Subject: [PATCH] Move loadbalancer to namspace - Update site.pp - Rename the class - Delete manifests/load-balancer Signed-off-by: Emilien Macchi --- manifests/{load-balancer/lb_server.pp => loadbalancer.pp} | 2 +- site.pp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) rename manifests/{load-balancer/lb_server.pp => loadbalancer.pp} (99%) diff --git a/manifests/load-balancer/lb_server.pp b/manifests/loadbalancer.pp similarity index 99% rename from manifests/load-balancer/lb_server.pp rename to manifests/loadbalancer.pp index c36a4b05..f9e25ba8 100644 --- a/manifests/load-balancer/lb_server.pp +++ b/manifests/loadbalancer.pp @@ -16,7 +16,7 @@ # HAproxy nodes # -class os_lb_server( +class privatecloud::loadbalancer( $ceilometer_api = true, $cinder_api = true, $glance_api = true, diff --git a/site.pp b/site.pp index 8cba1177..f3487505 100644 --- a/site.pp +++ b/site.pp @@ -23,7 +23,6 @@ import 'manifests/automation/*.pp' import 'manifests/compute/*.pp' import 'manifests/database/*.pp' import 'manifests/image/*.pp' -import 'manifests/load-balancer/*.pp' import 'manifests/messaging/*.pp' import 'manifests/monitoring/*.pp' import 'manifests/network/*.pp' @@ -57,6 +56,9 @@ node 'os-ci-test13', 'os-ci-test12', 'os-ci-test11', /mgmt\d+.enovance.com/ inhe # os-ci-test13 is the main mgmt +## Load-Balancer: + class {'privatecloud::loadbalancer':} + ## Databases: class {'os_nosql_node':} class {'os_sql_node':}