Clean up configs - first pass

There are remnants of WIP, initial work and assumptions when moving
designate to openshift. Some of these will get in the way of proper
testing and/or adding workarounds through the CRD.

Author: beagles

controllers/designateunbound_controller.go

@@ -514,10 +514,6 @@ func (r *UnboundReconciler) generateServiceConfigMaps(
 	}
 
 	templateParameters := make(map[string]interface{})
-	// TODO(beagles): these are defaulting to everything and might actually be fine because of how this
-	// is addressed but the network cidr should be derivable if there are network attachments ... I think.
-	templateParameters["ListenIP"] = "0.0.0.0"
-	templateParameters["ExternalNetCidr"] = "0.0.0.0/0"
 
 	cms := []util.Template{
 		// ScriptsConfigMap

templates/designate/config/designate.conf

@@ -43,7 +43,7 @@ topics=notifications
 driver=messagingv2
 
 [oslo_concurrency]
-lock_path=/opt/stack/data/designate
+lock_path = /var/lib/designate/tmp
 
 [oslo_policy]
 enforce_scope=True

templates/designateapi/config/designate.conf

@@ -15,9 +15,6 @@ connection={{ .DatabaseConnection }}
 [storage:sqlalchemy]
 connection={{ .DatabaseConnection }}
 
-[coordination]
-backend_url=memcached://127.0.0.1:11211
-
 [service:api]
 quotas_verify_project_id=True
 auth_strategy=keystone
@@ -45,8 +42,9 @@ poll_max_retries=6
 topics=notifications
 driver=messagingv2
 
+# XXX INCORRECT!
 [oslo_concurrency]
-lock_path=/opt/stack/data/designate
+lock_path = /var/lib/designate/tmp
 
 [oslo_policy]
 enforce_scope=True
@@ -61,7 +59,5 @@ project_domain_name=Default
 user_domain_name=Default
 auth_type=password
 password={{ .AdminPassword }}
-memcache_use_advanced_pool=True
-memcached_servers=inet:[memcached-0.memcached]:11211
 region_name=regionOne
 interface=internal

templates/designatecentral/config/designate.conf

@@ -51,7 +51,7 @@ topics=notifications
 driver=messagingv2
 
 [oslo_concurrency]
-lock_path=/opt/stack/data/designate
+lock_path = /var/lib/designate/tmp
 
 [oslo_policy]
 enforce_scope=True

templates/designatemdns/config/designate.conf

@@ -32,7 +32,7 @@ topics=notifications
 driver=messagingv2
 
 [oslo_concurrency]
-lock_path=/opt/stack/data/designate
+lock_path = /var/lib/designate/tmp
 
 [oslo_policy]
 enforce_scope=True

templates/designateproducer/config/designate.conf

@@ -51,7 +51,7 @@ topics=notifications
 driver=messagingv2
 
 [oslo_concurrency]
-lock_path=/opt/stack/data/designate
+lock_path = /var/lib/designate/tmp
 
 [oslo_policy]
 enforce_scope=True

templates/designateunbound/config/unbound.conf

@@ -1,11 +1,7 @@
 server:
 	do-daemonize: no
-	interface: {{ .ListenIP }}
-	access-control: {{ .ExternalNetCidr }} allow
-
-# XXX(beagles) figure out how to insert acl for the user's config. We can't
-# merge it here because it will just obliterate what's already there.
-
+        interface: 0.0.0.0
+        interface: ::0
 	log-queries: no
 	hide-identity: yes
 	hide-version: yes
@@ -15,10 +11,6 @@ server:
 
 	unblock-lan-zones: yes
 	insecure-lan-zones: yes
-
-#
-# FUTURE: TLS (not currently implemented in available releases)
-#
 	rrset-cache-size: 100m
 	msg-cache-size: 50m