Use openshift-ansible container instead of RPMs

This allows us to deploy openshift without the need to install
openshift-ansible in the mistral container image or in the undercloud.

Co-Authored-By: Martin André <m.andre@redhat.com>
Depends-On: Ied75bfbeed71aca83962e60bfc801a2527f5dfba
Change-Id: I1e28e63c8a3a30dfe1e95924f9b4086fcf9513fb
This commit is contained in:
Flavio Percoco 2018-07-19 08:47:53 +02:00 committed by Martin André
parent 39df80b332
commit a4b31b28e9
1 changed files with 7 additions and 8 deletions

View File

@ -79,6 +79,9 @@ parameters:
The value can be multiple addresses separated by commas.
type: comma_delimited_list
default: []
DockerOpenShiftAnsibleImage:
description: Openshift-ansible container image.
type: string
DockerOpenShiftBaseImage:
description: Base container image for openshift.
type: string
@ -310,6 +313,7 @@ outputs:
openshift_master_scaleup_playbook_path: {get_param: OpenShiftMasterScaleupPlaybook}
openshift_worker_scaleup_playbook_path: {get_param: OpenShiftWorkerScaleupPlaybook}
openshift_upgrade_playbook_path: {get_param: OpenShiftUpgradePlaybook}
openshift_ansible_image: {get_param: DockerOpenShiftAnsibleImage}
# NOTE(flaper87): We'll use openshift_ansible_scaleup_playbook_path
# if there are new master or new worker nodes and we are doing an
@ -445,14 +449,9 @@ outputs:
{%- if openshift_command is defined -%}
{{openshift_command}}
{%- else -%}
ANSIBLE_HOST_KEY_CHECKING=False
ansible-playbook
-i '{{playbook_dir}}/openshift/inventory'
--extra-vars '@{{playbook_dir}}/openshift/global_vars.yml'
{% if groups['openshift_glusterfs'] | default([]) %}
--extra-vars '@{{playbook_dir}}/openshift/global_gluster_vars.yml'
{% endif %}
'{{playbook_dir}}/openshift/playbook.yml'
sudo /usr/bin/tripleo-deploy-openshift
--config-download-dir {{playbook_dir}}
--image {{openshift_ansible_image}}
{%- endif -%}
- name: print openshift command
debug: