Merge "Allow passing custom openshift-ansible playbook"

This commit is contained in:
Zuul 2018-02-19 20:46:28 +00:00 committed by Gerrit Code Review
commit d7ec3c48ac

View File

@ -37,6 +37,10 @@ parameters:
default: {}
description: Global Ansible variables for OpenShift-Ansible installer.
type: json
OpenShiftAnsiblePlaybook:
default: '/usr/share/ansible/openshift-ansible/playbooks/byo/config.yml'
description: Path to OpenShift-Ansible playbook.
type: string
outputs:
role_data:
@ -117,6 +121,10 @@ outputs:
dest: "{{playbook_dir}}/openshift/global_vars.yml"
content: "{{openshift_global_vars|to_nice_yaml}}"
- name: set openshift ansible playbook path
set_fact:
openshift_ansible_playbook_path: {get_param: OpenShiftAnsiblePlaybook}
- name: generate openshift playbook
copy:
dest: "{{playbook_dir}}/openshift/playbook.yml"
@ -163,7 +171,7 @@ outputs:
state: restarted
enabled: yes
- include: /usr/share/ansible/openshift-ansible/playbooks/byo/config.yml
- include: "{{openshift_ansible_playbook_path}}"
- name: set openshift command
set_fact:
openshift_command: >-