Merge "Update kolla_internal_fqdn to database_address since it defined in all.yml"

ansible/roles/aodh/defaults/main.yml

@@ -46,7 +46,7 @@ aodh_services:
 ####################
 aodh_database_name: "aodh"
 aodh_database_user: "aodh"
-aodh_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+aodh_database_address: "{{ database_address }}:{{ database_port }}"
 
 ####################
 # Docker

ansible/roles/barbican/defaults/main.yml

@@ -36,7 +36,7 @@ barbican_services:
 ####################
 barbican_database_name: "barbican"
 barbican_database_user: "barbican"
-barbican_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+barbican_database_address: "{{ database_address }}:{{ database_port }}"
 
 
 ####################

ansible/roles/cinder/defaults/main.yml

@@ -79,7 +79,7 @@ cinder_backup_pool_pgp_num: "{{ ceph_pool_pgp_num }}"
 ####################
 cinder_database_name: "cinder"
 cinder_database_user: "cinder"
-cinder_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+cinder_database_address: "{{ database_address }}:{{ database_port }}"
 
 
 ####################

ansible/roles/cloudkitty/defaults/main.yml

@@ -27,7 +27,7 @@ cloudkitty_services:
 ####################
 cloudkitty_database_name: "cloudkitty"
 cloudkitty_database_user: "cloudkitty"
-cloudkitty_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+cloudkitty_database_address: "{{ database_address }}:{{ database_port }}"
 
 
 ####################

ansible/roles/congress/defaults/main.yml

@@ -36,7 +36,7 @@ congress_services:
 ####################
 congress_database_name: "congress"
 congress_database_user: "congress"
-congress_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+congress_database_address: "{{ database_address }}:{{ database_port }}"
 
 
 ####################

ansible/roles/designate/defaults/main.yml

@@ -73,11 +73,11 @@ designate_services:
 ####################
 designate_database_name: "designate"
 designate_database_user: "designate"
-designate_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+designate_database_address: "{{ database_address }}:{{ database_port }}"
 
 designate_pool_manager_database_name: "designate_pool_manager"
 designate_pool_manager_database_user: "designate_pool_manager"
-designate_pool_manager_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+designate_pool_manager_database_address: "{{ database_address }}:{{ database_port }}"
 
 
 ####################

ansible/roles/freezer/defaults/main.yml

@@ -19,7 +19,7 @@ freezer_services:
 ####################
 freezer_database_name: "freezer"
 freezer_database_user: "freezer"
-freezer_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+freezer_database_address: "{{ database_address }}:{{ database_port }}"
 
 
 ####################

ansible/roles/glance/defaults/main.yml

@@ -44,7 +44,7 @@ glance_pool_pgp_num: "{{ ceph_pool_pgp_num }}"
 ####################
 glance_database_name: "glance"
 glance_database_user: "glance"
-glance_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+glance_database_address: "{{ database_address }}:{{ database_port }}"
 
 
 ####################

ansible/roles/gnocchi/defaults/main.yml

@@ -54,7 +54,7 @@ gnocchi_pool_pgp_num: "{{ ceph_pool_pgp_num }}"
 ####################
 gnocchi_database_name: "gnocchi"
 gnocchi_database_user: "gnocchi"
-gnocchi_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+gnocchi_database_address: "{{ database_address }}:{{ database_port }}"
 
 
 ####################

ansible/roles/grafana/defaults/main.yml

@@ -18,7 +18,7 @@ grafana_services:
 ####################
 grafana_database_name: "grafana"
 grafana_database_user: "grafana"
-grafana_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+grafana_database_address: "{{ database_address }}:{{ database_port }}"
 
 ####################
 # Datasource

ansible/roles/heat/defaults/main.yml

@@ -38,7 +38,7 @@ heat_services:
 ####################
 heat_database_name: "heat"
 heat_database_user: "heat"
-heat_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+heat_database_address: "{{ database_address }}:{{ database_port }}"
 
 
 ####################

ansible/roles/horizon/defaults/main.yml

@@ -46,7 +46,7 @@ horizon_keystone_domain_choices:
 ####################
 horizon_database_name: "horizon"
 horizon_database_user: "horizon"
-horizon_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+horizon_database_address: "{{ database_address }}:{{ database_port }}"
 
 ####################
 # Docker

ansible/roles/ironic/defaults/main.yml

@@ -6,11 +6,11 @@ project_name: "ironic"
 ####################
 ironic_database_name: "ironic"
 ironic_database_user: "ironic"
-ironic_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+ironic_database_address: "{{ database_address }}:{{ database_port }}"
 
 ironic_inspector_database_name: "ironic_inspector"
 ironic_inspector_database_user: "ironic_inspector"
-ironic_inspector_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+ironic_inspector_database_address: "{{ database_address }}:{{ database_port }}"
 
 
 ####################

ansible/roles/karbor/defaults/main.yml

@@ -36,7 +36,7 @@ karbor_services:
 ####################
 karbor_database_name: "karbor"
 karbor_database_user: "karbor"
-karbor_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+karbor_database_address: "{{ database_address }}:{{ database_port }}"
 
 
 ####################

ansible/roles/keystone/defaults/main.yml

@@ -40,7 +40,7 @@ keystone_services:
 ####################
 keystone_database_name: "keystone"
 keystone_database_user: "keystone"
-keystone_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+keystone_database_address: "{{ database_address }}:{{ database_port }}"
 
 
 ####################

