diff options
author | Zuul <zuul@review.opendev.org> | 2021-03-04 23:47:19 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2021-03-04 23:47:19 +0000 |
commit | f101fab29540ba11481abbf9c7558f976d14b26b (patch) | |
tree | 6500f56de228060deca4c948a726a0b68dda4d2a /designate/manage/pool.py | |
parent | 39c2566fcd70f8e38ff898bb411aa6a63fe11a2c (diff) | |
parent | 953492904772933f5f8e265d1ae6cc1e6385fcc6 (diff) | |
download | designate-stable/train.tar.gz |
Merge "Update zones masters using pool target masters." into stable/trainstable/train
Diffstat (limited to 'designate/manage/pool.py')
-rw-r--r-- | designate/manage/pool.py | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/designate/manage/pool.py b/designate/manage/pool.py index 40d4aab3..7d11777c 100644 --- a/designate/manage/pool.py +++ b/designate/manage/pool.py @@ -23,6 +23,7 @@ import oslo_messaging as messaging from designate import exceptions from designate import rpc from designate import objects +from designate import policy from designate.central import rpcapi as central_rpcapi from designate.manage import base from designate.objects.adapters import DesignateAdapter @@ -43,6 +44,30 @@ class PoolCommands(base.Commands): rpc.init(cfg.CONF) self.central_api = central_rpcapi.CentralAPI() + def _update_zones(self, pool): + LOG.info("Updating zone masters for pool: {}".format(pool.id)) + + def __get_masters_from_pool(pool): + masters = [] + for target in pool.targets: + for master in target.get("masters", []): + masters.append({'host': master['host'], + 'port': master['port']}) + return masters + + policy.init() + + self.context.all_tenants = True + zones = self.central_api.find_zones( + self.context, + criterion={'pool_id': pool.id}) + + for zone in zones: + zone.masters = objects.ZoneMasterList().from_list( + __get_masters_from_pool(pool)) + self.central_api.update_zone(self.context, + zone) + @base.args('--file', help='The path to the file the yaml output should be ' 'written to', default='/etc/designate/pools.yaml') @@ -138,6 +163,9 @@ class PoolCommands(base.Commands): output_msg.append("Update Pool: %s" % pool) else: pool = self.central_api.update_pool(self.context, pool) + # Bug: Changes in the pool targets should trigger a + # zone masters update LP: #1879798. + self._update_zones(pool) except exceptions.PoolNotFound: pool = DesignateAdapter.parse('YAML', xpool, objects.Pool()) |