296479e1ab
The 'force_config_drive' option provides a way to force injection of
configuration drives on instances. Previously, this option supported
three values: 'always', 'True' and 'False'. However, the 'always'
value was deprecated in Liberty and can now be removed.
Remove this value and replace the existing 'StrOpt' with a 'BoolOpt'.
This also requires changing some unit tests to reflect the new value
for this parameter.
UpgradeImpact: This change removes support for the 'always' option.
Configuration files providing this value will need to be updated
accordingly.
DocImpact: This option is now a BoolOpt and documentation will need to
be updated accordingly.
Change-Id: I0b4030ec1336fb1f2e721570c99a27a979e2847c
68 lines
2.0 KiB
Python
68 lines
2.0 KiB
Python
# Copyright 2014 IBM Corp.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from nova import objects
|
|
from nova import test
|
|
from nova.virt import configdrive
|
|
|
|
|
|
class ConfigDriveTestCase(test.NoDBTestCase):
|
|
def test_instance_force(self):
|
|
self.flags(force_config_drive=False)
|
|
|
|
instance = objects.Instance(
|
|
config_drive="yes",
|
|
system_metadata={
|
|
"image_img_config_drive": "mandatory",
|
|
}
|
|
)
|
|
|
|
self.assertTrue(configdrive.required_by(instance))
|
|
|
|
def test_image_meta_force(self):
|
|
self.flags(force_config_drive=False)
|
|
|
|
instance = objects.Instance(
|
|
config_drive=None,
|
|
system_metadata={
|
|
"image_img_config_drive": "mandatory",
|
|
}
|
|
)
|
|
|
|
self.assertTrue(configdrive.required_by(instance))
|
|
|
|
def test_config_flag_force(self):
|
|
self.flags(force_config_drive=True)
|
|
|
|
instance = objects.Instance(
|
|
config_drive=None,
|
|
system_metadata={
|
|
"image_img_config_drive": "optional",
|
|
}
|
|
)
|
|
|
|
self.assertTrue(configdrive.required_by(instance))
|
|
|
|
def test_no_config_drive(self):
|
|
self.flags(force_config_drive=False)
|
|
|
|
instance = objects.Instance(
|
|
config_drive=None,
|
|
system_metadata={
|
|
"image_img_config_drive": "optional",
|
|
}
|
|
)
|
|
|
|
self.assertFalse(configdrive.required_by(instance))
|