From: Jenkins <jenkins@review.openstack.org>
Date: Sat, 19 Aug 2017 05:37:50 +0000 (+0000)
Subject: Merge "Swith to the appropriate ceph-ansible playbook on upgrade"
X-Git-Tag: opnfv-6.0.0~213
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=4adb01f7ae34234caf06f52cce5428fcdd294cdf;p=apex-tripleo-heat-templates.git

Merge "Swith to the appropriate ceph-ansible playbook on upgrade"
---

4adb01f7ae34234caf06f52cce5428fcdd294cdf
diff --cc docker/services/ceph-ansible/ceph-base.yaml
index 72ab53db,564b9019..0399faf8
--- a/docker/services/ceph-ansible/ceph-base.yaml
+++ b/docker/services/ceph-ansible/ceph-base.yaml
@@@ -158,12 -160,14 +172,16 @@@ outputs
            - name: ceph_base_ansible_workflow
              workflow: { get_param: CephAnsibleWorkflowName }
              input:
 +              ansible_skip_tags: {get_param: CephAnsibleSkipTags}
                ceph_ansible_extra_vars: {get_param: CephAnsibleExtraConfig}
-               ceph_ansible_playbook: {get_param: CephAnsiblePlaybook}
+               ceph_ansible_playbook:
+                 if:
+                   - perform_upgrade
+                   - {get_param: CephAnsibleUpgradePlaybook}
+                   - {get_param: CephAnsiblePlaybook}
        config_settings:
          ceph_common_ansible_vars:
 +          ireallymeanit: 'yes'
            fsid: { get_param: CephClusterFSID }
            docker: true
            ceph_docker_registry: {get_attr: [DockerImageUrlParts, value, host]}