Ensure the correct charm class is chosen

Fix charm class selection and ensure that pools.yaml dopes not
render with empty values for NS records

Change-Id: Ib642f49bc031ad8bacd4863426e87f4559e39f5f
Closes-Bug: #1754148
This commit is contained in:
Liam Young 2018-03-07 23:04:08 +00:00
parent 682789777e
commit f77343de08
2 changed files with 4 additions and 3 deletions

View File

@ -37,6 +37,7 @@ RNDC_KEY_CONF = DESIGNATE_DIR + '/rndc.key'
NOVA_SINK_FILE = DESIGNATE_DIR + '/conf.d/nova_sink.cfg'
NEUTRON_SINK_FILE = DESIGNATE_DIR + '/conf.d/neutron_sink.cfg'
RC_FILE = '/root/novarc'
openstack_charm.use_defaults('charm.default-select-release')
class DesignateDBAdapter(openstack_adapters.DatabaseRelationAdapter):
@ -581,8 +582,8 @@ class DesignateCharm(openstack_charm.HAOpenStackCharm):
class DesignateCharmQueens(DesignateCharm):
# This charms support Ocata and onward
release = 'ocata'
# This charms support Queens and onward
release = 'queens'
services = ['designate-mdns', 'designate-zone-manager',
'designate-agent', 'designate-pool-manager',

View File

@ -2,8 +2,8 @@
name: default
description: Pool genergated by Juju
ns_records:
{% if options.ns_records %}
ns_records:
{% for record in options.ns_records %}
- hostname: {{ record }}
priority: 10