Merge "Designate: format listen addr properly when ipv6"

deployment/designate/designate-mdns-container-puppet.yaml

@@ -67,6 +67,10 @@ parameters:
 conditions:
   designate_workers_zero: {equals : [{get_param: DesignateWorkers}, 0]}
   enable_sqlalchemy_collectd: {equals : [{get_param: EnableSQLAlchemyCollectd}, true]}
+  is_ipv6:
+    equals:
+      - {get_param: [ServiceData, net_ip_version_map, {get_param: [ServiceNetMap, DesignateMdnsNetwork]}]}
+      - 6
 
 resources:
 
@@ -126,11 +130,18 @@ outputs:
         map_merge:
           - get_attr: [DesignateBase, role_data, config_settings]
           - designate::mdns::listen:
-              str_replace:
+              if:
-                template:
+              - is_ipv6
-                  "%{lookup('$NETWORK')}:5354"
+              - str_replace:
-                params:
+                  template:
-                  $NETWORK: {get_param: [ServiceNetMap, DesignateMdnsNetwork]}
+                    "[%{lookup('$NETWORK')}]:5354"
+                  params:
+                    $NETWORK: {get_param: [ServiceNetMap, DesignateMdnsNetwork]}
+              - str_replace:
+                  template:
+                    "%{lookup('$NETWORK')}:5354"
+                  params:
+                    $NETWORK: {get_param: [ServiceNetMap, DesignateMdnsNetwork]}
           - designate::db::database_connection:
               make_url:
                 scheme: {get_param: [EndpointMap, MysqlInternal, protocol]}