summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Pavlov <apavlov@mirantis.com>2017-02-27 09:55:20 +0000
committerAndrey Pavlov <apavlov@mirantis.com>2017-02-28 11:11:00 +0000
commit935a186bbc800b069b9c8d803280c4100da6deca (patch)
tree301624862a69ef36af8509d6290ac81ae7834142
parent6d351b3fc23e80d28c040eff40d3a1588024a192 (diff)
Adjust to per-service configuration
Notes
Notes (review): Code-Review+2: Sergey Reshetnyak <sreshetniak@mirantis.com> Code-Review+2: Proskurin Kirill <kproskurin@mirantis.com> Workflow+1: Proskurin Kirill <kproskurin@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 03 Mar 2017 13:54:46 +0000 Reviewed-on: https://review.openstack.org/438390 Project: openstack/fuel-ccp-designate Branch: refs/heads/master
-rw-r--r--service/designate-api.yaml6
-rw-r--r--service/designate-pool-manager.yaml4
-rw-r--r--service/files/designate.conf.j24
3 files changed, 7 insertions, 7 deletions
diff --git a/service/designate-api.yaml b/service/designate-api.yaml
index 8e00bcf..4c43b50 100644
--- a/service/designate-api.yaml
+++ b/service/designate-api.yaml
@@ -9,10 +9,10 @@ service:
9 pre: 9 pre:
10 - name: designate-main-db-create 10 - name: designate-main-db-create
11 dependencies: 11 dependencies:
12 - {{ service.database }} 12 - database
13 type: single 13 type: single
14 command: 14 command:
15 mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database {{ designate.db.name.main_database }}; 15 mysql -u root -p{{ db.root_password }} -h {{ address('database') }} -e "create database {{ designate.db.name.main_database }};
16 create user '{{ designate.db.username }}'@'%' identified by '{{ designate.db.password }}' 16 create user '{{ designate.db.username }}'@'%' identified by '{{ designate.db.password }}'
17 {% if db.tls.enabled %} require ssl {% endif %}; 17 {% if db.tls.enabled %} require ssl {% endif %};
18 grant all privileges on {{ designate.db.name.main_database }}.* to '{{ designate.db.username }}'@'%' identified by '{{ designate.db.password }}' 18 grant all privileges on {{ designate.db.name.main_database }}.* to '{{ designate.db.username }}'@'%' identified by '{{ designate.db.password }}'
@@ -56,7 +56,7 @@ service:
56 command: openstack endpoint create --region RegionOne dns admin {{ address('designate-api', designate.api_port, with_scheme=True) }} 56 command: openstack endpoint create --region RegionOne dns admin {{ address('designate-api', designate.api_port, with_scheme=True) }}
57 daemon: 57 daemon:
58 dependencies: 58 dependencies:
59 - "{{ messaging.dependencies[messaging.backend.rpc] }}" 59 - rpc
60 files: 60 files:
61 - designate-conf 61 - designate-conf
62 - api-paste 62 - api-paste
diff --git a/service/designate-pool-manager.yaml b/service/designate-pool-manager.yaml
index ff09e01..bffd34a 100644
--- a/service/designate-pool-manager.yaml
+++ b/service/designate-pool-manager.yaml
@@ -7,11 +7,11 @@ service:
7 pre: 7 pre:
8 - name: designate-pool-manager-db-create 8 - name: designate-pool-manager-db-create
9 dependencies: 9 dependencies:
10 - {{ service.database }} 10 - database
11 - designate-main-db-create 11 - designate-main-db-create
12 type: single 12 type: single
13 command: 13 command:
14 mysql -u root -p{{ db.root_password }} -h {{ address(service.database) }} -e "create database {{ designate.db.name.pool_manager }}; 14 mysql -u root -p{{ db.root_password }} -h {{ address('database') }} -e "create database {{ designate.db.name.pool_manager }};
15 grant all privileges on {{ designate.db.name.pool_manager }}.* to '{{ designate.db.username }}'@'%' identified by '{{ designate.db.password }}' 15 grant all privileges on {{ designate.db.name.pool_manager }}.* to '{{ designate.db.username }}'@'%' identified by '{{ designate.db.password }}'
16 {% if db.tls.enabled %} require ssl {% endif %};" 16 {% if db.tls.enabled %} require ssl {% endif %};"
17 - name: designate-pool-update 17 - name: designate-pool-update
diff --git a/service/files/designate.conf.j2 b/service/files/designate.conf.j2
index 89e81c9..16e28c4 100644
--- a/service/files/designate.conf.j2
+++ b/service/files/designate.conf.j2
@@ -116,7 +116,7 @@ pool_id = {{ designate.pool.pool_id }}
116# SQLAlchemy Pool Manager Cache 116# SQLAlchemy Pool Manager Cache
117#------------------------------ 117#------------------------------
118[pool_manager_cache:sqlalchemy] 118[pool_manager_cache:sqlalchemy]
119connection = mysql+pymysql://{{ designate.db.username }}:{{ designate.db.password }}@{{ address(service.database) }}/{{ designate.db.name.pool_manager }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %} 119connection = mysql+pymysql://{{ designate.db.username }}:{{ designate.db.password }}@{{ address("database") }}/{{ designate.db.name.pool_manager }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
120 120
121######################## 121########################
122## Storage Configuration 122## Storage Configuration
@@ -125,7 +125,7 @@ connection = mysql+pymysql://{{ designate.db.username }}:{{ designate.db.passwor
125# SQLAlchemy Storage 125# SQLAlchemy Storage
126#------------------- 126#-------------------
127[storage:sqlalchemy] 127[storage:sqlalchemy]
128connection = mysql+pymysql://{{ designate.db.username }}:{{ designate.db.password }}@{{ address(service.database) }}/{{ designate.db.name.main_database }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %} 128connection = mysql+pymysql://{{ designate.db.username }}:{{ designate.db.password }}@{{ address("database") }}/{{ designate.db.name.main_database }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
129 129
130######################## 130########################
131## Handler Configuration 131## Handler Configuration