stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Compute: Cleanup classes

Browse Source 
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2013-12-30 09:57:26 +01:00
parent e9073b719e
commit b4467ce573
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/compute/compute_common.pp → manifests/compute.pp
View File

@ -13,10 +13,16 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# #
# Compute Common (controller/hypervisor) # == Class: privatecloud::compute
#
# Common class for compute nodes
#
# === Parameters:
#
# (WIP)
# #
class os_compute_common( class privatecloud::compute(
$nova_db_host = $os_params::nova_db_host, $nova_db_host = $os_params::nova_db_host,
$nova_db_user = $os_params::nova_db_user, $nova_db_user = $os_params::nova_db_user,
$nova_db_password = $os_params::nova_db_password, $nova_db_password = $os_params::nova_db_password,

2
manifests/compute/compute_controller.pp → manifests/compute/controller.pp
View File

@ -16,7 +16,7 @@
# Compute controller node # Compute controller node
# #
class os_compute_controller( class privatecloud::compute::controller(
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host, $ks_keystone_internal_host = $os_params::ks_keystone_internal_host,
$ks_nova_password = $os_params::ks_nova_password, $ks_nova_password = $os_params::ks_nova_password,
$neutron_metadata_proxy_shared_secret = $os_params::neutron_metadata_proxy_shared_secret, $neutron_metadata_proxy_shared_secret = $os_params::neutron_metadata_proxy_shared_secret,

2
manifests/compute/compute_hypervisor.pp → manifests/compute/hypervisor.pp
View File

@ -16,7 +16,7 @@
# Hypervisor Compute node # Hypervisor Compute node
# #
class os_compute_hypervisor( class privatecloud::compute::hypervisor(
$local_ip = $ipaddress_eth1, $local_ip = $ipaddress_eth1,
$libvirt_type = 'kvm', $libvirt_type = 'kvm',
) { ) {

9
site.pp
View File

@ -19,6 +19,7 @@
import 'params.pp' import 'params.pp'
# Import manifests # Import manifests
import 'manifests/*.pp'
import 'manifests/compute/*.pp' import 'manifests/compute/*.pp'
import 'manifests/database/*.pp' import 'manifests/database/*.pp'
import 'manifests/image/*.pp' import 'manifests/image/*.pp'
@ -34,9 +35,6 @@ node common {
# Params # Params
class { 'os_params': } class { 'os_params': }
# Common system configuration
class { 'privatecloud': }
} }
@ -63,6 +61,9 @@ node 'os-ci-test13', 'os-ci-test12', 'os-ci-test11', /mgmt\d+.enovance.com/ inhe
## Dashboard: ## Dashboard:
class {'privatecloud::dashboard':} class {'privatecloud::dashboard':}
## Compute:
class {'privatecloud::compute::controller':}
## Telemetry ## Telemetry
class {'os_telemetry_common':} class {'os_telemetry_common':}
class {'os_telemetry_server':} class {'os_telemetry_server':}
@ -133,7 +134,7 @@ node 'os-ci-test10', /compute\d+.enovance.com/ inherits common {
class { 'os_network_compute': } class { 'os_network_compute': }
## Compute ## Compute
class { 'os_compute_hypervisor': class { 'privatecloud::compute::hypervisor':
local_ip => $ipaddress_eth0, local_ip => $ipaddress_eth0,
} }