Skip to content

Commit

Permalink
Fix nova configuration for ZVM
Browse files Browse the repository at this point in the history
  • Loading branch information
@dirkmueller
dirkmueller committed Dec 9, 2015
1 parent 758fa27 commit bebb2af
Showing 1 changed file with 122 additions and 129 deletions.
251 changes: 122 additions & 129 deletions chef/cookbooks/nova/templates/default/nova.conf.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2040,6 +2040,128 @@ firewall_driver=nova.virt.firewall.NoopFirewallDriver
# Template file for injected network (string value)
#injected_network_template=$pybasedir/nova/virt/interfaces.template

#
# From nova.virt.zvm
#

# Host name or IP address of xCAT management_node (string value)
#zvm_xcat_server = <None>
<%= "zvm_xcat_server=#{node[:nova][:zvm][:zvm_xcat_server]}" if @libvirt_type.eql?('zvm') %>

# XCAT username (string value)
#zvm_xcat_username = <None>
<%= "zvm_xcat_username=#{node[:nova][:zvm][:zvm_xcat_username]}" if @libvirt_type.eql?('zvm') %>

# Password of the xCAT user (string value)
#zvm_xcat_password = <None>
<%= "zvm_xcat_password=#{node[:nova][:zvm][:zvm_xcat_password]}" if @libvirt_type.eql?('zvm') %>

# Z/VM disk pool for ephemeral disks (string value)
#zvm_diskpool = <None>
<%= "zvm_diskpool=#{node[:nova][:zvm][:zvm_diskpool]}" if @libvirt_type.eql?('zvm') %>

# Z/VM host that managed by xCAT MN. (string value)
#zvm_host = <None>
<%= "zvm_host=#{node[:nova][:zvm][:zvm_host]}" if @libvirt_type.eql?('zvm') %>

# XCAT group for OpenStack (string value)
#zvm_xcat_group = all

# Default zfcp scsi disk pool (string value)
#zvm_scsi_pool = xcatzfcp
<%= "zvm_scsi_pool=#{node[:nova][:zvm][:zvm_scsi_pool]}" if @libvirt_type.eql?('zvm') %>

# Does use multiple FCP for attaching a volume (boolean value)
#zvm_multiple_fcp = false

# Configured fcp list can be used (string value)
#zvm_fcp_list = <None>

# Configured fcp list dedicated to hcp (string value)
#zvm_zhcp_fcp_list = <None>

# Default disk type for root disk, can be ECKD/FBA (string value)
#zvm_diskpool_type = ECKD
<%= "zvm_diskpool_type=#{node[:nova][:zvm][:zvm_diskpool_type]}" if @libvirt_type.eql?('zvm') %>

# Sets the admin password in the config drive (boolean value)
#zvm_config_drive_inject_password = false

# Force can be: (ARCHITECTURE) attempt relocation even though hardware
# architecture facilities or CP features are not available on destination
# system, (DOMAIN) attempt relocation even though VM would be moved outside of
# its domain, or (STORAGE) relocation should proceed even if CP determines that
# there are insufficient storage resources on destination system. (string
# value)
#zvm_vmrelocate_force = <None>

# Immediate can be: (YES) VMRELOCATE command will do one early pass through
# virtual machine storage and then go directly to the quiesce stage, or (NO)
# specifies immediate processing. (string value)
#zvm_vmrelocate_immediate = yes

# Maximum wait time(seconds) for relocation to complete (string value)
#zvm_vmrelocate_max_total = nolimit

# Maximum quiesce time(seconds) a VM may be stopped during a relocation attempt
# (string value)
#zvm_vmrelocate_max_quiesce = nolimit

# Timeout(seconds) when start an instance. (integer value)
#zvm_reachable_timeout = 300

# XCAT connection read timeout(seconds) (integer value)
#zvm_xcat_connection_timeout = 3600

# Max console log size(kilobyte) get from xCAT (integer value)
#zvm_console_log_size = 100

