diff options
Diffstat (limited to 'trove')
-rw-r--r-- | trove/common/cfg.py | 4 | ||||
-rw-r--r-- | trove/tests/unittests/taskmanager/test_models.py | 5 |
2 files changed, 7 insertions, 2 deletions
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) |