a339ce2faf
The nova vnc configuration options have moved from nova.vnc to nova.conf.vnc. Change-Id: I25f2ff5fc6e6c367ac4ccdc20bbc1afdb28d5631
200 lines
8.9 KiB
Python
200 lines
8.9 KiB
Python
# Copyright 2016 IBM Corp.
|
|
#
|
|
# All Rights Reserved.
|
|
#
|
|
# 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
|
|
|
|
CONF = cfg.CONF
|
|
# Pull in the imports that nova-powervm uses so they are validated
|
|
CONF.import_opt('host', 'nova.netconf')
|
|
CONF.import_opt('my_ip', 'nova.netconf')
|
|
CONF.import_opt('vncserver_proxyclient_address', 'nova.conf.vnc', group='vnc')
|
|
CONF.import_opt('vif_plugging_is_fatal', 'nova.virt.driver')
|
|
CONF.import_opt('vif_plugging_timeout', 'nova.virt.driver')
|
|
|
|
powervm_group = cfg.OptGroup(
|
|
'powervm',
|
|
title='PowerVM Options')
|
|
|
|
|
|
powervm_opts = [
|
|
cfg.FloatOpt('proc_units_factor',
|
|
default=0.1,
|
|
help='Factor used to calculate the processor units per vcpu. '
|
|
'Valid values are: 0.05 - 1.0'),
|
|
cfg.IntOpt('uncapped_proc_weight',
|
|
default=64, min=1, max=255,
|
|
help='The processor weight to assign to newly created VMs. '
|
|
'Value should be between 1 and 255. Represents how '
|
|
'aggressively LPARs grab CPU when unused cycles are '
|
|
'available.'),
|
|
cfg.StrOpt('vopt_media_volume_group',
|
|
default='rootvg',
|
|
help='The volume group on the system that should be used '
|
|
'to store the config drive metadata that will be attached '
|
|
'to VMs.'),
|
|
cfg.IntOpt('vopt_media_rep_size',
|
|
default=1, min=1,
|
|
help='The size of the media repository (in GB) for the '
|
|
'metadata for config drive. Only used if the media '
|
|
'repository needs to be created.'),
|
|
cfg.StrOpt('image_meta_local_path',
|
|
default='/tmp/cfgdrv/',
|
|
help='The location where the config drive ISO files should be '
|
|
'built.'),
|
|
cfg.StrOpt('disk_driver',
|
|
choices=['localdisk', 'ssp'], ignore_case=True,
|
|
default='localdisk',
|
|
help='The disk driver to use for PowerVM disks. '
|
|
'Valid options are: localdisk, ssp'),
|
|
]
|
|
|
|
localdisk_opts = [
|
|
cfg.StrOpt('volume_group_name',
|
|
default='',
|
|
help='Volume Group to use for block device operations. Must '
|
|
'not be rootvg. If disk_driver is localdisk, and more '
|
|
'than one non-rootvg volume group exists across the '
|
|
'Virtual I/O Servers, then this attribute must be '
|
|
'specified.'),
|
|
cfg.StrOpt('volume_group_vios_name',
|
|
default='',
|
|
help='(Optional) The name of the Virtual I/O Server hosting '
|
|
'the volume group. If this is not specified, the system '
|
|
'will query through the Virtual I/O Servers looking for '
|
|
'one that matches the volume_group_vios_name. This is '
|
|
'only needed if the system has multiple Virtual I/O '
|
|
'Servers with a non-rootvg volume group whose name is '
|
|
'duplicated.')
|
|
]
|
|
|
|
ssp_opts = [
|
|
cfg.StrOpt('cluster_name',
|
|
default='',
|
|
help='Cluster hosting the Shared Storage Pool to use for '
|
|
'storage operations. If none specified, the host is '
|
|
'queried; if a single Cluster is found, it is used. '
|
|
'Not used unless disk_driver option is set to ssp.')
|
|
]
|
|
|
|
vol_adapter_opts = [
|
|
cfg.StrOpt('fc_attach_strategy',
|
|
choices=['vscsi', 'npiv'], ignore_case=True,
|
|
default='vscsi',
|
|
help='The Fibre Channel Volume Strategy defines how FC Cinder '
|
|
'volumes should be attached to the Virtual Machine. The '
|
|
'options are: npiv or vscsi. If npiv is selected then '
|
|
'the ports_per_fabric and fabrics option should be '
|
|
'specified and at least one fabric_X_port_wwpns option '
|
|
'(where X corresponds to the fabric name) must be '
|
|
'specified.'),
|
|
cfg.StrOpt('fc_npiv_adapter_api',
|
|
default='nova_powervm.virt.powervm.volume.npiv.'
|
|
'NPIVVolumeAdapter',
|
|
help='Volume Adapter API to connect FC volumes using NPIV'
|
|
'connection mechanism.'),
|
|
cfg.StrOpt('fc_vscsi_adapter_api',
|
|
default='nova_powervm.virt.powervm.volume.vscsi.'
|
|
'VscsiVolumeAdapter',
|
|
help='Volume Adapter API to connect FC volumes through Virtual '
|
|
'I/O Server using PowerVM vSCSI connection mechanism.'),
|
|
cfg.IntOpt('vscsi_vios_connections_required',
|
|
default=1, min=1,
|
|
help='Indicates a minimum number of Virtual I/O Servers that '
|
|
'are required to support a Cinder volume attach with the '
|
|
'vSCSI volume connector.')
|
|
]
|
|
|
|
# NPIV Options. Only applicable if the 'fc_attach_strategy' is set to 'npiv'.
|
|
# Otherwise this section can be ignored.
|
|
npiv_opts = [
|
|
cfg.IntOpt('ports_per_fabric',
|
|
default=1, min=1,
|
|
help='The number of physical ports that should be connected '
|
|
'directly to the Virtual Machine, per fabric. '
|
|
'Example: 2 fabrics and ports_per_fabric set to 2 will '
|
|
'result in 4 NPIV ports being created, two per fabric. '
|
|
'If multiple Virtual I/O Servers are available, will '
|
|
'attempt to span ports across I/O Servers.'),
|
|
cfg.StrOpt('fabrics', default='A',
|
|
help='Unique identifier for each physical FC fabric that is '
|
|
'available. This is a comma separated list. If there '
|
|
'are two fabrics for multi-pathing, then this could be '
|
|
'set to A,B.'
|
|
'The fabric identifiers are used for the '
|
|
'\'fabric_<identifier>_port_wwpns\' key.')
|
|
]
|
|
|
|
STATIC_OPTIONS = (powervm_opts + localdisk_opts + ssp_opts + vol_adapter_opts
|
|
+ npiv_opts)
|
|
|
|
# Dictionary where the key is the NPIV Fabric Name, and the value is a list of
|
|
# Physical WWPNs that match the key.
|
|
NPIV_FABRIC_WWPNS = {}
|
|
FABRIC_WWPN_HELP = ('A comma delimited list of all the physical FC port '
|
|
'WWPNs that support the specified fabric. Is tied to '
|
|
'the NPIV fabrics key.')
|
|
# This is only used to provide a sample for the list_opt() method
|
|
fabric_sample = [
|
|
cfg.StrOpt('fabric_A_port_wwpns', default='', help=FABRIC_WWPN_HELP),
|
|
cfg.StrOpt('fabric_B_port_wwpns', default='', help=FABRIC_WWPN_HELP),
|
|
]
|
|
|
|
|
|
def _register_fabrics(conf, fabric_mapping):
|
|
"""Registers the fabrics to WWPNs options and builds a mapping.
|
|
|
|
This method registers the 'fabric_X_port_wwpns' (where X is determined by
|
|
the 'fabrics' option values) and then builds a dictionary that mapps the
|
|
fabrics to the WWPNs. This mapping can then be later used without having
|
|
to reparse the options.
|
|
"""
|
|
# At this point, the fabrics should be specified. Iterate over those to
|
|
# determine the port_wwpns per fabric.
|
|
if conf.powervm.fabrics is not None:
|
|
port_wwpn_keys = []
|
|
fabrics = conf.powervm.fabrics.split(',')
|
|
for fabric in fabrics:
|
|
opt = cfg.StrOpt('fabric_%s_port_wwpns' % fabric,
|
|
default='', help=FABRIC_WWPN_HELP)
|
|
port_wwpn_keys.append(opt)
|
|
|
|
conf.register_opts(port_wwpn_keys, group='powervm')
|
|
|
|
# Now that we've registered the fabrics, saturate the NPIV dictionary
|
|
for fabric in fabrics:
|
|
key = 'fabric_%s_port_wwpns' % fabric
|
|
wwpns = conf.powervm[key].split(',')
|
|
wwpns = [x.upper().strip(':') for x in wwpns]
|
|
fabric_mapping[fabric] = wwpns
|
|
|
|
|
|
def register_opts(conf):
|
|
conf.register_group(powervm_group)
|
|
conf.register_opts(STATIC_OPTIONS, group=powervm_group)
|
|
_register_fabrics(conf, NPIV_FABRIC_WWPNS)
|
|
|
|
|
|
# To generate a sample config run:
|
|
# $ oslo-config-generator --namespace nova_powervm > nova_powervm_sample.conf
|
|
def list_opts():
|
|
# The nova conf tooling expects each module to return a dict of options.
|
|
# When powervm is pulled into nova proper the return value would be in
|
|
# this form:
|
|
# return {powervm_group.name: STATIC_OPTIONS + fabric_sample}
|
|
#
|
|
# The oslo-config-generator tooling expects a tuple:
|
|
return [(powervm_group.name, STATIC_OPTIONS + fabric_sample)]
|