Disable instance_user by default
Change-Id: I7b60d3cbef7fea72fdef2a5e514548ad08efa394 Closes-Bug: #1474194
This commit is contained in:
parent
5a4a738bcb
commit
0dba5777ec
|
@ -89,7 +89,7 @@ service_opts = [
|
||||||
|
|
||||||
engine_opts = [
|
engine_opts = [
|
||||||
cfg.StrOpt('instance_user',
|
cfg.StrOpt('instance_user',
|
||||||
default='ec2-user',
|
default='',
|
||||||
help=_("The default user for new instances. This option "
|
help=_("The default user for new instances. This option "
|
||||||
"is deprecated and will be removed in the Juno release. "
|
"is deprecated and will be removed in the Juno release. "
|
||||||
"If it's empty, Heat will use the default user set up "
|
"If it's empty, Heat will use the default user set up "
|
||||||
|
|
|
@ -2692,7 +2692,7 @@ class ServersTest(common.HeatTestCase):
|
||||||
self.m.VerifyAll()
|
self.m.VerifyAll()
|
||||||
|
|
||||||
def test_default_instance_user(self):
|
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]
|
return_server = self.fc.servers.list()[1]
|
||||||
server = self._setup_test_server(return_server, 'default_user')
|
server = self._setup_test_server(return_server, 'default_user')
|
||||||
metadata = server.metadata_get()
|
metadata = server.metadata_get()
|
||||||
|
@ -2700,7 +2700,7 @@ class ServersTest(common.HeatTestCase):
|
||||||
nova.NovaClientPlugin.build_userdata(
|
nova.NovaClientPlugin.build_userdata(
|
||||||
metadata,
|
metadata,
|
||||||
'wordpress',
|
'wordpress',
|
||||||
instance_user='ec2-user',
|
instance_user=None,
|
||||||
user_data_format='HEAT_CFNTOOLS')
|
user_data_format='HEAT_CFNTOOLS')
|
||||||
self.m.ReplayAll()
|
self.m.ReplayAll()
|
||||||
scheduler.TaskRunner(server.create)()
|
scheduler.TaskRunner(server.create)()
|
||||||
|
|
Loading…
Reference in New Issue