From c612dc64954368e7dabf8adc4b5552875c91b902 Mon Sep 17 00:00:00 2001 From: "wu.chunyang" Date: Tue, 16 Aug 2022 23:07:37 +0800 Subject: [PATCH] Fix the missing of guest-agent.conf in guest vm This PS sets the injected_config_owner to ubuntu and the injected_config_group to root. Story: 2010231 Task: 46023 Change-Id: I77f9d0332a123594eae434c6e1cc795242e4022d --- releasenotes/notes/fix-guest-agent-config-missing.yaml | 5 +++++ trove/common/cfg.py | 4 ++-- trove/tests/unittests/taskmanager/test_models.py | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/fix-guest-agent-config-missing.yaml diff --git a/releasenotes/notes/fix-guest-agent-config-missing.yaml b/releasenotes/notes/fix-guest-agent-config-missing.yaml new file mode 100644 index 0000000000..17c3a95d5d --- /dev/null +++ b/releasenotes/notes/fix-guest-agent-config-missing.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fix guest-agent.conf is not generated in trove guest vm. + `Stroy 2010231 `__ \ No newline at end of file diff --git a/trove/common/cfg.py b/trove/common/cfg.py index 60692ac999..54dc496137 100644 --- a/trove/common/cfg.py +++ b/trove/common/cfg.py @@ -428,10 +428,10 @@ common_opts = [ cfg.StrOpt('injected_config_location', default='/etc/trove/conf.d', help='Path to folder on the Guest where config files will be ' 'injected during instance creation.'), - cfg.StrOpt('injected_config_owner', default='trove', + cfg.StrOpt('injected_config_owner', default='ubuntu', help='Owner of the Guest Agent directory and files to be ' 'injected during instance creation.'), - cfg.StrOpt('injected_config_group', default='trove', + cfg.StrOpt('injected_config_group', default='root', help='Group of the Guest Agent directory and files to be ' 'injected during instance creation.'), cfg.StrOpt('guest_config', diff --git a/trove/tests/unittests/taskmanager/test_models.py b/trove/tests/unittests/taskmanager/test_models.py index 7497e1dd1d..3eb81b8c6d 100644 --- a/trove/tests/unittests/taskmanager/test_models.py +++ b/trove/tests/unittests/taskmanager/test_models.py @@ -253,6 +253,11 @@ class FreshInstanceTasksTest(BaseFreshInstanceTasksTest): self.assertEqual('fake_keypair', server.key_name) + def test_create_instance_prepare_cloud_config(self): + files = {"/tmp/fake_file": "fake text"} + user_data = self.freshinstancetasks.prepare_cloud_config(files) + self.assertTrue(user_data.startswith('#cloud-config')) + @patch.object(DBInstance, 'get_by') def test_create_instance_guestconfig(self, patch_get_by): cfg.CONF.set_override('guest_config', self.guestconfig)