diff options
| author | Zuul <zuul@review.opendev.org> | 2022-08-19 11:17:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-08-19 11:17:10 +0000 |
| commit | 528741b449a843d118c527d160dedebb523fd49d (patch) | |
| tree | 5b88182a061851bbf78c77a0fb52d86189370739 | |
| parent | 2fed5d0c683f241bd86c407e185787e6a01423f2 (diff) | |
| parent | c612dc64954368e7dabf8adc4b5552875c91b902 (diff) | |
| download | trove-528741b449a843d118c527d160dedebb523fd49d.tar.gz | |
Merge "Fix the missing of guest-agent.conf in guest vm"
| -rw-r--r-- | releasenotes/notes/fix-guest-agent-config-missing.yaml | 5 | ||||
| -rw-r--r-- | trove/common/cfg.py | 4 | ||||
| -rw-r--r-- | trove/tests/unittests/taskmanager/test_models.py | 5 |
3 files changed, 12 insertions, 2 deletions
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 00000000..17c3a95d --- /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 <https://storyboard.openstack.org/#!/story/2010231>`__
\ No newline at end of file diff --git a/trove/common/cfg.py b/trove/common/cfg.py index 60692ac9..54dc4961 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 7497e1dd..3eb81b8c 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) |