openstack
/
puppet-monasca
Code Issues Proposed changes

Fix resources for latest puppet 

The unit tests for puppet 5 (running via latest) is failing on some
modules because the catalog created in the test doesn't contain the
resources being referenced in requires/subscribes.

Change-Id: I927d517d68bf23aea3837e985afdc8443c2b98c9
Closes-Bug: #1729212
This commit is contained in:
ZhongShengping 2017-11-01 14:53:02 +08:00
parent 151e23ba85
commit 6ac8b46a20
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/keystone/auth.pp
View File

@ -182,17 +182,21 @@ class monasca::keystone::auth (
}
if $configure_user {
Keystone_user_role[$agent_name]
~> Service <| name == 'monasca-agent' |>
Keystone_user_role[$user_name]
~> Service <| name == 'monasca-agent' |>
keystone_user { $agent_name:
ensure => present,
password => $agent_password,
email => $agent_email,
before => Service['monasca-agent'],
}
keystone_user { $user_name:
ensure => present,
password => $user_password,
email => $user_email,
before => Service['monasca-agent'],
}
}
@ -203,6 +207,10 @@ class monasca::keystone::auth (
~> Service <| name == 'monasca-api' |>
Keystone_user_role["${user_name}@${tenant}"]
~> Service <| name == 'monasca-api' |>
Keystone_user_role["${agent_name}@${tenant}"]
~> Service <| name == 'monasca-agent' |>
Keystone_user_role["${user_name}@${tenant}"]
~> Service <| name == 'monasca-agent' |>
if !defined(Keystone_role[$role_agent]) {
keystone_role { $role_agent:
@ -244,12 +252,10 @@ class monasca::keystone::auth (
keystone_user_role { "${agent_name}@${tenant}":
ensure => present,
roles => $real_user_roles_agent,
before => Service['monasca-agent'],
}
keystone_user_role { "${user_name}@${tenant}":
ensure => present,
roles => $real_user_roles_user,
before => Service['monasca-agent'],
}
}

8
manifests/virtualenv/agent_instance.pp
View File

@ -44,6 +44,10 @@ define monasca::virtualenv::agent_instance(
validate_re($ensure, $valid_values,
"Unknown value '${ensure}' for ensure, must be present or absent")
File[$basedir] -> anchor { 'monasca::virtualenv::instance': }
Package<| name == 'python-virtualenv' |> -> Anchor['monasca::virtualenv::instance']
Package<| name == 'python-dev' |> -> Anchor['monasca::virtualenv::instance']
monasca::virtualenv::instance { $name:
ensure => $ensure,
basedir => $basedir,
@ -52,7 +56,7 @@ define monasca::virtualenv::agent_instance(
venv_requirements => $venv_requirements,
venv_active => $venv_active,
venv_extra_args => $venv_extra_args,
require => [File[$basedir],Package['python-virtualenv'],
Package['python-dev']],
require => Anchor['monasca::virtualenv::instance'],
}
}