From b63ecd7e3e1846ebe4c817fddc1974e25db51d14 Mon Sep 17 00:00:00 2001 From: caoyuan Date: Fri, 15 Dec 2017 19:58:53 +0800 Subject: [PATCH] Update kolla_internal_fqdn to database_address since it defined in all.yml through the database_address has beed defined in groups_vars/all.yml, we should better use it, this way, if we want to use external database, we just need to redefined in all.yml refer to https://github.com/openstack/kolla-ansible/blob/master/ansible/group_vars/all.yml#L83 Co-Authored-By: chenqiaomin Change-Id: Ie559301451954e16347ceaabf02f594c5c5cbe56 --- ansible/roles/aodh/defaults/main.yml | 2 +- ansible/roles/barbican/defaults/main.yml | 2 +- ansible/roles/cinder/defaults/main.yml | 2 +- ansible/roles/cloudkitty/defaults/main.yml | 2 +- ansible/roles/congress/defaults/main.yml | 2 +- ansible/roles/designate/defaults/main.yml | 4 ++-- ansible/roles/freezer/defaults/main.yml | 2 +- ansible/roles/glance/defaults/main.yml | 2 +- ansible/roles/gnocchi/defaults/main.yml | 2 +- ansible/roles/grafana/defaults/main.yml | 2 +- ansible/roles/heat/defaults/main.yml | 2 +- ansible/roles/horizon/defaults/main.yml | 2 +- ansible/roles/ironic/defaults/main.yml | 4 ++-- ansible/roles/karbor/defaults/main.yml | 2 +- ansible/roles/keystone/defaults/main.yml | 2 +- ansible/roles/magnum/defaults/main.yml | 2 +- ansible/roles/manila/defaults/main.yml | 2 +- ansible/roles/mistral/defaults/main.yml | 2 +- ansible/roles/murano/defaults/main.yml | 2 +- ansible/roles/neutron/defaults/main.yml | 2 +- ansible/roles/nova/defaults/main.yml | 4 ++-- ansible/roles/octavia/defaults/main.yml | 2 +- ansible/roles/panko/defaults/main.yml | 2 +- ansible/roles/rally/defaults/main.yml | 2 +- ansible/roles/sahara/defaults/main.yml | 2 +- ansible/roles/senlin/defaults/main.yml | 2 +- ansible/roles/solum/defaults/main.yml | 2 +- ansible/roles/tacker/defaults/main.yml | 2 +- ansible/roles/trove/defaults/main.yml | 2 +- ansible/roles/watcher/defaults/main.yml | 2 +- ansible/roles/zun/defaults/main.yml | 2 +- 31 files changed, 34 insertions(+), 34 deletions(-) diff --git a/ansible/roles/aodh/defaults/main.yml b/ansible/roles/aodh/defaults/main.yml index 605c2e69d1..cc16b2ab72 100644 --- a/ansible/roles/aodh/defaults/main.yml +++ b/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 diff --git a/ansible/roles/barbican/defaults/main.yml b/ansible/roles/barbican/defaults/main.yml index aac9e98cb3..d235d32ae1 100644 --- a/ansible/roles/barbican/defaults/main.yml +++ b/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 }}" #################### diff --git a/ansible/roles/cinder/defaults/main.yml b/ansible/roles/cinder/defaults/main.yml index 930beb1d7f..2696353483 100644 --- a/ansible/roles/cinder/defaults/main.yml +++ b/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 }}" #################### diff --git a/ansible/roles/cloudkitty/defaults/main.yml b/ansible/roles/cloudkitty/defaults/main.yml index 7e16536991..24b1b0e5b1 100644 --- a/ansible/roles/cloudkitty/defaults/main.yml +++ b/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 }}" #################### diff --git a/ansible/roles/congress/defaults/main.yml b/ansible/roles/congress/defaults/main.yml index 641450d312..e0747bca3c 100644 --- a/ansible/roles/congress/defaults/main.yml +++ b/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 }}" #################### diff --git a/ansible/roles/designate/defaults/main.yml b/ansible/roles/designate/defaults/main.yml index 0b84ccddcb..33398b39ad 100644 --- a/ansible/roles/designate/defaults/main.yml +++ b/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 }}" #################### diff --git a/ansible/roles/freezer/defaults/main.yml b/ansible/roles/freezer/defaults/main.yml index 469bba968c..002af65d8e 100644 --- a/ansible/roles/freezer/defaults/main.yml +++ b/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 }}" #################### diff --git a/ansible/roles/glance/defaults/main.yml b/ansible/roles/glance/defaults/main.yml index 94b80a3851..4fa18ec816 100644 --- a/ansible/roles/glance/defaults/main.yml +++ b/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 }}" #################### diff --git a/ansible/roles/gnocchi/defaults/main.yml b/ansible/roles/gnocchi/defaults/main.yml index dca69efa72..02d83b1c87 100644 --- a/ansible/roles/gnocchi/defaults/main.yml +++ b/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 }}" #################### diff --git a/ansible/roles/grafana/defaults/main.yml b/ansible/roles/grafana/defaults/main.yml index 67c9cab08e..4826612940 100644 --- a/ansible/roles/grafana/defaults/main.yml +++ b/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 diff --git a/ansible/roles/heat/defaults/main.yml b/ansible/roles/heat/defaults/main.yml index 7178655821..315fe2a10b 100644 --- a/ansible/roles/heat/defaults/main.yml +++ b/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 }}" #################### diff --git a/ansible/roles/horizon/defaults/main.yml b/ansible/roles/horizon/defaults/main.yml index e79332b2f8..e3a6b03b6d 100644 --- a/ansible/roles/horizon/defaults/main.yml +++ b/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 diff --git a/ansible/roles/ironic/defaults/main.yml b/ansible/roles/ironic/defaults/main.yml index 64cb7bdeab..3aae604132 100644 --- a/ansible/roles/ironic/defaults/main.yml +++ b/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 }}" #################### diff --git a/ansible/roles/karbor/defaults/main.yml b/ansible/roles/karbor/defaults/main.yml index 1190b15d71..fe98ff19a0 100644 --- a/ansible/roles/karbor/defaults/main.yml +++ b/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 }}" #################### diff --git a/ansible/roles/keystone/defaults/main.yml b/ansible/roles/keystone/defaults/main.yml index 5f4234829f..fae9122f78 100644 --- a/ansible/roles/keystone/defaults/main.yml +++ b/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 }}" #################### diff --git a/ansible/roles/magnum/defaults/main.yml b/ansible/roles/magnum/defaults/main.yml index 0b717aa884..d2a2e188bd 100644 --- a/ansible/roles/magnum/defaults/main.yml +++ b/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 }}" #################### diff --git a/ansible/roles/manila/defaults/main.yml b/ansible/roles/manila/defaults/main.yml index 5d6a851590..9978327c0f 100644 --- a/ansible/roles/manila/defaults/main.yml +++ b/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 }}" ##################### diff --git a/ansible/roles/mistral/defaults/main.yml b/ansible/roles/mistral/defaults/main.yml index f793a94ec7..be70331279 100644 --- a/ansible/roles/mistral/defaults/main.yml +++ b/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 }}" #################### diff --git a/ansible/roles/murano/defaults/main.yml b/ansible/roles/murano/defaults/main.yml index c7cba5c083..3f58e5a1c7 100644 --- a/ansible/roles/murano/defaults/main.yml +++ b/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 }}" #################### diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml index 09b1e048e5..7f3cad6fab 100644 --- a/ansible/roles/neutron/defaults/main.yml +++ b/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 }}" #################### diff --git a/ansible/roles/nova/defaults/main.yml b/ansible/roles/nova/defaults/main.yml index cc0b85001f..28701c42a4 100644 --- a/ansible/roles/nova/defaults/main.yml +++ b/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 diff --git a/ansible/roles/octavia/defaults/main.yml b/ansible/roles/octavia/defaults/main.yml index f534ee66ee..46c06fe605 100644 --- a/ansible/roles/octavia/defaults/main.yml +++ b/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 }}" #################### diff --git a/ansible/roles/panko/defaults/main.yml b/ansible/roles/panko/defaults/main.yml index f98cb67eb3..87ce0f6960 100644 --- a/ansible/roles/panko/defaults/main.yml +++ b/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 diff --git a/ansible/roles/rally/defaults/main.yml b/ansible/roles/rally/defaults/main.yml index ecba9ac67e..f3bf0d4a11 100644 --- a/ansible/roles/rally/defaults/main.yml +++ b/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 }}" diff --git a/ansible/roles/sahara/defaults/main.yml b/ansible/roles/sahara/defaults/main.yml index ea70fccad5..5bf9dcc974 100644 --- a/ansible/roles/sahara/defaults/main.yml +++ b/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 }}" #################### diff --git a/ansible/roles/senlin/defaults/main.yml b/ansible/roles/senlin/defaults/main.yml index 4a3c57f699..0c27dafd41 100644 --- a/ansible/roles/senlin/defaults/main.yml +++ b/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 }}" #################### diff --git a/ansible/roles/solum/defaults/main.yml b/ansible/roles/solum/defaults/main.yml index bd9d4cfec2..e720d4d1e3 100644 --- a/ansible/roles/solum/defaults/main.yml +++ b/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 }}" #################### diff --git a/ansible/roles/tacker/defaults/main.yml b/ansible/roles/tacker/defaults/main.yml index 742b736351..f12b40157e 100644 --- a/ansible/roles/tacker/defaults/main.yml +++ b/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 diff --git a/ansible/roles/trove/defaults/main.yml b/ansible/roles/trove/defaults/main.yml index c3221f30f2..a4fe29b429 100644 --- a/ansible/roles/trove/defaults/main.yml +++ b/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 }}" #################### diff --git a/ansible/roles/watcher/defaults/main.yml b/ansible/roles/watcher/defaults/main.yml index 53e9f108cf..a59d573fd2 100644 --- a/ansible/roles/watcher/defaults/main.yml +++ b/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 }}" #################### diff --git a/ansible/roles/zun/defaults/main.yml b/ansible/roles/zun/defaults/main.yml index 45acdcf505..5c962045fa 100644 --- a/ansible/roles/zun/defaults/main.yml +++ b/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 }}" ####################