summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorChuck Short <chuck.short@canonical.com>2012-08-10 13:50:13 -0500
committerChuck Short <chuck.short@canonical.com>2012-08-22 11:24:29 -0500
commit293cd3e9232c3bbdb693a074bc306e35ea9e4f08 (patch)
tree3395f63484ea5efce6de182cd9ccf0ad9ff9c7a1 /nova
parent5dc0039c85957502db36b7da5558f9449cd03ada (diff)
downloadnova-293cd3e9232c3bbdb693a074bc306e35ea9e4f08.tar.gz
nova-293cd3e9232c3bbdb693a074bc306e35ea9e4f08.tar.xz
nova-293cd3e9232c3bbdb693a074bc306e35ea9e4f08.zip
Don't show user-data when its not sent.
Don't show user-data in the instance metadata service if the instance was not started with any user-data. LP: #1035317 Change-Id: Idf9b263a39f3b8d75aaf3e6d1debbe283cf9ff64 Signed-off-by: Chuck Short <chuck.short@canonical.com>
Diffstat (limited to 'nova')
-rw-r--r--nova/compute/api.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 3453dfabe..6c21414b6 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -462,7 +462,7 @@ class API(base.Base):
'ephemeral_gb': instance_type['ephemeral_gb'],
'display_name': display_name,
'display_description': display_description or '',
- 'user_data': user_data or '',
+ 'user_data': user_data,
'key_name': key_name,
'key_data': key_data,
'locked': False,