From 38881963344446f43ad667d3ceeac8348fac5f37 Mon Sep 17 00:00:00 2001
From: likui <likui@yovole.com>
Date: Fri, 26 Jun 2020 10:05:50 +0800
Subject: [PATCH] Add trove-guestagent.conf

Add trove-guestagent.conf templates for trove-guestagent service.
Default the Guest Agent config file to be injected during instance creation.

Change-Id: Id0750b84fef8e19658b27f8ae16a857e1394216e
---
 ansible/roles/trove/tasks/config.yml          | 21 +++++++++++++++++++
 .../trove/templates/trove-guestagent.conf.j2  |  6 ++++++
 .../trove/templates/trove-taskmanager.json.j2 |  8 ++++++-
 ...add-trove-guestagent-5482833a0c99033a.yaml |  4 ++++
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 ansible/roles/trove/templates/trove-guestagent.conf.j2
 create mode 100644 releasenotes/notes/add-trove-guestagent-5482833a0c99033a.yaml

diff --git a/ansible/roles/trove/tasks/config.yml b/ansible/roles/trove/tasks/config.yml
index 54a18f8e07..c88ea6f089 100644
--- a/ansible/roles/trove/tasks/config.yml
+++ b/ansible/roles/trove/tasks/config.yml
@@ -71,6 +71,27 @@
   notify:
     - "Restart {{ item.key }} container"
 
+- name: Copying over trove-guestagent.conf
+  vars:
+    services_need_confs:
+      - trove-taskmanager
+  merge_configs:
+    sources:
+      - "{{ role_path }}/templates/trove-guestagent.conf.j2"
+      - "{{ node_custom_config }}/trove-guestagent.conf"
+      - "{{ node_custom_config }}/trove/trove-guestagent.conf"
+      - "{{ node_custom_config }}/trove/{{ inventory_hostname }}/trove-guestagent.conf"
+    dest: "{{ node_config_directory }}/{{ item.key }}/trove-guestagent.conf"
+    mode: "0660"
+  become: true
+  when:
+    - item.key in services_need_confs
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
+  with_dict: "{{ trove_services }}"
+  notify:
+    - "Restart {{ item.key }} container"
+
 - name: Copying over trove.conf
   vars:
     service_name: "{{ item.key }}"
diff --git a/ansible/roles/trove/templates/trove-guestagent.conf.j2 b/ansible/roles/trove/templates/trove-guestagent.conf.j2
new file mode 100644
index 0000000000..cfc1e197da
--- /dev/null
+++ b/ansible/roles/trove/templates/trove-guestagent.conf.j2
@@ -0,0 +1,6 @@
+[DEFAULT]
+transport_url = {{ rpc_transport_url }}
+control_exchange = trove
+root_grant = ALL
+root_grant_option = True
+debug = {{ trove_logging_debug }}
diff --git a/ansible/roles/trove/templates/trove-taskmanager.json.j2 b/ansible/roles/trove/templates/trove-taskmanager.json.j2
index 30288ee748..a9c86ab448 100644
--- a/ansible/roles/trove/templates/trove-taskmanager.json.j2
+++ b/ansible/roles/trove/templates/trove-taskmanager.json.j2
@@ -6,7 +6,13 @@
             "dest": "/etc/trove/trove-taskmanager.conf",
             "owner": "trove",
             "perm": "0600"
-    }{% if trove_policy_file is defined %},
+        },
+        {
+            "source": "{{ container_config_directory }}/trove-guestagent.conf",
+            "dest": "/etc/trove/trove-guestagent.conf",
+            "owner": "trove",
+            "perm": "0600"
+        }{% if trove_policy_file is defined %},
         {
             "source": "{{ container_config_directory }}/{{ trove_policy_file }}",
             "dest": "/etc/trove/{{ trove_policy_file }}",
diff --git a/releasenotes/notes/add-trove-guestagent-5482833a0c99033a.yaml b/releasenotes/notes/add-trove-guestagent-5482833a0c99033a.yaml
new file mode 100644
index 0000000000..ee1f3deeb1
--- /dev/null
+++ b/releasenotes/notes/add-trove-guestagent-5482833a0c99033a.yaml
@@ -0,0 +1,4 @@
+---
+other:
+  - |
+    Add trove-guestagent.conf for trove