# User profile for creating a z/VM userid (string value)
#zvm_user_profile = <None>
<%= "zvm_user_profile=#{node[:nova][:zvm][:zvm_user_profile]}" if @libvirt_type.eql?('zvm') %>

# Default password for a new created z/VM user (string value)
#zvm_user_default_password = dfltpass

# Default privilege level for a new created z/VM user (string value)
#zvm_user_default_privilege = g

# Virtual device number for ephemeral root disk (string value)
#zvm_user_root_vdev = 0100

# Virtual device number for additional ephemeral disk (string value)
#zvm_user_adde_vdev = 0101

# Virtual device number for persistent volume, if there are more then one
# volumes, will use next vdev (string value)
#zvm_user_volume_vdev = 0200

# The path to store the z/VM image files (string value)
#zvm_image_tmp_path = /var/lib/nova/images

# The path to which the ephemeral disk be mounted (string value)
#zvm_default_ephemeral_mntdir = /mnt/ephemeral

# Default os root password for a new created vm (string value)
#zvm_image_default_password = rootpass

# The period(days) to clean up an image that not be used for deploy in one xCAT
# MN within the defined time (integer value)
#xcat_image_clean_period = 30

# The threshold for xCAT free space, if snapshot or spawn check xCAT free space
# not enough for its image operations, it will prune image to meet the
# threshold (integer value)
#xcat_free_space_threshold = 50

# The xCAT MM node name (string value)
#zvm_xcat_master = <None>
<%= "zvm_xcat_master=#{node[:nova][:zvm][:zvm_xcat_master]}" if @libvirt_type.eql?('zvm') %>

# The level of gzip compression used when capturing disk (string value)
#zvm_image_compression_level = <None>



#
# Options defined in nova.vnc
Expand Down Expand Up @@ -4118,132 +4240,3 @@ cluster_name="<%= cluster %>"
#sg_retry_interval=5


[zvm]

#
# Options defined in nova.virt.zvm.ZVMDriver
#

# The config driver format, should be tgz
config_drive_format=tgz

# Set file system format for ephemeral disk, this value can be set to ext2, ext3 or ext4,
# please note that the file system specified must be one that the Linux distro on the deployed
# system allows to be mounted in read-write mode. If this option is not specified in nova.conf,
# the created ephemeral disk will use default ext3 as its file system.
#default_ephemeral_format=ext3

# z/VM only suport config drive for cloud-init
force_config_drive=true

# The host is used to distinguish different nova compute host, it can be same with zvm_host
#host=zvmhost1
<%= "host=#{node[:nova][:zvm][:zvm_host]}" if @libvirt_type.eql?('zvm') %>

# NOT z/VM specific, set it default 86400(s) = 24hours
#image_cache_manager_interval=86400

# Default instance name template (resides in DEFAULT section) this is just for reference here
# There is restriction that you should define the template with length 8, and first 3 should be
# characters, should not use “rsz” or “RSZ” as the first 3 characters.
#instance_name_template = zvm%05x

# Live migration will not success with default rpc value, set to 180
#rpc_response_timeout=180

# The threshold when xCAT MN disk space is not big enough(default is 1G), purge operation will start
#xcat_free_space_threshold=1

#xCAT image that not used for a long time (default is 30 days) will be purged
#xcat_image_clean_period=30

# Define whether to inject the password in config drive, if zvm_config_drive_inject_password
# is set to be True, the default os root password for the new booted vm will be the random value of
# adminPass property that is shown in the output of nova boot command.
#zvm_config_drive_inject_password=False

# The disk pool name that xCAT will allocate disk from for new servers
# Note: The zvm_diskpool name is the name of the storage ’group’ defined in the Directory Manager
#zvm_diskpool=
<%= "zvm_diskpool=#{node[:nova][:zvm][:zvm_diskpool]}" if @libvirt_type.eql?('zvm') %>

# The disk pool type (can be FBA or ECKD )
#zvm_diskpool_type=FBA
<%= "zvm_diskpool_type=#{node[:nova][:zvm][:zvm_diskpool_type]}" if @libvirt_type.eql?('zvm') %>

