From d62e927dacfa42822296e7a0720cb85019c08a9b Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Mon, 8 Apr 2019 17:51:07 +0100 Subject: [PATCH] During deploy, always sync DB A common class of problems goes like this: * kolla-ansible deploy * Hit a problem, often in ansible/roles/*/tasks/bootstrap.yml * Re-run kolla-ansible deploy * Service fails to start This happens because the DB is created during the first run, but for some reason we fail before performing the DB sync. This means that on the second run we don't include ansible/roles/*/tasks/bootstrap_service.yml because the DB already exists, and therefore still don't perform the DB sync. However this time, the command may complete without apparent error. We should be less careful about when we perform the DB sync, and do it whenever it is necessary. There is an argument for not doing the sync during a 'reconfigure' command, although we will not change that here. This change only always performs the DB sync during 'deploy' and 'reconfigure' commands. Change-Id: I82d30f3fcf325a3fdff3c59f19a1f88055b566cc Closes-Bug: #1823766 Closes-Bug: #1797814 (cherry picked from commit d5e5e885d11e338806425839a361d868c1f4ff10) --- ansible/roles/aodh/tasks/bootstrap.yml | 2 -- ansible/roles/barbican/tasks/bootstrap.yml | 2 -- ansible/roles/blazar/tasks/bootstrap.yml | 2 -- ansible/roles/cinder/tasks/bootstrap.yml | 2 -- ansible/roles/cloudkitty/tasks/bootstrap.yml | 2 -- ansible/roles/congress/tasks/bootstrap.yml | 2 -- ansible/roles/cyborg/tasks/bootstrap.yml | 2 -- ansible/roles/designate/tasks/bootstrap.yml | 2 -- ansible/roles/glance/tasks/bootstrap.yml | 2 -- ansible/roles/gnocchi/tasks/bootstrap.yml | 2 -- ansible/roles/heat/tasks/bootstrap.yml | 2 -- ansible/roles/horizon/tasks/bootstrap.yml | 2 -- ansible/roles/ironic/tasks/bootstrap.yml | 2 -- ansible/roles/karbor/tasks/bootstrap.yml | 2 -- ansible/roles/keystone/tasks/bootstrap.yml | 2 -- ansible/roles/magnum/tasks/bootstrap.yml | 2 -- ansible/roles/manila/tasks/bootstrap.yml | 2 -- ansible/roles/mistral/tasks/bootstrap.yml | 2 -- ansible/roles/monasca/tasks/bootstrap.yml | 3 --- ansible/roles/murano/tasks/bootstrap.yml | 2 -- ansible/roles/neutron/tasks/bootstrap.yml | 2 -- ansible/roles/nova/tasks/bootstrap.yml | 3 --- ansible/roles/octavia/tasks/bootstrap.yml | 2 -- ansible/roles/panko/tasks/bootstrap.yml | 4 ---- ansible/roles/placement/tasks/bootstrap.yml | 3 --- ansible/roles/rally/tasks/bootstrap.yml | 2 -- ansible/roles/sahara/tasks/bootstrap.yml | 2 -- ansible/roles/senlin/tasks/bootstrap.yml | 2 -- ansible/roles/solum/tasks/bootstrap.yml | 2 -- ansible/roles/tacker/tasks/bootstrap.yml | 2 -- ansible/roles/trove/tasks/bootstrap.yml | 2 -- ansible/roles/vitrage/tasks/bootstrap.yml | 2 -- ansible/roles/watcher/tasks/bootstrap.yml | 2 -- ansible/roles/zun/tasks/bootstrap.yml | 2 -- 34 files changed, 73 deletions(-) diff --git a/ansible/roles/aodh/tasks/bootstrap.yml b/ansible/roles/aodh/tasks/bootstrap.yml index 8e1f08c082..a168dfd8a5 100644 --- a/ansible/roles/aodh/tasks/bootstrap.yml +++ b/ansible/roles/aodh/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ aodh_database_name }}" - register: database run_once: True delegate_to: "{{ groups['aodh-api'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/barbican/tasks/bootstrap.yml b/ansible/roles/barbican/tasks/bootstrap.yml index 2699909829..2e1604c08c 100644 --- a/ansible/roles/barbican/tasks/bootstrap.yml +++ b/ansible/roles/barbican/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ barbican_database_name }}" - register: database run_once: True delegate_to: "{{ groups['barbican-api'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/blazar/tasks/bootstrap.yml b/ansible/roles/blazar/tasks/bootstrap.yml index cdec54a2f8..593ec8e481 100644 --- a/ansible/roles/blazar/tasks/bootstrap.yml +++ b/ansible/roles/blazar/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ blazar_database_name }}" - register: database run_once: True delegate_to: "{{ groups['blazar-api'][0] }}" @@ -55,4 +54,3 @@ delegate_to: "{{ groups['blazar-api'][0] }}" - include_tasks: bootstrap_service.yml - when: database.changed diff --git a/ansible/roles/cinder/tasks/bootstrap.yml b/ansible/roles/cinder/tasks/bootstrap.yml index 1b62ec6ddd..c18a53c6a9 100644 --- a/ansible/roles/cinder/tasks/bootstrap.yml +++ b/ansible/roles/cinder/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ cinder_database_name }}" - register: database run_once: True delegate_to: "{{ groups['cinder-api'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/cloudkitty/tasks/bootstrap.yml b/ansible/roles/cloudkitty/tasks/bootstrap.yml index 1da6991465..6ed5f60919 100644 --- a/ansible/roles/cloudkitty/tasks/bootstrap.yml +++ b/ansible/roles/cloudkitty/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ cloudkitty_database_name }}" - register: database run_once: True delegate_to: "{{ groups['cloudkitty-api'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/congress/tasks/bootstrap.yml b/ansible/roles/congress/tasks/bootstrap.yml index 9ddabffd43..ab5e93c947 100644 --- a/ansible/roles/congress/tasks/bootstrap.yml +++ b/ansible/roles/congress/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ congress_database_name }}" - register: database run_once: True delegate_to: "{{ groups['congress-api'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/cyborg/tasks/bootstrap.yml b/ansible/roles/cyborg/tasks/bootstrap.yml index 83ca49f712..5d4c669220 100644 --- a/ansible/roles/cyborg/tasks/bootstrap.yml +++ b/ansible/roles/cyborg/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ cyborg_database_name }}" - register: database run_once: True delegate_to: "{{ groups['cyborg-api'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/designate/tasks/bootstrap.yml b/ansible/roles/designate/tasks/bootstrap.yml index 5c478dab4c..eff4c58262 100644 --- a/ansible/roles/designate/tasks/bootstrap.yml +++ b/ansible/roles/designate/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ item }}" - register: database run_once: True delegate_to: "{{ groups['designate-central'][0] }}" with_items: @@ -46,4 +45,3 @@ no_log: true - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/glance/tasks/bootstrap.yml b/ansible/roles/glance/tasks/bootstrap.yml index 5a55857bf9..e010875020 100644 --- a/ansible/roles/glance/tasks/bootstrap.yml +++ b/ansible/roles/glance/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ glance_database_name }}" - register: database run_once: True delegate_to: "{{ groups['glance-api'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/gnocchi/tasks/bootstrap.yml b/ansible/roles/gnocchi/tasks/bootstrap.yml index dcc6054448..b6f6304ca2 100644 --- a/ansible/roles/gnocchi/tasks/bootstrap.yml +++ b/ansible/roles/gnocchi/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ gnocchi_database_name }}" - register: database run_once: True delegate_to: "{{ groups['gnocchi-api'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/heat/tasks/bootstrap.yml b/ansible/roles/heat/tasks/bootstrap.yml index c2fb68ff35..554a166041 100644 --- a/ansible/roles/heat/tasks/bootstrap.yml +++ b/ansible/roles/heat/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ heat_database_name }}" - register: database run_once: True delegate_to: "{{ groups['heat-api'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/horizon/tasks/bootstrap.yml b/ansible/roles/horizon/tasks/bootstrap.yml index 37df28d150..2d3bf34812 100644 --- a/ansible/roles/horizon/tasks/bootstrap.yml +++ b/ansible/roles/horizon/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ horizon_database_name }}" - register: database run_once: True delegate_to: "{{ groups['horizon'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/ironic/tasks/bootstrap.yml b/ansible/roles/ironic/tasks/bootstrap.yml index cae3752ee2..3ed859d657 100644 --- a/ansible/roles/ironic/tasks/bootstrap.yml +++ b/ansible/roles/ironic/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ item.database_name }}" - register: database run_once: True delegate_to: "{{ groups[item.group][0] }}" with_items: @@ -53,7 +52,6 @@ - inventory_hostname in groups[item.group] - include_tasks: bootstrap_service.yml - when: database.changed - name: Running Ironic-PXE bootstrap container vars: diff --git a/ansible/roles/karbor/tasks/bootstrap.yml b/ansible/roles/karbor/tasks/bootstrap.yml index 0b362e3310..fdfbb80935 100644 --- a/ansible/roles/karbor/tasks/bootstrap.yml +++ b/ansible/roles/karbor/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ karbor_database_name }}" - register: database run_once: True delegate_to: "{{ groups['karbor-api'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/keystone/tasks/bootstrap.yml b/ansible/roles/keystone/tasks/bootstrap.yml index a9eca9cc07..7494119815 100644 --- a/ansible/roles/keystone/tasks/bootstrap.yml +++ b/ansible/roles/keystone/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ keystone_database_name }}" - register: database run_once: True delegate_to: "{{ groups['keystone'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/magnum/tasks/bootstrap.yml b/ansible/roles/magnum/tasks/bootstrap.yml index c192702222..e0bdf3b25a 100644 --- a/ansible/roles/magnum/tasks/bootstrap.yml +++ b/ansible/roles/magnum/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ magnum_database_name }}" - register: database run_once: True delegate_to: "{{ groups['magnum-api'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/manila/tasks/bootstrap.yml b/ansible/roles/manila/tasks/bootstrap.yml index 2a855bde9e..0869b495ed 100644 --- a/ansible/roles/manila/tasks/bootstrap.yml +++ b/ansible/roles/manila/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ manila_database_name }}" - register: database run_once: True delegate_to: "{{ groups['manila-api'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/mistral/tasks/bootstrap.yml b/ansible/roles/mistral/tasks/bootstrap.yml index 59160f3af8..c401e8475e 100644 --- a/ansible/roles/mistral/tasks/bootstrap.yml +++ b/ansible/roles/mistral/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ mistral_database_name }}" - register: database run_once: True delegate_to: "{{ groups['mistral-api'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/monasca/tasks/bootstrap.yml b/ansible/roles/monasca/tasks/bootstrap.yml index a07b6efb6f..f6cae3556b 100644 --- a/ansible/roles/monasca/tasks/bootstrap.yml +++ b/ansible/roles/monasca/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ item }}" - register: database run_once: True delegate_to: "{{ groups['monasca-api'][0] }}" with_items: @@ -36,10 +35,8 @@ delegate_to: "{{ groups['monasca-api'][0] }}" when: - not use_preconfigured_databases | bool - - database.changed - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool # NOTE(dszumski): Monasca is not yet compatible with InfluxDB > 1.1.10, which means # that the official Ansible modules for managing InfluxDB don't work [1]. diff --git a/ansible/roles/murano/tasks/bootstrap.yml b/ansible/roles/murano/tasks/bootstrap.yml index 33d63f19fa..0eb0f16d5d 100644 --- a/ansible/roles/murano/tasks/bootstrap.yml +++ b/ansible/roles/murano/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ murano_database_name }}" - register: database run_once: True delegate_to: "{{ groups['murano-api'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/neutron/tasks/bootstrap.yml b/ansible/roles/neutron/tasks/bootstrap.yml index e9c43c7e9d..9fda22538d 100644 --- a/ansible/roles/neutron/tasks/bootstrap.yml +++ b/ansible/roles/neutron/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ neutron_database_name }}" - register: database run_once: True delegate_to: "{{ groups['neutron-server'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/nova/tasks/bootstrap.yml b/ansible/roles/nova/tasks/bootstrap.yml index ec991c05f7..42fd080f6c 100644 --- a/ansible/roles/nova/tasks/bootstrap.yml +++ b/ansible/roles/nova/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ item }}" - register: database run_once: True delegate_to: "{{ groups['nova-api'][0] }}" with_items: @@ -48,9 +47,7 @@ run_once: True delegate_to: "{{ groups['nova-api'][0] }}" when: - - database.changed - not use_preconfigured_databases | bool no_log: true - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/octavia/tasks/bootstrap.yml b/ansible/roles/octavia/tasks/bootstrap.yml index ce44d80789..52fb37a2a2 100644 --- a/ansible/roles/octavia/tasks/bootstrap.yml +++ b/ansible/roles/octavia/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ octavia_database_name }}" - register: database run_once: True delegate_to: "{{ groups['octavia-api'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/panko/tasks/bootstrap.yml b/ansible/roles/panko/tasks/bootstrap.yml index 8531ec901c..76d1453399 100644 --- a/ansible/roles/panko/tasks/bootstrap.yml +++ b/ansible/roles/panko/tasks/bootstrap.yml @@ -20,7 +20,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ panko_database_name }}" - register: mysql_panko_database run_once: True delegate_to: "{{ groups['panko-api'][0] }}" when: @@ -48,6 +47,3 @@ - panko_database_type == "mysql" - include_tasks: bootstrap_service.yml - when: (panko_database_type == "mongodb" and mongodb_panko_database.changed) - or (panko_database_type == "mysql" and mysql_panko_database.changed) - or use_preconfigured_databases | bool diff --git a/ansible/roles/placement/tasks/bootstrap.yml b/ansible/roles/placement/tasks/bootstrap.yml index 0d35ab98ef..bacfd8b8be 100644 --- a/ansible/roles/placement/tasks/bootstrap.yml +++ b/ansible/roles/placement/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ placement_database_name }}" - register: database run_once: True delegate_to: "{{ groups['placement-api'][0] }}" when: @@ -32,7 +31,6 @@ run_once: True delegate_to: "{{ groups['placement-api'][0] }}" when: - - database.changed - not use_preconfigured_databases | bool # TODO(egonzalez): Remove this task once stein is release as will not be required to migrate data. @@ -64,4 +62,3 @@ - kolla_action == "upgrade" - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/rally/tasks/bootstrap.yml b/ansible/roles/rally/tasks/bootstrap.yml index ef80807cd0..31a496ba54 100644 --- a/ansible/roles/rally/tasks/bootstrap.yml +++ b/ansible/roles/rally/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ rally_database_name }}" - register: database run_once: True delegate_to: "{{ groups['rally'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/sahara/tasks/bootstrap.yml b/ansible/roles/sahara/tasks/bootstrap.yml index 0059264118..a94c5adf76 100644 --- a/ansible/roles/sahara/tasks/bootstrap.yml +++ b/ansible/roles/sahara/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ sahara_database_name }}" - register: database run_once: True delegate_to: "{{ groups['sahara-api'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/senlin/tasks/bootstrap.yml b/ansible/roles/senlin/tasks/bootstrap.yml index 56414e26fd..ef3715480b 100644 --- a/ansible/roles/senlin/tasks/bootstrap.yml +++ b/ansible/roles/senlin/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ senlin_database_name }}" - register: database run_once: True delegate_to: "{{ groups['senlin-api'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/solum/tasks/bootstrap.yml b/ansible/roles/solum/tasks/bootstrap.yml index 083f108b23..eeeb7a6a96 100644 --- a/ansible/roles/solum/tasks/bootstrap.yml +++ b/ansible/roles/solum/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ solum_database_name }}" - register: database run_once: True delegate_to: "{{ groups['solum-api'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/tacker/tasks/bootstrap.yml b/ansible/roles/tacker/tasks/bootstrap.yml index 03907742c3..89e0e49d83 100644 --- a/ansible/roles/tacker/tasks/bootstrap.yml +++ b/ansible/roles/tacker/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ tacker_database_name }}" - register: database run_once: True delegate_to: "{{ groups['tacker-server'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/trove/tasks/bootstrap.yml b/ansible/roles/trove/tasks/bootstrap.yml index 3b5bd45fe3..0194a28d3a 100644 --- a/ansible/roles/trove/tasks/bootstrap.yml +++ b/ansible/roles/trove/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ trove_database_name }}" - register: database run_once: True delegate_to: "{{ groups['trove-api'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/vitrage/tasks/bootstrap.yml b/ansible/roles/vitrage/tasks/bootstrap.yml index a6951fbdcd..2bc3f7fa97 100644 --- a/ansible/roles/vitrage/tasks/bootstrap.yml +++ b/ansible/roles/vitrage/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ vitrage_database_name }}" - register: database run_once: True delegate_to: "{{ groups['vitrage-api'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/watcher/tasks/bootstrap.yml b/ansible/roles/watcher/tasks/bootstrap.yml index 9d3c540a02..30337a0221 100644 --- a/ansible/roles/watcher/tasks/bootstrap.yml +++ b/ansible/roles/watcher/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ watcher_database_name }}" - register: database run_once: True delegate_to: "{{ groups['watcher-api'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/zun/tasks/bootstrap.yml b/ansible/roles/zun/tasks/bootstrap.yml index d65daa4b64..b0fcf0a99c 100644 --- a/ansible/roles/zun/tasks/bootstrap.yml +++ b/ansible/roles/zun/tasks/bootstrap.yml @@ -9,7 +9,6 @@ login_user: "{{ database_user }}" login_password: "{{ database_password }}" name: "{{ zun_database_name }}" - register: database run_once: True delegate_to: "{{ groups['zun-api'][0] }}" when: @@ -35,4 +34,3 @@ - not use_preconfigured_databases | bool - include_tasks: bootstrap_service.yml - when: database.changed or use_preconfigured_databases | bool