Merge "Remove broken conditions when including playbooks"
This commit is contained in:
commit
dc1c665e9d
|
@ -26,14 +26,8 @@
|
||||||
vars:
|
vars:
|
||||||
list_of_bind_mounts: "{{ gnocchi_container_bind_mounts }}"
|
list_of_bind_mounts: "{{ gnocchi_container_bind_mounts }}"
|
||||||
when:
|
when:
|
||||||
- (gnocchi_storage_driver == "file") or (gnocchi_storage_driver is not defined)
|
|
||||||
- not is_metal
|
- not is_metal
|
||||||
|
- (gnocchi_storage_driver | default('file')) != "file"
|
||||||
- include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
|
|
||||||
when:
|
|
||||||
- not is_metal
|
|
||||||
- gnocchi_storage_driver is defined
|
|
||||||
- gnocchi_storage_driver != "file"
|
|
||||||
|
|
||||||
- include_tasks: common-tasks/os-log-dir-setup.yml
|
- include_tasks: common-tasks/os-log-dir-setup.yml
|
||||||
vars:
|
vars:
|
||||||
|
@ -55,6 +49,7 @@
|
||||||
- ceph
|
- ceph
|
||||||
|
|
||||||
- role: "os_gnocchi"
|
- role: "os_gnocchi"
|
||||||
|
gnocchi_identity_only: "{{ ((gnocchi_storage_driver | default('file')) == 'swift') | ternary(true, false)}}"
|
||||||
|
|
||||||
post_tasks:
|
post_tasks:
|
||||||
- include_tasks: "common-tasks/rsyslog-client.yml"
|
- include_tasks: "common-tasks/rsyslog-client.yml"
|
||||||
|
|
|
@ -19,6 +19,13 @@
|
||||||
user: root
|
user: root
|
||||||
vars_files:
|
vars_files:
|
||||||
- "defaults/{{ install_method }}_install.yml"
|
- "defaults/{{ install_method }}_install.yml"
|
||||||
|
pre_tasks:
|
||||||
|
- name: End playbook
|
||||||
|
meta: end_play
|
||||||
|
when:
|
||||||
|
- (not (tempest_install | default(false)) | bool) or
|
||||||
|
(not (tempest_run | default(false)) | bool)
|
||||||
|
|
||||||
roles:
|
roles:
|
||||||
- role: "os_tempest"
|
- role: "os_tempest"
|
||||||
- role: "system_crontab_coordination"
|
- role: "system_crontab_coordination"
|
||||||
|
|
|
@ -18,6 +18,12 @@
|
||||||
# Serial 1 avoids race conditions, and makes sures the repo_servers
|
# Serial 1 avoids race conditions, and makes sures the repo_servers
|
||||||
# are added in the same order as the repo_all inventory
|
# are added in the same order as the repo_all inventory
|
||||||
serial: 1
|
serial: 1
|
||||||
|
pre_tasks:
|
||||||
|
- name: End playbook
|
||||||
|
meta: end_play
|
||||||
|
when:
|
||||||
|
- (install_method | default('source')) != "source"
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
- name: Group repo servers by architecture and os version
|
- name: Group repo servers by architecture and os version
|
||||||
group_by:
|
group_by:
|
||||||
|
@ -32,6 +38,12 @@
|
||||||
# of each of these combinations when deploying.
|
# of each of these combinations when deploying.
|
||||||
- name: Prepare group of master repo servers
|
- name: Prepare group of master repo servers
|
||||||
hosts: localhost
|
hosts: localhost
|
||||||
|
pre_tasks:
|
||||||
|
- name: End playbook
|
||||||
|
meta: end_play
|
||||||
|
when:
|
||||||
|
- (install_method | default('source')) != "source"
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
- name: Prepare group of master repo servers
|
- name: Prepare group of master repo servers
|
||||||
add_host:
|
add_host:
|
||||||
|
@ -50,6 +62,10 @@
|
||||||
user: root
|
user: root
|
||||||
serial: 1
|
serial: 1
|
||||||
pre_tasks:
|
pre_tasks:
|
||||||
|
- name: End playbook
|
||||||
|
meta: end_play
|
||||||
|
when:
|
||||||
|
- (install_method | default('source')) != "source"
|
||||||
|
|
||||||
- include_tasks: common-tasks/set-pip-vars.yml
|
- include_tasks: common-tasks/set-pip-vars.yml
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,10 @@
|
||||||
gather_facts: "{{ osa_gather_facts | default(True) }}"
|
gather_facts: "{{ osa_gather_facts | default(True) }}"
|
||||||
user: root
|
user: root
|
||||||
pre_tasks:
|
pre_tasks:
|
||||||
|
- name: End playbook
|
||||||
|
meta: end_play
|
||||||
|
when:
|
||||||
|
- (install_method | default('source')) != "source"
|
||||||
|
|
||||||
- include_tasks: common-tasks/set-pip-vars.yml
|
- include_tasks: common-tasks/set-pip-vars.yml
|
||||||
|
|
||||||
|
|
|
@ -26,6 +26,11 @@
|
||||||
- always
|
- always
|
||||||
- repo-config
|
- repo-config
|
||||||
pre_tasks:
|
pre_tasks:
|
||||||
|
- name: End playbook
|
||||||
|
meta: end_play
|
||||||
|
when:
|
||||||
|
- (install_method | default('source')) != "source"
|
||||||
|
|
||||||
- include_tasks: common-tasks/package-cache-proxy.yml
|
- include_tasks: common-tasks/package-cache-proxy.yml
|
||||||
- include_tasks: common-tasks/set-pip-vars.yml
|
- include_tasks: common-tasks/set-pip-vars.yml
|
||||||
roles:
|
roles:
|
||||||
|
|
|
@ -15,13 +15,11 @@
|
||||||
|
|
||||||
- import_playbook: unbound-install.yml
|
- import_playbook: unbound-install.yml
|
||||||
- import_playbook: repo-install.yml
|
- import_playbook: repo-install.yml
|
||||||
when: install_method == "source"
|
|
||||||
- import_playbook: haproxy-install.yml
|
- import_playbook: haproxy-install.yml
|
||||||
# TODO(evrardjp): Remove the following when repo_build is done
|
# TODO(evrardjp): Remove the following when repo_build is done
|
||||||
# before lxc_container_create, and haproxy is moved with it as
|
# before lxc_container_create, and haproxy is moved with it as
|
||||||
# second step.
|
# second step.
|
||||||
- import_playbook: repo-use.yml
|
- import_playbook: repo-use.yml
|
||||||
when: install_method == "source"
|
|
||||||
- import_playbook: utility-install.yml
|
- import_playbook: utility-install.yml
|
||||||
- import_playbook: memcached-install.yml
|
- import_playbook: memcached-install.yml
|
||||||
- import_playbook: galera-install.yml
|
- import_playbook: galera-install.yml
|
||||||
|
|
|
@ -22,15 +22,8 @@
|
||||||
- import_playbook: os-heat-install.yml
|
- import_playbook: os-heat-install.yml
|
||||||
- import_playbook: os-horizon-install.yml
|
- import_playbook: os-horizon-install.yml
|
||||||
- import_playbook: os-designate-install.yml
|
- import_playbook: os-designate-install.yml
|
||||||
#NOTE(stevelle) Ensure Gnocchi identities exist before Swift
|
|
||||||
- import_playbook: os-gnocchi-install.yml
|
- import_playbook: os-gnocchi-install.yml
|
||||||
when:
|
|
||||||
- gnocchi_storage_driver is defined
|
|
||||||
- gnocchi_storage_driver == 'swift'
|
|
||||||
vars:
|
|
||||||
gnocchi_identity_only: True
|
|
||||||
- import_playbook: os-swift-install.yml
|
- import_playbook: os-swift-install.yml
|
||||||
- import_playbook: os-gnocchi-install.yml
|
|
||||||
- import_playbook: os-ceilometer-install.yml
|
- import_playbook: os-ceilometer-install.yml
|
||||||
- import_playbook: os-aodh-install.yml
|
- import_playbook: os-aodh-install.yml
|
||||||
- import_playbook: os-ironic-install.yml
|
- import_playbook: os-ironic-install.yml
|
||||||
|
@ -46,5 +39,3 @@
|
||||||
- import_playbook: ceph-rgw-install.yml
|
- import_playbook: ceph-rgw-install.yml
|
||||||
- import_playbook: os-congress-install.yml
|
- import_playbook: os-congress-install.yml
|
||||||
- import_playbook: os-tempest-install.yml
|
- import_playbook: os-tempest-install.yml
|
||||||
when: (tempest_install | default(False)) | bool or (tempest_run | default(False)) | bool
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue