site files: Update with new classes

- Add dashboard class
- Add SPOF class
- Fix compute nodes

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2013-12-16 14:33:15 +01:00
parent b77316f8b6
commit e61bec1a91
2 changed files with 13 additions and 3 deletions

View File

@@ -33,6 +33,7 @@ import 'roles/monitoring/*.pp'
import 'roles/network/*.pp' import 'roles/network/*.pp'
import 'roles/object-storage/*.pp' import 'roles/object-storage/*.pp'
import 'roles/orchestration/*.pp' import 'roles/orchestration/*.pp'
import 'roles/spof/*.pp'
import 'roles/telemetry/*.pp' import 'roles/telemetry/*.pp'
import 'roles/volume/*.pp' import 'roles/volume/*.pp'

15
site.pp
View File

@@ -63,11 +63,15 @@ node 'os-ci-test13.enovance.com' inherits common {
class {'os_nosql_node':} class {'os_nosql_node':}
class {'os_sql_node':} class {'os_sql_node':}
## Dashboard:
class {'os_dashboard':}
## Telemetry ## Telemetry
class {'os_telemetry_common':} class {'os_telemetry_common':}
class {'os_telemetry_server':} class {'os_telemetry_server':}
# Enforce using Ceilometer Agent central on one node (should be fixed in Icehouse):
class {'ceilometer::agent::central': } ## SPOF services
class {'os_spof_node':}
## Identity ## Identity
class {'os_identity_controller': class {'os_identity_controller':
@@ -92,7 +96,8 @@ node 'os-ci-test13.enovance.com' inherits common {
class {'os_network_controller': } class {'os_network_controller': }
# Orchestration # Orchestration
class {'os_orchestration_controller': } class {'os_orchestration_common': }
class {'os_orchestration_api': }
} }
# #
@@ -128,6 +133,10 @@ node 'os-ci-test10.enovance.com', 'os-ci-test11.enovance.com', 'os-ci-test12.eno
#FIXME 7 is down #FIXME 7 is down
node 'os-ci-test7.enovance.com' inherits common { node 'os-ci-test7.enovance.com' inherits common {
## Networking
class { 'os_network_common': }
class { 'os_network_compute': }
## Compute ## Compute
class { 'os_compute_hypervisor': class { 'os_compute_hypervisor':
local_ip => $ipaddress_eth0, local_ip => $ipaddress_eth0,