Merge "Use openshift-ansible container instead of RPMs"

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: