openstack/heat
Code Issues Proposed changes

Merge "Disable instance_user by default"

Browse Source
This commit is contained in:
Jenkins 2015-07-21 16:45:50 +00:00 committed by Gerrit Code Review
commit eb02839979
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/common/config.py
View File

@ -89,7 +89,7 @@ service_opts = [
engine_opts = [
cfg.StrOpt('instance_user',
default='ec2-user',
default='',
help=_("The default user for new instances. This option "
"is deprecated and will be removed in the Juno release. "
"If it's empty, Heat will use the default user set up "

4
heat/tests/nova/test_server.py
View File

@ -2692,7 +2692,7 @@ class ServersTest(common.HeatTestCase):
self.m.VerifyAll()
def test_default_instance_user(self):
"""The default value for instance_user in heat.conf is ec2-user."""
"""Test instance_user is disabled by default."""
return_server = self.fc.servers.list()[1]
server = self._setup_test_server(return_server, 'default_user')
metadata = server.metadata_get()
@ -2700,7 +2700,7 @@ class ServersTest(common.HeatTestCase):
nova.NovaClientPlugin.build_userdata(
metadata,
'wordpress',
instance_user='ec2-user',
instance_user=None,
user_data_format='HEAT_CFNTOOLS')
self.m.ReplayAll()
scheduler.TaskRunner(server.create)()