openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Use tripleo-validations-package role instead of puppet"

Browse Source
This commit is contained in:
Zuul 2019-08-28 22:17:23 +00:00 committed by Gerrit Code Review
commit 8975c5795b
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
deployment/validations/tripleo-validations-baremetal-puppet.yaml → deployment/validations/tripleo-validations-baremetal-ansible.yaml
View File

@ -1,7 +1,7 @@
heat_template_version: rocky heat_template_version: rocky
description: > description: >
Configure TripleO Validations with Puppet. Configure TripleO Validations with Ansible.
parameters: parameters:
ServiceData: ServiceData:
@ -36,7 +36,10 @@ outputs:
description: Role data for the TripleO Validations service. description: Role data for the TripleO Validations service.
value: value:
service_name: tripleo_validations service_name: tripleo_validations
deploy_steps_tasks:
- name: Install tripleo-validations package and create user
when: step|int == 0
include_role:
name: tripleo-validations-package
config_settings: {} config_settings: {}
step_config: |
include tripleo::profile::base::validations
upgrade_tasks: [] upgrade_tasks: []

2
environments/tripleo-validations.yaml
View File

@ -1,4 +1,4 @@
# A Heat environment file that enables TripleO Validations. # A Heat environment file that enables TripleO Validations.
resource_registry: resource_registry:
OS::TripleO::Services::TripleoValidations: ../deployment/validations/tripleo-validations-baremetal-puppet.yaml OS::TripleO::Services::TripleoValidations: ../deployment/validations/tripleo-validations-baremetal-ansible.yaml