stackforge/puppet-openstack-cloud
Code Issues Proposed changes

site: adapt for running CI job (alive nodes)

Browse Source
This commit is contained in:
Sebastien Badia
2013-12-18 10:55:33 +01:00
parent 78115a59aa
commit bb43ba263f
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
site.pp
View File

@@ -57,7 +57,7 @@ node 'os-ci-test4' inherits common{
} }
# Controller nodes (x3) # Controller nodes (x3)
node 'os-ci-test13' inherits common { node 'os-ci-test13', 'os-ci-test12', 'os-ci-test11' inherits common {
## Databases: ## Databases:
class {'os_nosql_node':} class {'os_nosql_node':}
@@ -104,7 +104,6 @@ node 'os-ci-test13' inherits common {
# == Network nodes (x2) # == Network nodes (x2)
# L2 integration providing several services: DHCP, L3 Agent, Metadata service, LBaaS, and VPNaaS # L2 integration providing several services: DHCP, L3 Agent, Metadata service, LBaaS, and VPNaaS
# We need at least two nodes for DHCP High availability # We need at least two nodes for DHCP High availability
#FIXME 8 is down
node 'os-ci-test8' inherits common { node 'os-ci-test8' inherits common {
class {'os_network_common': } class {'os_network_common': }
@@ -117,21 +116,20 @@ node 'os-ci-test8' inherits common {
} }
# Storage nodes (x3) # Storage nodes (x3)
node 'os-ci-test10', 'os-ci-test11', 'os-ci-test12' inherits common{ #node 'os-ci-test10', 'os-ci-test11', 'os-ci-test12' inherits common{
#
## Telemetry ### Telemetry
class {'os_telemetry_common':} # class {'os_telemetry_common':}
#
## Object Storage ### Object Storage
class { 'os_swift_storage': # class { 'os_swift_storage':
local_ip => $ipaddress_eth0, # local_ip => $ipaddress_eth0,
swift_zone => $os_params::os_swift_zone[$::hostname], # swift_zone => $os_params::os_swift_zone[$::hostname],
} # }
} #}
# Compute nodes (x1) # Compute nodes (x1)
#FIXME 7 is down node 'os-ci-test10' inherits common {
node 'os-ci-test7' inherits common {
## Networking ## Networking
class { 'os_network_common': } class { 'os_network_common': }