# The list of FCPs used by instances. Each instance needs one FCP in order to attach a
# volume to itself. Those FCPs should be well planned and made online before
# OpenStack can use them. OpenStack will not check their status but use them directly.
# So if they are not ready, errors may be returned. The format of this variable should look
# like “ min1-max1;min2-max2;min3-max3”. Please contact your z/VM system manager
# if you don’t know what FCPs you can use.
#zvm_fcp_list=B15B-B15F

# The xCAT node name of the z/VM hypervisor
# Same value as XCAT_sysid in DMSSICNF COPY file
#zvm_host=
<%= "zvm_host=#{node[:nova][:zvm][:zvm_host]}" if @libvirt_type.eql?('zvm') %>

# An integer between 0 and 9, indicating the level of gzip compression used when
# capturing a disk. The values are as follows:
# 0 No compression.
# 1-9 The gzip compression level. The recommended compression value is 6 when
# compression is desired.
# Notes: If this value is set in nova.conf, the specified gzip compression level will be used when
# capturing a disk. If it is not set, the gzip compression level is controlled by the xCAT/ZHCP
# side, and the default is 6.
#zvm_image_compression_level=6

# If zvm_config_drive_inject_password is set to be False, this password will be
# used as default os root password for the new booted vm.
#zvm_image_default_password=xxxxxxxx

# The path that images will be stored (snapshot, deploy etc)
#zvm_image_tmp_path = /var/lib/nova/images

# Timeout value for spawn in seconds, if new spawn machine can’t be reachable
# after this value, deploy will report error “Failed to power on instance”
#zvm_reachable_timeout=300

# The name of xCAT SCSI pool. Users can specify any name as their wish. xCAT will
# create and manage it.
#zvm_scsi_pool=
<%= "zvm_scsi_pool=#{node[:nova][:zvm][:zvm_scsi_pool]}" if @libvirt_type.eql?('zvm') %>

# The default password for a newly created z/VM user ID.
#zvm_user_default_password = dfltpass

# Default template of user directory for new servers
# User should not use lnxdflt but should define his own profile.
#zvm_user_profile=OSDFLT
<%= "zvm_user_profile=#{node[:nova][:zvm][:zvm_user_profile]}" if @libvirt_type.eql?('zvm') %>

#Live migration
#Choose one of “ARCHITECTURE”, “DOMAIN”, "NONE" or “STORAGE”
#zvm_vmrelocate_force=

#Timeout value for reading xCAT response.
#zvm_xcat_connection_timeout=3600

# The xCAT master node (the node name in xCAT definition)
#zvm_xcat_master=
<%= "zvm_xcat_master=#{node[:nova][:zvm][:zvm_xcat_master]}" if @libvirt_type.eql?('zvm') %>

# The password of xCAT server which will be used for REST API call
#zvm_xcat_password=
<%= "zvm_xcat_password=#{node[:nova][:zvm][:zvm_xcat_password]}" if @libvirt_type.eql?('zvm') %>

# The xCAT server IP that this nova compute node operates on
#zvm_xcat_server=
<%= "zvm_xcat_server=#{node[:nova][:zvm][:zvm_xcat_server]}" if @libvirt_type.eql?('zvm') %>

# The user name of xCAT server which will be used for REST API call
#zvm_xcat_username=
<%= "zvm_xcat_username=#{node[:nova][:zvm][:zvm_xcat_username]}" if @libvirt_type.eql?('zvm') %>

# The list of FCPs used only by xCAT HCP node. It must be different to zvm_fcp_list.
# Any FCP exist in both zvm_fcp_list and zvm_zhcp_fcp_list leads to errors. The format
# of this variable should look like “ min1-max1;min2-max2;min3-max3”. Strongly
# recommend to specify only one FCP for HCP to avoid resource waste. Please contact
# your z/VM system manager if you don’t know what FCPs you can use.
#zvm_zhcp_fcp_list=B159

0 comments on commit bebb2af

Please sign in to comment.