Merge "Fix the missing of guest-agent.conf in guest vm"

This commit is contained in:
Zuul 2022-08-19 11:17:10 +00:00 committed by Gerrit Code Review
commit 528741b449
3 changed files with 12 additions and 2 deletions

View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fix guest-agent.conf is not generated in trove guest vm.
`Stroy 2010231 <https://storyboard.openstack.org/#!/story/2010231>`__

View File

@ -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',

View File

@ -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)