Browse Source

update configuration for qdrouter v1.0.0

Change-Id: I1355d7dd6767378bacd7394013416ac0d27c8770
changes/78/547678/2
Kenneth Giusti 1 year ago
parent
commit
70e18b5738
1 changed files with 9 additions and 3 deletions
  1. 9
    3
      devstack/plugin.sh

+ 9
- 3
devstack/plugin.sh View File

@@ -254,6 +254,8 @@ function _configure_qdr {
254 254
     local url
255 255
     url=$(_parse_transport_url $1)
256 256
 
257
+    QDR=$(type -p qdrouterd)
258
+
257 259
     # the location of the configuration is /etc/qpid-dispatch
258 260
     local qdr_conf_file
259 261
     if [ -e /etc/qpid-dispatch/qdrouterd.conf ]; then
@@ -275,7 +277,6 @@ router {
275 277
     workerThreads: 4
276 278
     saslConfigPath: /etc/sasl2
277 279
     saslConfigName: qdrouterd
278
-    debugDump: /opt/stack/amqp1
279 280
 }
280 281
 
281 282
 EOF
@@ -283,9 +284,14 @@ EOF
283 284
     # Create a listener for incoming connect to the router
284 285
     local port
285 286
     port=$(echo "$url" | cut -d' ' -f2)
287
+
288
+    # ip address field name changed to 'host' at 1.0+
289
+    local field_name
290
+    field_name=$([[ $($QDR -v) == 0.*.* ]] && echo addr || echo host)
291
+
286 292
     cat <<EOF | sudo tee --append $qdr_conf_file
287 293
 listener {
288
-    addr: 0.0.0.0
294
+    ${field_name}: 0.0.0.0
289 295
     port: ${port}
290 296
     role: normal
291 297
 EOF
@@ -387,7 +393,7 @@ EOF
387 393
     cat <<EOF | sudo tee --append $qdr_conf_file
388 394
 log {
389 395
     module: DEFAULT
390
-    enable: info+
396
+    enable: trace+
391 397
     output: $log_file
392 398
 }
393 399
 

Loading…
Cancel
Save