openstack
/
kolla-ansible
Code Issues Proposed changes

Merge "Support using external DBs in Monasca"

This commit is contained in:
Zuul 2018-11-07 15:54:28 +00:00 committed by Gerrit Code Review
parent f9ac54d9ad 6cbb5cbdb4
commit dc8f284ba9
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/roles/monasca/defaults/main.yml
View File

@ -144,7 +144,8 @@ monasca_services:
####################
monasca_database_name: "monasca"
monasca_database_user: "{% if use_preconfigured_databases | bool and use_common_mariadb_user | bool %}{{ database_user }}{% else %}monasca{% endif %}"
monasca_database_address: "{{ database_address }}:{{ database_port }}"
monasca_database_address: "{{ database_address }}"
monasca_database_port: "{{ database_port }}"
monasca_influxdb_name: "monasca"
monasca_influxdb_address: "{{ kolla_internal_fqdn }}"

8
ansible/roles/monasca/tasks/bootstrap.yml
View File

@ -3,8 +3,8 @@
kolla_toolbox:
module_name: mysql_db
module_args:
login_host: "{{ database_address }}"
login_port: "{{ database_port }}"
login_host: "{{ monasca_database_address }}"
login_port: "{{ monasca_database_port }}"
login_user: "{{ database_user }}"
login_password: "{{ database_password }}"
name: "{{ monasca_database_name }}"
@ -18,8 +18,8 @@
kolla_toolbox:
module_name: mysql_user
module_args:
login_host: "{{ database_address }}"
login_port: "{{ database_port }}"
login_host: "{{ monasca_database_address }}"
login_port: "{{ monasca_database_port }}"
login_user: "{{ database_user }}"
login_password: "{{ database_password }}"
name: "{{ monasca_database_user }}"

2
ansible/roles/monasca/templates/monasca-api/api.conf.j2
View File

@ -6,7 +6,7 @@ region = {{ openstack_region_name }}
[database]
database = {{ monasca_database_name }}
connection = mysql+pymysql://{{ monasca_database_user }}:{{ monasca_database_password }}@{{ monasca_database_address }}/{{ monasca_database_name }}
connection = mysql+pymysql://{{ monasca_database_user }}:{{ monasca_database_password }}@{{ monasca_database_address }}:{{ monasca_database_port }}/{{ monasca_database_name }}
[influxdb]
database_name = {{ monasca_influxdb_name }}

4
ansible/roles/monasca/templates/monasca-notification/notification.conf.j2
View File

@ -11,8 +11,8 @@ notification_retry_topic = {{ monasca_alarm_notifications_retry_topic }}
periodic = {{ monasca_periodic_notifications_period }}:{{ monasca_periodic_notifications_topic }}
[mysql]
host = {{ database_address }}
port = {{ database_port }}
host = {{ monasca_database_address }}
port = {{ monasca_database_port }}
user = {{ monasca_database_user }}
passwd = {{ monasca_database_password }}
db = {{ monasca_database_name }}

6
ansible/roles/monasca/templates/monasca-thresh/thresh-config.yml.j2
View File

@ -109,7 +109,7 @@ sporadicMetricNamespaces:
database:
driverClass: org.drizzle.jdbc.DrizzleDriver
url: "jdbc:drizzle://{{ monasca_database_address }}/{{ monasca_database_name }}"
url: "jdbc:drizzle://{{ monasca_database_address }}:{{ monasca_database_port }}/{{ monasca_database_name }}"
user: "{{ monasca_database_user }}"
password: "{{ monasca_database_password }}"
properties:
@ -126,7 +126,7 @@ database:
# hibernate provider class
providerClass: com.zaxxer.hikari.hibernate.HikariConnectionProvider
databaseName: "{{ monasca_database_name }}"
serverName: "{{ database_address }}"
portNumber: "{{ database_port }}"
serverName: "{{ monasca_database_address }}"
portNumber: "{{ monasca_database_port }}"
# hibernate auto configuration parameter
autoConfig: validate