Skip to content

Commit

Permalink
Add Ceilometer to Quickstack
Browse files Browse the repository at this point in the history
Adds ceilometer master services to quickstack::controller Puppet class
and compute agent to quickstack::compute Puppet class.
  • Loading branch information
jistr committed Sep 11, 2013
1 parent 67ef104 commit c4f8893
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 0 deletions.
2 changes: 2 additions & 0 deletions bin/seeds.rb
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,8 @@
params = {
"verbose" => "true",
"admin_password" => SecureRandom.hex,
"ceilometer_metering_secret" => SecureRandom.hex,
"ceilometer_user_password" => SecureRandom.hex,
"cinder_db_password" => SecureRandom.hex,
"cinder_user_password" => SecureRandom.hex,
"glance_db_password" => SecureRandom.hex,
Expand Down
14 changes: 14 additions & 0 deletions puppet/modules/quickstack/manifests/nova_network/compute.pp
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Common quickstack configurations
class quickstack::nova_network::compute (
$ceilometer_metering_secret = $quickstack::params::ceilometer_metering_secret,
$ceilometer_user_password = $quickstack::params::ceilometer_user_password,
$fixed_network_range = $quickstack::params::fixed_network_range,
$floating_network_range = $quickstack::params::floating_network_range,
$nova_db_password = $quickstack::params::nova_db_password,
Expand Down Expand Up @@ -76,4 +78,16 @@
action => 'accept',
}

class { 'ceilometer':
metering_secret => $ceilometer_metering_secret,
qpid_hostname => $pacemaker_priv_floating_ip,
rpc_backend => 'ceilometer.openstack.common.rpc.impl_qpid',
verbose => $verbose,
debug => true,
}

class { 'ceilometer::agent::compute':
auth_url => "http:https://${pacemaker_priv_floating_ip}:35357/v2.0",
auth_password => $ceilometer_user_password,
}
}
47 changes: 47 additions & 0 deletions puppet/modules/quickstack/manifests/nova_network/controller.pp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
class quickstack::nova_network::controller (
$admin_email = $quickstack::params::admin_email,
$admin_password = $quickstack::params::admin_password,
$ceilometer_metering_secret = $quickstack::params::ceilometer_metering_secret,
$ceilometer_user_password = $quickstack::params::ceilometer_user_password,
$cinder_db_password = $quickstack::params::cinder_db_password,
$cinder_user_password = $quickstack::params::cinder_user_password,
$glance_db_password = $quickstack::params::glance_db_password,
Expand Down Expand Up @@ -91,13 +93,58 @@
address => $pacemaker_priv_floating_ip,
}

class { 'ceilometer::keystone::auth':
password => $ceilometer_user_password,
public_address => $pacemaker_priv_floating_ip,
admin_address => $pacemaker_priv_floating_ip,
internal_address => $pacemaker_priv_floating_ip,
}

class {'openstack::glance':
db_host => $pacemaker_priv_floating_ip,
user_password => $glance_user_password,
db_password => $glance_db_password,
require => Class['openstack::db::mysql'],
}

# Configure Ceilometer
class { 'mongodb':
enable_10gen => false,
port => '27017',
}

class { 'ceilometer':
metering_secret => $ceilometer_metering_secret,
qpid_hostname => $pacemaker_priv_floating_ip,
rpc_backend => 'ceilometer.openstack.common.rpc.impl_qpid',
verbose => $verbose,
debug => true,
}

class { 'ceilometer::db':
database_connection => 'mongodb:https://localhost:27017/ceilometer',
require => Class['mongodb'],
}

class { 'ceilometer::collector':
require => Class['ceilometer::db'],
}

class { 'ceilometer::agent::central':
auth_url => "http:https://${pacemaker_priv_floating_ip}:35357/v2.0",
auth_password => $ceilometer_user_password,
}

class { 'ceilometer::api':
keystone_host => $pacemaker_priv_floating_ip,
keystone_password => $ceilometer_user_password,
require => Class['mongodb'],
}

glance_api_config {
'DEFAULT/notifier_strategy': value => 'qpid'
}

# Configure Nova
class { 'nova':
sql_connection => "mysql:https://nova:${nova_db_password}@${pacemaker_priv_floating_ip}/nova",
Expand Down
2 changes: 2 additions & 0 deletions puppet/modules/quickstack/manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
# during the setup process. This will move to the Foreman API v2
# at some point.
$admin_password = 'CHANGEME'
$ceilometer_metering_secret = 'CHANGEME'
$ceilometer_user_password = 'CHANGEME'
$cinder_db_password = 'CHANGEME'
$cinder_user_password = 'CHANGEME'
$glance_db_password = 'CHANGEME'
Expand Down

0 comments on commit c4f8893

Please sign in to comment.