enable ceilometer

and fix up some issues now that we are running on -o errexit
This commit is contained in:
Sean Dague
2014-02-28 19:13:09 -05:00
parent b10a18e81f
commit 4c25788365
4 changed files with 18 additions and 8 deletions

View File

@@ -16,6 +16,8 @@ ADMIN_PASSWORD=pass
API_RATE_LIMIT="False"
RECLONE="True"
enable_service ceilometer-acompute
[[post-config|$NOVA_CONF]]
[DEFAULT]
flat_interface = eth1

View File

@@ -14,6 +14,8 @@ IMAGE_URLS+=",https://download.fedoraproject.org/pub/fedora/linux/releases/20/Im
IMAGE_URLS+=",https://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-amd64-disk1.img"
enable_service dstat
enable_service ceilometer-acompute ceilometer-acentral ceilometer-anotification ceilometer-collector ceilometer-api
enable_service ceilometer-alarm-notifier ceilometer-alarm-evaluato
[[post-config|$NOVA_CONF]]
[DEFAULT]

View File

@@ -2,6 +2,7 @@ class devstack(
$dir = '/home/stack/devstack'
)
{
$user = $user::stack::username
vcsrepo { $dir:
ensure => latest,
provider => git,
@@ -18,16 +19,16 @@ class devstack(
}
file { "$dir/local.sh":
owner => "stack",
group => "stack",
owner => $user,
group => $user,
mode => 755,
source => "puppet:///modules/devstack/local.sh",
require => vcsrepo[ $dir ]
}
file { "$dir/local.conf":
owner => "stack",
group => "stack",
owner => $user,
group => $user,
mode => 644,
source => "puppet:///modules/devstack/$localrc",
require => [vcsrepo[ $dir ], file["$dir/local.sh"]]
@@ -37,7 +38,9 @@ class devstack(
require => [vcsrepo[ $dir ], file["$dir/local.conf"]],
cwd => $dir,
path => "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:.",
environment => "HOME=/home/$user",
user => 'stack',
group => 'stack',
command => "$dir/stack.sh",
logoutput => true,
timeout => 1200

View File

@@ -1,4 +1,7 @@
class user::stack() {
class user::stack(
$username = 'stack'
)
{
file {'/etc/sudoers.d/stack':
owner => "root",
@@ -8,15 +11,15 @@ class user::stack() {
} ->
user::create {'stack':
user => 'stack',
user => $username,
pass => $stack_pass,
key => $stack_sshkey,
is_admin => true,
} ->
file {'/home/stack/.bashrc':
owner => "stack",
group => "stack",
owner => $username,
group => $username,
mode => 644,
source => "puppet:///modules/user/stack_bashrc"
}