ansible/roles/magnum/defaults/main.yml

@@ -31,7 +31,7 @@ magnum_services:
 ####################
 magnum_database_name: "magnum"
 magnum_database_user: "magnum"
-magnum_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+magnum_database_address: "{{ database_address }}:{{ database_port }}"
 
 
 ####################

ansible/roles/manila/defaults/main.yml

@@ -49,7 +49,7 @@ manila_services:
 #####################
 manila_database_name: "manila"
 manila_database_user: "manila"
-manila_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+manila_database_address: "{{ database_address }}:{{ database_port }}"
 
 
 #####################

ansible/roles/mistral/defaults/main.yml

@@ -36,7 +36,7 @@ mistral_services:
 ####################
 mistral_database_name: "mistral"
 mistral_database_user: "mistral"
-mistral_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+mistral_database_address: "{{ database_address }}:{{ database_port }}"
 
 
 ####################

ansible/roles/murano/defaults/main.yml

@@ -6,7 +6,7 @@ project_name: "murano"
 ####################
 murano_database_name: "murano"
 murano_database_user: "murano"
-murano_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+murano_database_address: "{{ database_address }}:{{ database_port }}"
 
 
 ####################

ansible/roles/neutron/defaults/main.yml

@@ -154,7 +154,7 @@ neutron_services:
 ####################
 neutron_database_name: "neutron"
 neutron_database_user: "neutron"
-neutron_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+neutron_database_address: "{{ database_address }}:{{ database_port }}"
 
 
 ####################

ansible/roles/nova/defaults/main.yml

@@ -158,11 +158,11 @@ nova_hw_disk_discard: "unmap"
 ####################
 nova_database_name: "nova"
 nova_database_user: "nova"
-nova_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+nova_database_address: "{{ database_address }}:{{ database_port }}"
 
 nova_api_database_name: "nova_api"
 nova_api_database_user: "nova_api"
-nova_api_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+nova_api_database_address: "{{ database_address }}:{{ database_port }}"
 
 ####################
 # Docker

ansible/roles/octavia/defaults/main.yml

@@ -45,7 +45,7 @@ octavia_services:
 ####################
 octavia_database_name: "octavia"
 octavia_database_user: "octavia"
-octavia_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+octavia_database_address: "{{ database_address }}:{{ database_port }}"
 
 
 ####################

ansible/roles/panko/defaults/main.yml

@@ -20,7 +20,7 @@ panko_database_name: "panko"
 panko_database_user: "panko"
 panko_database_port: "{{ mongodb_port if panko_database_type == 'mongodb' else database_port }}"
 panko_database_mongodb_address: "{% for host in groups['mongodb'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ panko_database_port }}{% if not loop.last %},{% endif %}{% endfor %}"
-panko_database_mysql_address: "{{ kolla_internal_fqdn }}"
+panko_database_mysql_address: "{{ database_address }}:{{ database_port }}"
 
 ####################
 # Docker

ansible/roles/rally/defaults/main.yml

@@ -26,4 +26,4 @@ rally_image_full: "{{ rally_image }}:{{ rally_tag }}"
 ####################
 rally_database_name: "rally"
 rally_database_user: "rally"
-rally_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+rally_database_address: "{{ database_address }}:{{ database_port }}"

ansible/roles/sahara/defaults/main.yml

@@ -31,7 +31,7 @@ sahara_services:
 ####################
 sahara_database_name: "sahara"
 sahara_database_user: "sahara"
-sahara_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+sahara_database_address: "{{ database_address }}:{{ database_port }}"
 
 
 ####################

ansible/roles/senlin/defaults/main.yml

@@ -26,7 +26,7 @@ senlin_services:
 ####################
 senlin_database_name: "senlin"
 senlin_database_user: "senlin"
-senlin_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+senlin_database_address: "{{ database_address }}:{{ database_port }}"
 
 
 ####################

ansible/roles/solum/defaults/main.yml

@@ -45,7 +45,7 @@ solum_services:
 ####################
 solum_database_name: "solum"
 solum_database_user: "solum"
-solum_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+solum_database_address: "{{ database_address }}:{{ database_port }}"
 
 
 ####################

ansible/roles/tacker/defaults/main.yml

@@ -28,7 +28,7 @@ tacker_services:
 ####################
 tacker_database_name: "tacker"
 tacker_database_user: "tacker"
-tacker_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+tacker_database_address: "{{ database_address }}:{{ database_port }}"
 
 ########
 # Docker

ansible/roles/trove/defaults/main.yml

@@ -39,7 +39,7 @@ trove_services:
 ####################
 trove_database_name: "trove"
 trove_database_user: "trove"
-trove_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+trove_database_address: "{{ database_address }}:{{ database_port }}"
 
 
 ####################

ansible/roles/watcher/defaults/main.yml

@@ -36,7 +36,7 @@ watcher_services:
 ####################
 watcher_database_name: "watcher"
 watcher_database_user: "watcher"
-watcher_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+watcher_database_address: "{{ database_address }}:{{ database_port }}"
 
 
 ####################

ansible/roles/zun/defaults/main.yml

@@ -29,7 +29,7 @@ zun_services:
 ####################
 zun_database_name: "zun"
 zun_database_user: "zun"
-zun_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
+zun_database_address: "{{ database_address }}:{{ database_port }}"
 
 
 ####################