From a4b31b28e9bff585ed1842b7ea266666c0fb4542 Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Thu, 19 Jul 2018 08:47:53 +0200 Subject: [PATCH] Use openshift-ansible container instead of RPMs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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é Depends-On: Ied75bfbeed71aca83962e60bfc801a2527f5dfba Change-Id: I1e28e63c8a3a30dfe1e95924f9b4086fcf9513fb --- extraconfig/services/openshift-master.yaml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/extraconfig/services/openshift-master.yaml b/extraconfig/services/openshift-master.yaml index 1e55d3ee4f..5ed5fef4d4 100644 --- a/extraconfig/services/openshift-master.yaml +++ b/extraconfig/services/openshift-master.yaml @@ -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: