Fix qdrouter naming, add unixsock

mrunge · mrunge · commit e6974ba6a1e9 · 2019-03-06T11:39:34.000+01:00
diff --git a/roles/collectd/tasks/main.yml b/roles/collectd/tasks/main.yml
@@ -17,6 +17,11 @@
     src: amqp1.conf.j2
     dest: "{{collectd_conf_dir}}/amqp1.conf"
 
+- name: place unixsock config
+  template:
+    src: unixsock.conf.j2
+    dest: "{{collectd_conf_dir}}/unixsock.conf"
+
 - name: set collectd_tcp_network_connect
   seboolean:
     name: collectd_tcp_network_connect
diff --git a/roles/collectd/templates/unixsock.conf.j2 b/roles/collectd/templates/unixsock.conf.j2
@@ -0,0 +1,9 @@
+LoadPlugin unixsock
+
+<Plugin unixsock>
+        SocketFile "/var/run/collectd-unixsock"
+        SocketGroup "collectd"
+        SocketPerms "0660"
+        DeleteSocket false
+</Plugin>
+
diff --git a/roles/qdr/templates/qdrouterd.conf.j2 b/roles/qdr/templates/qdrouterd.conf.j2
@@ -22,7 +22,7 @@
 
 router {
     mode: interior
-    id: router-ansible
+    id: router-{{ansible_hostname}}
 }
 
 listener {
@@ -38,7 +38,6 @@ listener {
     role: inter-router
     authenticatePeer: no
     saslMechanisms: ANONYMOUS
-    failoverList: green-qdr-sa-telemetry.apps.openshift.berg.ol
 }
 
 connector {

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`
`23`	`23`	`router {`
`24`	`24`	`mode: interior`
`25`		`- id: router-ansible`
	`25`	`+ id: router-{{ansible_hostname}}`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`listener {`
`@@ -38,7 +38,6 @@ listener {`
`38`	`38`	`role: inter-router`
`39`	`39`	`authenticatePeer: no`
`40`	`40`	`saslMechanisms: ANONYMOUS`
`41`		`- failoverList: green-qdr-sa-telemetry.apps.openshift.berg.ol`
`42`	`41`	`}`
`43`	`42`
`44`	`43`	`connector {`