Add galera port to nova config and database template

Code Issues Proposed changes

This always existed as a default value but was only used for service
setup, never in the runtime db connection url. Update the URL and
database connection template to include the port.
Change-Id: Ie404c117146c6bbd7eea79300f7c85515fa4e27d

This commit is contained in:

Jonathan Rosser

2021年05月17日 07:42:55 +00:00

committed by Dmitriy Rabotyagov

parent 4e88bdb7da

commit 1a358f5dc2

3 changed files with 5 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1
defaults/main.yml

View File

@@ -103,6 +103,7 @@ nova_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('/etc/ssl/certs/galera

nova_api_galera_address:"{{ nova_galera_address }}"

nova_api_galera_user:nova_api

nova_api_galera_database:nova_api

nova_api_galera_port:"{{ galera_port | default('3306') }}"

nova_api_db_max_overflow:10

nova_api_db_max_pool_size:120

nova_api_db_pool_timeout:30

4
tasks/nova_db_setup.yml

View File

@@ -69,7 +69,7 @@

command:>-

{{ nova_bin }}/nova-manage cell_v2 create_cell

--name {{ nova_cell1_name }}

--database_connection {scheme}://{username}:{password}@{hostname}/{path}?{query}

--database_connection {scheme}://{username}:{password}@{hostname}:{port}/{path}?{query}

--transport-url {scheme}://{username}:{password}@{hostname}:{port}//{path}?{query}

become:yes

become_user:"{{ nova_system_user_name }}"

@@ -91,7 +91,7 @@

command:>-

{{ nova_bin }}/nova-manage cell_v2 update_cell

--cell_uuid {{ _cell_uuid['stdout'].split()[3] }}

--database_connection {scheme}://{username}:{password}@{hostname}/{path}?{query}

--database_connection {scheme}://{username}:{password}@{hostname}:{port}/{path}?{query}

--transport-url {scheme}://{username}:{password}@{hostname}:{port}//{path}?{query}

become:yes

become_user:"{{ nova_system_user_name }}"

4
templates/nova.conf.j2

View File

@@ -185,7 +185,7 @@ memcache_secret_key = {{ memcached_encryption_key }}

{% if group_names | intersect(nova_services.keys() | difference('nova-compute') | map('extract', nova_services, 'group') | list) | count > 0 %}

[database]

connection = mysql+pymysql://{{ nova_galera_user }}:{{ nova_container_mysql_password }}@{{ nova_galera_address }}/{{ nova_galera_database }}?charset=utf8{% if nova_galera_use_ssl | bool %}&ssl_ca={{ nova_galera_ssl_ca_cert }}{% endif %}

connection = mysql+pymysql://{{ nova_galera_user }}:{{ nova_container_mysql_password }}@{{ nova_galera_address }}:{{ nova_galera_port }}/{{ nova_galera_database }}?charset=utf8{% if nova_galera_use_ssl | bool %}&ssl_ca={{ nova_galera_ssl_ca_cert }}{% endif %}

max_overflow = {{ nova_db_max_overflow }}

max_pool_size = {{ nova_db_max_pool_size }}

@@ -193,7 +193,7 @@ pool_timeout = {{ nova_db_pool_timeout }}

[api_database]

connection = mysql+pymysql://{{ nova_api_galera_user }}:{{ nova_api_container_mysql_password }}@{{ nova_api_galera_address }}/{{ nova_api_galera_database }}?charset=utf8{% if nova_galera_use_ssl | bool %}&ssl_ca={{ nova_galera_ssl_ca_cert }}{% endif %}

connection = mysql+pymysql://{{ nova_api_galera_user }}:{{ nova_api_container_mysql_password }}@{{ nova_api_galera_address }}:{{ nova_api_galera_port }}/{{ nova_api_galera_database }}?charset=utf8{% if nova_galera_use_ssl | bool %}&ssl_ca={{ nova_galera_ssl_ca_cert }}{% endif %}

max_overflow = {{ nova_api_db_max_overflow }}

max_pool_size = {{ nova_api_db_max_pool_size }}