Merge "Trex KPI are not collected due to rabbitmq user" into stable/gambia

3 files changed, 40 insertions, 8 deletions

diff --git a/ansible/roles/configure_rabbitmq/tasks/main.yml b/ansible/roles/configure_rabbitmq/tasks/main.yml
index 3ad60c1ea..4ff4222dc 100644
--- a/ansible/roles/configure_rabbitmq/tasks/main.yml
+++ b/ansible/roles/configure_rabbitmq/tasks/main.yml
@@ -12,6 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ---
+- name: Create rabbitmq configuration
+  template:
+    src: rabbitmq.config.j2
+    dest: /etc/rabbitmq/rabbitmq.config
+
+- name: Define user definitions file
+  template:
+    src: user_definitions.json.j2
+    dest: /etc/rabbitmq/definitions.json
+
 - name: Restart rabbitmq
   service:
     name: rabbitmq-server
@@ -20,11 +30,5 @@
 - name: rabbitmqctl start_app
   shell: rabbitmqctl start_app
 
-- name: Configure rabbitmq
-  rabbitmq_user:
-    user: yardstick
-    password: yardstick
-    configure_priv: .*
-    read_priv: .*
-    write_priv: .*
-    state: present
+- name: Enable management plugin
+  shell: rabbitmq-plugins enable rabbitmq_management
diff --git a/ansible/roles/configure_rabbitmq/templates/rabbitmq.config.j2 b/ansible/roles/configure_rabbitmq/templates/rabbitmq.config.j2
new file mode 100644
index 000000000..8f07edf5c
--- /dev/null
+++ b/ansible/roles/configure_rabbitmq/templates/rabbitmq.config.j2
@@ -0,0 +1,5 @@
+ [

+    {rabbitmq_management, [

+       {load_definitions, "/etc/rabbitmq/definitions.json"}

+    ]}

+].
\ No newline at end of file
diff --git a/ansible/roles/configure_rabbitmq/templates/user_definitions.json.j2 b/ansible/roles/configure_rabbitmq/templates/user_definitions.json.j2
new file mode 100644
index 000000000..831675ff1
--- /dev/null
+++ b/ansible/roles/configure_rabbitmq/templates/user_definitions.json.j2
@@ -0,0 +1,23 @@
+ {

+    "users": [{

+        "name": "yardstick",

+        "password_hash": "{{  }}",

+        "hashing_algorithm": "rabbit_password_hashing_sha256",

+        "tags": ""

+    }],

+    "vhosts": [{

+        "name": "/"

+    }],

+    "permissions": [{

+        "user": "yardstick",

+        "vhost": "/",

+        "configure": ".*",

+        "write": ".*",

+        "read": ".*"

+    }],

+    "parameters": [],

+    "policies": [],

+    "queues": [],

+    "exchanges": [],

+    "bindings": []

+}