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

3 files changed, 8 insertions, 40 deletions

diff --git a/ansible/roles/configure_rabbitmq/tasks/main.yml b/ansible/roles/configure_rabbitmq/tasks/main.yml
index 4ff4222dc..3ad60c1ea 100644
--- a/ansible/roles/configure_rabbitmq/tasks/main.yml
+++ b/ansible/roles/configure_rabbitmq/tasks/main.yml
@@ -12,16 +12,6 @@
 # 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
@@ -30,5 +20,11 @@
 - name: rabbitmqctl start_app
   shell: rabbitmqctl start_app
 
-- name: Enable management plugin
-  shell: rabbitmq-plugins enable rabbitmq_management
+- name: Configure rabbitmq
+  rabbitmq_user:
+    user: yardstick
+    password: yardstick
+    configure_priv: .*
+    read_priv: .*
+    write_priv: .*
+    state: present
diff --git a/ansible/roles/configure_rabbitmq/templates/rabbitmq.config.j2 b/ansible/roles/configure_rabbitmq/templates/rabbitmq.config.j2
deleted file mode 100644
index 8f07edf5c..000000000
--- a/ansible/roles/configure_rabbitmq/templates/rabbitmq.config.j2
+++ /dev/null
@@ -1,5 +0,0 @@
- [

-    {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
deleted file mode 100644
index 831675ff1..000000000
--- a/ansible/roles/configure_rabbitmq/templates/user_definitions.json.j2
+++ /dev/null
@@ -1,23 +0,0 @@
- {

-    "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": []

-}