summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Razumovsky <prazumovsky@mirantis.com>2017-02-21 14:01:58 +0400
committerPeter Razumovsky <prazumovsky@mirantis.com>2017-02-21 14:04:07 +0400
commit6d351b3fc23e80d28c040eff40d3a1588024a192 (patch)
tree660bdc16df87aec0af0174a963ba5576eda4b2c2
parentd1bf98314167a6cee547a6724aa272c75e4c5c84 (diff)
Add fake pool for pool manager
Add fake pool using for pool manager, because current pool manager cannot found "default" pool and notify about error in logs. After adding fake pool as default, pool manager will start to work correctly, but all designate resources will stuck in PENDING status (due to this pool is fake). Change-Id: I48e3bb83ab06a9a6df93507188883b739b65fa47
Notes
Notes (review): Code-Review+2: Proskurin Kirill <kproskurin@mirantis.com> Code-Review+2: Yuriy Taraday <yorik.sar@gmail.com> Workflow+1: Yuriy Taraday <yorik.sar@gmail.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 22 Feb 2017 14:37:26 +0000 Reviewed-on: https://review.openstack.org/436393 Project: openstack/fuel-ccp-designate Branch: refs/heads/master
-rw-r--r--service/designate-pool-manager.yaml11
-rw-r--r--service/files/pools.yaml.j211
2 files changed, 22 insertions, 0 deletions
diff --git a/service/designate-pool-manager.yaml b/service/designate-pool-manager.yaml
index cbedc18..ff09e01 100644
--- a/service/designate-pool-manager.yaml
+++ b/service/designate-pool-manager.yaml
@@ -14,6 +14,14 @@ service:
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(service.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
18 dependencies:
19 - designate-pool-manager-db-create
20 files:
21 - pools
22 - designate-conf
23 type: single
24 command: designate-manage pool update --file /etc/designate/pools.yaml
17 - name: designate-pool-sync 25 - name: designate-pool-sync
18 dependencies: 26 dependencies:
19 - designate-pool-manager-db-create 27 - designate-pool-manager-db-create
@@ -32,3 +40,6 @@ files:
32 designate-conf: 40 designate-conf:
33 path: /etc/designate/designate.conf 41 path: /etc/designate/designate.conf
34 content: designate.conf.j2 42 content: designate.conf.j2
43 pools:
44 path: /etc/designate/pools.yaml
45 content: pools.yaml.j2
diff --git a/service/files/pools.yaml.j2 b/service/files/pools.yaml.j2
new file mode 100644
index 0000000..2500b99
--- /dev/null
+++ b/service/files/pools.yaml.j2
@@ -0,0 +1,11 @@
1- name: default
2 description: CCP Fake Pool
3 attributes: {}
4
5 ns_records:
6 - hostname: {{ network_topology['private']['address'] }}
7 priority: 1
8
9 targets:
10 - type: fake
11 description: Fake Backend \ No newline at end of file