diff options
author | 2017-08-19 05:37:50 +0000 | |
---|---|---|
committer | 2017-08-19 05:37:50 +0000 | |
commit | 4adb01f7ae34234caf06f52cce5428fcdd294cdf (patch) | |
tree | feb2ee86cf731be61e9df1a3621b47f571765ccc /docker/services/ceph-ansible/ceph-base.yaml | |
parent | 8d40aab62f4c0ff7590ffcd97b3a82bfd34047a7 (diff) | |
parent | 06aa229b01e8b431802311cb363c019335710455 (diff) |
Merge "Swith to the appropriate ceph-ansible playbook on upgrade"
Diffstat (limited to 'docker/services/ceph-ansible/ceph-base.yaml')
-rw-r--r-- | docker/services/ceph-ansible/ceph-base.yaml | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml index 72ab53db..0399faf8 100644 --- a/docker/services/ceph-ansible/ceph-base.yaml +++ b/docker/services/ceph-ansible/ceph-base.yaml @@ -30,6 +30,14 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json + StackUpdateType: + type: string + description: > + Type of update, to differentiate between UPGRADE and UPDATE cases + when StackAction is UPDATE (both are the same stack action). + constraints: + - allowed_values: ['', 'UPGRADE'] + default: '' CephAnsibleWorkflowName: type: string description: Name of the Mistral workflow to execute @@ -38,6 +46,10 @@ parameters: type: string description: Path to the ceph-ansible playbook to execute default: /usr/share/ceph-ansible/site-docker.yml.sample + CephAnsibleUpgradePlaybook: + type: string + description: Path to the ceph-ansible playbook to execute on upgrade + default: /usr/share/ceph-ansible/infrastructure-playbooks/take-over-existing-cluster.yml CephAnsibleExtraConfig: type: json description: Extra vars for the ceph-ansible playbook @@ -113,6 +125,8 @@ conditions: yaql: data: {get_param: DockerCephDaemonImage} expression: $.data.split('/')[0].matches('(\.|:)') + perform_upgrade: + equals: [{get_param: StackUpdateType}, 'UPGRADE'] resources: DockerImageUrlParts: @@ -160,7 +174,11 @@ outputs: 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' |