Merge "During deploy, always sync DB" into stable/stein

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

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

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

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

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

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

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

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

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

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

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

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

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:

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

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

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

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

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

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].

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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