Allow passing custom openshift-ansible playbook

This allows deploying openshift from the packaged openshift-ansible or
from a git checkout more easily, by setting the
OpenShiftAnsiblePlaybook heat environment variable.

Change-Id: I60594faa10dfd817d94038b3938d7de269330e2e
This commit is contained in:
Martin André 2018-02-12 11:02:30 +01:00
parent d51c3e3103
commit cf1de90684

View File

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