ddde90e07c
When creating a kubernetes cluster on baremetal & fedora, if the cluster template does not have a docker_volume_type defined, the following error is seen: InvalidParameterValue: ERROR: The Parameter (docker_volume_type) was not provided. Cinder isn't mandatory, and neither is the docker_volume_type cluster template parameter, so it shouldn't need to be set. This change adds a default value of an empty string for the option [cinder]default_docker_volume_type, which allows the cluster to be created. Change-Id: I4416e2826e4a14a11b93d55d342e4de9b3dc12d7 Closes-Bug: #1702075
51 lines
1.7 KiB
Python
51 lines
1.7 KiB
Python
# 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 oslo_config import cfg
|
|
|
|
from magnum.i18n import _
|
|
|
|
cinder_group = cfg.OptGroup(
|
|
name='cinder',
|
|
title='Options for the Cinder configuration')
|
|
|
|
cinder_client_group = cfg.OptGroup(
|
|
name='cinder_client',
|
|
title='Options for the Cinder client')
|
|
|
|
cinder_opts = [
|
|
cfg.StrOpt('default_docker_volume_type',
|
|
default='',
|
|
help=_('The default docker volume_type to use for volumes '
|
|
'used for docker storage. To use the cinder volumes '
|
|
'for docker storage, you need to select a default '
|
|
'value.'))]
|
|
|
|
cinder_client_opts = [
|
|
cfg.StrOpt('region_name',
|
|
help=_('Region in Identity service catalog to use for '
|
|
'communication with the OpenStack service.'))]
|
|
|
|
|
|
def register_opts(conf):
|
|
conf.register_group(cinder_group)
|
|
conf.register_group(cinder_client_group)
|
|
conf.register_opts(cinder_opts, group=cinder_group)
|
|
conf.register_opts(cinder_client_opts, group=cinder_client_group)
|
|
|
|
|
|
def list_opts():
|
|
return {
|
|
cinder_group: cinder_opts,
|
|
cinder_client_group: cinder_client_opts
|
|
}
|