Merge "Remove obsolete |succeeded filter from tasks" into stable/queens
This commit is contained in:
commit
92ba479f1f
|
@ -108,4 +108,4 @@
|
|||
|
||||
when: ceph_env is defined
|
||||
|
||||
when: ceph_ansible|succeeded and not ceph_osd_adjusted.stat.exists
|
||||
when: ceph_ansible is succeeded and not ceph_osd_adjusted.stat.exists
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
path: "{{ overcloud_deploy_script }}"
|
||||
regexp: "{{ control_scale.stdout }}"
|
||||
state: absent
|
||||
when: control_scale|succeeded
|
||||
when: control_scale is succeeded
|
||||
|
||||
- name: register compute-scale opts
|
||||
shell: |
|
||||
|
@ -23,7 +23,7 @@
|
|||
path: "{{ overcloud_deploy_script }}"
|
||||
regexp: "{{ compute_scale.stdout }}"
|
||||
state: absent
|
||||
when: compute_scale|succeeded
|
||||
when: compute_scale is succeeded
|
||||
|
||||
- name: register ceph-storage-scale opts
|
||||
shell: |
|
||||
|
@ -36,7 +36,7 @@
|
|||
path: "{{ overcloud_deploy_script }}"
|
||||
regexp: "{{ ceph_scale.stdout }}"
|
||||
state: absent
|
||||
when: ceph_scale|succeeded
|
||||
when: ceph_scale is succeeded
|
||||
|
||||
- name: register control-flavor opts
|
||||
shell: |
|
||||
|
@ -49,7 +49,7 @@
|
|||
path: "{{ overcloud_deploy_script }}"
|
||||
regexp: "{{ control_flavor.stdout }}"
|
||||
state: absent
|
||||
when: control_flavor|succeeded
|
||||
when: control_flavor is succeeded
|
||||
|
||||
- name: register compute-flavor opts
|
||||
shell: |
|
||||
|
@ -62,7 +62,7 @@
|
|||
path: "{{ overcloud_deploy_script }}"
|
||||
regexp: "{{ compute_flavor.stdout }}"
|
||||
state: absent
|
||||
when: compute_flavor|succeeded
|
||||
when: compute_flavor is succeeded
|
||||
|
||||
- name: register ceph-flavor opts
|
||||
shell: |
|
||||
|
@ -75,7 +75,7 @@
|
|||
path: "{{ overcloud_deploy_script }}"
|
||||
regexp: "{{ ceph_flavor.stdout }}"
|
||||
state: absent
|
||||
when: ceph_flavor|succeeded
|
||||
when: ceph_flavor is succeeded
|
||||
|
||||
- name: register ntp-server opts
|
||||
shell: |
|
||||
|
@ -88,7 +88,7 @@
|
|||
path: "{{ overcloud_deploy_script }}"
|
||||
regexp: "{{ ntp_server.stdout }}"
|
||||
state: absent
|
||||
when: ntp_server|succeeded
|
||||
when: ntp_server is succeeded
|
||||
|
||||
- name: convert cli options into parameters
|
||||
template:
|
||||
|
@ -97,13 +97,13 @@
|
|||
force: false
|
||||
when:
|
||||
- >
|
||||
control_scale|succeeded or
|
||||
compute_scale|succeeded or
|
||||
ceph_scale|succeeded or
|
||||
control_flavor|succeeded or
|
||||
compute_flavor|succeeded or
|
||||
ceph_flavor|succeeded or
|
||||
ntp_server|succeeded
|
||||
control_scale is succeeded or
|
||||
compute_scale is succeeded or
|
||||
ceph_scale is succeeded or
|
||||
control_flavor is succeeded or
|
||||
compute_flavor is succeeded or
|
||||
ceph_flavor is succeeded or
|
||||
ntp_server is succeeded
|
||||
|
||||
- name: check "{{ working_dir }}/cli_opts_params.yaml" exists
|
||||
stat:
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
- name: include undercloud_ssl_camap.yaml
|
||||
include_tasks: undercloud_ssl_camap.yaml
|
||||
when:
|
||||
- undercloud_ssl|succeeded
|
||||
- undercloud_ssl is succeeded
|
||||
- not splitstack_deployment|bool
|
||||
|
||||
- name: generate roles list from inventory file
|
||||
|
|
|
@ -1,22 +1,22 @@
|
|||
parameter_defaults:
|
||||
{% if control_scale|succeeded %}
|
||||
{% if control_scale is succeeded %}
|
||||
ControllerCount: {{ control_scale.stdout|regex_search('\d+')}}
|
||||
{% endif %}
|
||||
{% if compute_scale|succeeded %}
|
||||
{% if compute_scale is succeeded %}
|
||||
ComputeCount: {{ compute_scale.stdout|regex_search('\d+')}}
|
||||
{% endif %}
|
||||
{% if ceph_scale|succeeded %}
|
||||
{% if ceph_scale is succeeded %}
|
||||
CephStorageCount: {{ ceph_scale.stdout|regex_search('\d+')}}
|
||||
{% endif %}
|
||||
{% if control_flavor|succeeded %}
|
||||
{% if control_flavor is succeeded %}
|
||||
OvercloudControllerFlavor: {{ control_flavor.stdout.split()[1]}}
|
||||
{% endif %}
|
||||
{% if compute_flavor|succeeded %}
|
||||
{% if compute_flavor is succeeded %}
|
||||
OvercloudComputeFlavor: {{ compute_flavor.stdout.split()[1]}}
|
||||
{% endif %}
|
||||
{% if ceph_flavor|succeeded %}
|
||||
{% if ceph_flavor is succeeded %}
|
||||
OvercloudCephStorageFlavor: {{ ceph_flavor.stdout.split()[1]}}
|
||||
{% endif %}
|
||||
{% if ntp_server|succeeded %}
|
||||
{% if ntp_server is succeeded %}
|
||||
NtpServer: {{ ntp_server.stdout.split()[1] }}
|
||||
{% endif %}
|
||||
|
|
Loading…
Reference in New Issue