stackforge/puppet-openstack-cloud
Code Issues Proposed changes

site: prepare site.pp for functionnal names (works for storage *AND* computes jobs)

Browse Source
This commit is contained in:
Sebastien Badia
2013-12-18 10:59:04 +01:00
parent bb43ba263f
commit 9831a9b043
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
site.pp
View File

@@ -49,7 +49,7 @@ node common {
# Puppet Master node (x1) # Puppet Master node (x1)
node 'os-ci-test4' inherits common{ node 'os-ci-test4', /pmaster\d+.enovance.com/ inherits common{
# Everything related to puppet is bootstraped by jenkins # Everything related to puppet is bootstraped by jenkins
# and other stuffs are made by common class. # and other stuffs are made by common class.
@@ -57,7 +57,7 @@ node 'os-ci-test4' inherits common{
} }
# Controller nodes (x3) # Controller nodes (x3)
node 'os-ci-test13', 'os-ci-test12', 'os-ci-test11' inherits common { node 'os-ci-test13', 'os-ci-test12', 'os-ci-test11', /mgmt\d+.enovance.com/ inherits common {
## Databases: ## Databases:
class {'os_nosql_node':} class {'os_nosql_node':}
@@ -104,7 +104,7 @@ node 'os-ci-test13', 'os-ci-test12', 'os-ci-test11' 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
node 'os-ci-test8' inherits common { node 'os-ci-test8', /net\d+.enovance.com/ inherits common {
class {'os_network_common': } class {'os_network_common': }
class {'os_network_dhcp': } class {'os_network_dhcp': }
@@ -116,20 +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 /storage\d+.enocloud.com/ 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)
node 'os-ci-test10' inherits common { node 'os-ci-test10', /compute\d+.enovance.com/ inherits common {
## Networking ## Networking
class { 'os_network_common': } class { 'os_network_common': }