summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-09-15 02:16:06 +0000
committerGerrit Code Review <review@openstack.org>2014-09-15 02:16:06 +0000
commit6f9c30a760ce8515c57ce11d93f35759bb88cbcd (patch)
treee113f278449e651b53be7b3925ae9118d6020e80
parent8ffded729b65d52c21b048e2eff6f6265cc588fe (diff)
parent5d2b9576cb29465ff99f127d5fc1c5a2f3a0651c (diff)
downloadnova-6f9c30a760ce8515c57ce11d93f35759bb88cbcd.tar.gz
Merge "Set is_public to False by default for volume backed snapshots" into stable/havana
-rw-r--r--nova/compute/api.py1
-rw-r--r--nova/tests/compute/test_compute_api.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index d5fa676067..1efcfd7186 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -1924,6 +1924,7 @@ class API(base.Base):
:returns: the new image metadata
"""
image_meta['name'] = name
+ image_meta['is_public'] = False
properties = image_meta['properties']
if instance['root_device_name']:
properties['root_device_name'] = instance['root_device_name']
diff --git a/nova/tests/compute/test_compute_api.py b/nova/tests/compute/test_compute_api.py
index 3cd7d68169..21215f640c 100644
--- a/nova/tests/compute/test_compute_api.py
+++ b/nova/tests/compute/test_compute_api.py
@@ -1397,6 +1397,7 @@ class _ComputeAPIUnitTestMixIn(object):
'name': 'test-snapshot',
'properties': {'root_device_name': 'vda', 'mappings': 'DONTCARE'},
'size': 0,
+ 'is_public': False
}
def fake_get_instance_bdms(context, instance):