Skip to content

Commit

Permalink
Add Ceilometer support to Neutron-based host groups
Browse files Browse the repository at this point in the history
  • Loading branch information
jistr committed Sep 17, 2013
1 parent 07a5fb1 commit 1ebdd85
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 0 deletions.
14 changes: 14 additions & 0 deletions puppet/modules/quickstack/manifests/neutron/compute.pp
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Common quickstack configurations
class quickstack::neutron::compute (
$admin_password = $quickstack::params::admin_password,
$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,
$neutron_db_password = $quickstack::params::neutron_db_password,
Expand Down Expand Up @@ -60,6 +62,18 @@
auth_host => $controller_priv_floating_ip,
}

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

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

class { '::neutron':
allow_overlapping_ips => true,
rpc_backend => 'neutron.openstack.common.rpc.impl_qpid',
Expand Down
46 changes: 46 additions & 0 deletions puppet/modules/quickstack/manifests/neutron/controller.pp
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
class quickstack::neutron::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 @@ -69,6 +71,13 @@
address => $controller_priv_floating_ip,
}

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

class {'openstack::glance':
db_host => $controller_priv_floating_ip,
user_password => $glance_user_password,
Expand Down Expand Up @@ -113,6 +122,43 @@
enabled => true,
}

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

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

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://${controller_priv_floating_ip}:35357/v2.0",
auth_password => $ceilometer_user_password,
}

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

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

package {'horizon-packages':
name => ['python-memcached', 'python-netaddr'],
notify => Class['horizon'],
Expand Down

0 comments on commit 1ebdd85

Please sign in to comment.