From 9660c91b57721470f857a70db54b857889c36be8 Mon Sep 17 00:00:00 2001 From: Daniel Wallace Date: Tue, 16 Feb 2016 15:43:51 -0600 Subject: [PATCH 1/2] allow for nova servers to be built with premade volumes if the boot_volume is specified, allow for that to be used instead of an image --- salt/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/config.py b/salt/config.py index 1456394ab6..011b793d18 100644 --- a/salt/config.py +++ b/salt/config.py @@ -2640,7 +2640,7 @@ def is_profile_configured(opts, provider, profile_name): 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) From 36bf06e539e16d54ec80422f8999fbcc45d080c6 Mon Sep 17 00:00:00 2001 From: Daniel Wallace Date: Tue, 16 Feb 2016 17:22:40 -0600 Subject: [PATCH 2/2] fix doc for boot_volume --- salt/cloud/clouds/nova.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/cloud/clouds/nova.py b/salt/cloud/clouds/nova.py index e5f7ec2176..c1c640d9b6 100644 --- a/salt/cloud/clouds/nova.py +++ b/salt/cloud/clouds/nova.py @@ -112,7 +112,7 @@ and one using cinder volumes already attached centos7-2-iad-rackspace: provider: rackspace-iad size: general1-2 - block_volume: + boot_volume: # create the volume from a snapshot centos7-2-iad-rackspace: