valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #31253 from gtmanfred/2015.8

Browse Source 
allow for nova servers to be built with premade volumes
This commit is contained in:
Mike Place 2016-02-17 10:55:39 -07:00
commit dc2e7c8956
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/cloud/clouds/nova.py
View File

@ -112,7 +112,7 @@ and one using cinder volumes already attached
centos7-2-iad-rackspace:
provider: rackspace-iad
size: general1-2
block_volume: <volume id>
boot_volume: <volume id>
# create the volume from a snapshot
centos7-2-iad-rackspace:

2
salt/config.py
View File

@ -2639,7 +2639,7 @@ def is_profile_configured(opts, provider, profile_name, vm_=None):
elif driver == 'vmware' or linode_cloning:
required_keys.append('clonefrom')
elif driver == 'nova':
nova_image_keys = ['image', 'block_device_mapping', 'block_device']
nova_image_keys = ['image', 'block_device_mapping', 'block_device', 'boot_volume']
if not any([key in provider_key for key in nova_image_keys]) and not any([key in profile_key for key in nova_image_keys]):
required_keys.extend(nova_image_keys)