From 0ac8aefbb8883d314245d1535f0953015678e2fa Mon Sep 17 00:00:00 2001 From: Jose Phillips Date: Thu, 2 Sep 2021 01:24:49 -0500 Subject: [PATCH] Allow Set managed_resource_email on designate config. With this patch managed_resource_email can be set via charm with juju config managed-resource-email = email@domain.com functional for auto generated SOA records. that came from Floating IP. Closes-Bug: #1940864 Change-Id: I9f55564316fdb559481909dd7b196ef8fd9fe612 --- src/config.yaml | 6 ++++++ src/templates/mitaka/designate.conf | 2 +- src/templates/queens/designate.conf | 2 +- src/templates/rocky/designate.conf | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/config.yaml b/src/config.yaml index 40450d5..a7ef758 100644 --- a/src/config.yaml +++ b/src/config.yaml @@ -109,6 +109,12 @@ options: description: | Defines the time (in seconds) between retries for the SOA record if the slave (secondary) fails to contact the master when refresh has expired. + managed-resource-email: + type: string + default: hostmaster@example.com + description: | + Define a email to use for managed resources like domains created by the + FloatingIP. default-ttl: type: int default: diff --git a/src/templates/mitaka/designate.conf b/src/templates/mitaka/designate.conf index 8ff6c53..a883881 100644 --- a/src/templates/mitaka/designate.conf +++ b/src/templates/mitaka/designate.conf @@ -84,7 +84,7 @@ workers = {{ options.workers }} ## Managed resources settings # Email to use for managed resources like domains created by the FloatingIP API -#managed_resource_email = hostmaster@example.com. +managed_resource_email = {{ options.managed_resource_email }} # Tenant ID to own all managed resources - like auto-created records etc. #managed_resource_tenant_id = 123456 diff --git a/src/templates/queens/designate.conf b/src/templates/queens/designate.conf index 8843a3d..4dc205e 100644 --- a/src/templates/queens/designate.conf +++ b/src/templates/queens/designate.conf @@ -87,7 +87,7 @@ workers = {{ options.workers }} ## Managed resources settings # Email to use for managed resources like domains created by the FloatingIP API -#managed_resource_email = hostmaster@example.com. +managed_resource_email = {{ options.managed_resource_email }} # Tenant ID to own all managed resources - like auto-created records etc. #managed_resource_tenant_id = 123456 diff --git a/src/templates/rocky/designate.conf b/src/templates/rocky/designate.conf index 30cf307..d86596f 100644 --- a/src/templates/rocky/designate.conf +++ b/src/templates/rocky/designate.conf @@ -87,7 +87,7 @@ workers = {{ options.workers }} ## Managed resources settings # Email to use for managed resources like domains created by the FloatingIP API -#managed_resource_email = hostmaster@example.com. +managed_resource_email = {{ options.managed_resource_email }} # Tenant ID to own all managed resources - like auto-created records etc. #managed_resource_tenant_id = 123456