openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Add heat param for openshift prerequisites playbook"

Browse Source
This commit is contained in:
Zuul 2018-10-11 07:53:21 +00:00 committed by Gerrit Code Review
commit e3a17cb067
1 changed files with 11 additions and 5 deletions

16
extraconfig/services/openshift-master.yaml

@ -41,18 +41,22 @@ parameters:
type: json
OpenShiftAnsiblePlaybook:
default: '/usr/share/ansible/openshift-ansible/playbooks/deploy_cluster.yml'
description: Path to OpenShift-Ansible playbook.
description: Path to OpenShift-Ansible deploy playbook.
type: string
OpenShiftPrerequisitesPlaybook:
default: '/usr/share/ansible/openshift-ansible/playbooks/prerequisites.yml'
description: Path to OpenShift-Ansible prerequisites playbook.
type: string
OpenShiftMasterScaleupPlaybook:
default: '/usr/share/ansible/openshift-ansible/playbooks/openshift-master/scaleup.yml'
description: Path to OpenShift-Ansible playbook.
description: Path to OpenShift-Ansible master scale-up playbook.
type: string
OpenShiftWorkerScaleupPlaybook:
default: '/usr/share/ansible/openshift-ansible/playbooks/openshift-node/scaleup.yml'
description: Path to OpenShift-Ansible playbook.
description: Path to OpenShift-Ansible node scale-up playbook.
type: string
OpenShiftUpgradePlaybook:
default: '/usr/share/ansible/openshift-ansible/playbooks/byo/openshift-cluster/upgrades/v3_9/upgrade.yml'
default: '/usr/share/ansible/openshift-ansible/playbooks/byo/openshift-cluster/upgrades/v3_10/upgrade.yml'
description: Path to OpenShift-Ansible Upgrade playbook.
type: string
OpenShiftGlobalVariables:
@ -276,6 +280,7 @@ outputs:
- name: set openshift ansible playbook paths
set_fact:
openshift_ansible_playbook_path: {get_param: OpenShiftAnsiblePlaybook}
openshift_prerequisites_playbook_path: {get_param: OpenShiftPrerequisitesPlaybook}
openshift_master_scaleup_playbook_path: {get_param: OpenShiftMasterScaleupPlaybook}
openshift_worker_scaleup_playbook_path: {get_param: OpenShiftWorkerScaleupPlaybook}
openshift_upgrade_playbook_path: {get_param: OpenShiftUpgradePlaybook}
@ -326,7 +331,8 @@ outputs:
enabled: yes
- include: "/usr/share/ansible/openshift-ansible/playbooks/prerequisites.yml"
- include: "{{openshift_prerequisites_playbook_path}}"
{% if tripleo_stack_action == 'UPDATE' and new_masters | count > 0 %}
- include: "{{openshift_master_scaleup_playbook_path}}"
{% endif %}