openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Use login-defs role from tripleo-ansible in sc004 

Add login-defs role to be in scenario004 and use it
from tripleo-ansible.
Depends-On: https://review.opendev.org/670768
Change-Id: I825ca49fb1fbf778fa5e5e62385ee4753424612c
This commit is contained in:
Sagi Shnaidman 2019-07-15 10:08:26 +03:00
parent 4c83dc4b94
commit 2ae95677fe
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ci/environments/scenario004-standalone.yaml
View File

@ -25,6 +25,7 @@ resource_registry:
OS::TripleO::Services::PacemakerRemote: ../../deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml
OS::TripleO::Services::Clustercheck: ../../deployment/pacemaker/clustercheck-container-puppet.yaml
OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml
OS::TripleO::Services::LoginDefs: ../../deployment/login-defs/login-defs-baremetal.yaml
OS::TripleO::Services::Keepalived: OS::Heat::None
# NOTE(mmagr): We need to disable Sensu client deployment for now as the container health check is based
# on successful RabbitMQ connection, which does not happen in this case. We can enable it again when we

17
deployment/login-defs/login-defs-baremetal-puppet.yaml → deployment/login-defs/login-defs-baremetal.yaml
View File

@ -56,11 +56,12 @@ outputs:
description: Parameters for configuration of the login.defs file
value:
service_name: login_defs
config_settings:
tripleo::profile::base::login_defs::password_max_days: {get_param: PasswordMaxDays}
tripleo::profile::base::login_defs::password_min_days: {get_param: PasswordMinDays}
tripleo::profile::base::login_defs::password_warn_age: {get_param: PasswordWarnAge}
tripleo::profile::base::login_defs::password_min_len: {get_param: PasswordMinLen}
tripleo::profile::base::login_defs::fail_delay: {get_param: FailDelay}
step_config: |
include ::tripleo::profile::base::login_defs
host_prep_tasks:
- include_role:
name: login-defs
ansible_group_vars:
tripleo_login_defs_password_max_days: {get_param: PasswordMaxDays}
tripleo_login_defs_password_min_days: {get_param: PasswordMinDays}
tripleo_login_defs_password_min_len: {get_param: PasswordWarnAge}
tripleo_login_defs_password_warn_age: {get_param: PasswordMinLen}
tripleo_login_defs_fail_delay: {get_param: FailDelay}

2
environments/login-defs.yaml
View File

@ -1,5 +1,5 @@
resource_registry:
OS::TripleO::Services::LoginDefs: ../deployment/login-defs/login-defs-baremetal-puppet.yaml
OS::TripleO::Services::LoginDefs: ../deployment/login-defs/login-defs-baremetal.yaml
parameter_defaults:
PasswordMaxDays: 60