Merge "Change according to preferred word choice"

This commit is contained in:
Jenkins 2016-12-07 17:44:16 +00:00 committed by Gerrit Code Review
commit cdccc1dca2
3 changed files with 27 additions and 27 deletions

View File

@ -11,7 +11,7 @@ Team and repository tags
Freezer Disaster Recovery
=========================
freezer-dr, Openstack Compute node High Available provides compute node high availability for OpenStack.
freezer-dr, OpenStack Compute node High Available provides compute node high availability for OpenStack.
Simply freezer-dr monitors all compute nodes running in a cloud deployment and if there is any failure
in one of the compute nodes freezer-dr will fence this compute node then freezer-dr will try to evacuate all
running instances on this compute node, finally freezer-dr will notify all users who have workload/instances
@ -19,7 +19,7 @@ running on this compute node as well as will notify the cloud administrators.
freezer-dr has a pluggable architecture so it can be used with:
1. Any monitoring system to monitor the compute nodes (currently we support only native openstack services status)
1. Any monitoring system to monitor the compute nodes (currently we support only native OpenStack services status)
2. Any fencing driver (currently supports IPMI, libvirt, ...)
3. Any evacuation driver (currently supports evacuate api call, may be migrate ??)
4. Any notification system (currently supports email based notifications, ...)

View File

@ -176,41 +176,41 @@
# From freezer-dr
#
# Openstack auth URI i.e. http://controller:5000 (string value)
# OpenStack auth URI i.e. http://controller:5000 (string value)
#auth_uri = <None>
# Openstack auth URL i.e. http://controller:35357/v3 (string value)
# OpenStack auth URL i.e. http://controller:35357/v3 (string value)
#auth_url = <None>
# Openstack auth plugin i.e. ( password, token, ...) password is the only
# OpenStack auth plugin i.e. ( password, token, ...) password is the only
# available plugin for the time being (string value)
#auth_plugin = <None>
# Openstack username (string value)
# OpenStack username (string value)
#username = <None>
# Openstack Password (string value)
# OpenStack Password (string value)
#password = <None>
# Openstack Project Name. (string value)
# OpenStack Project Name. (string value)
#project_name = <None>
# Openstack domain Name. (string value)
# OpenStack domain Name. (string value)
#domain_name = <None>
# Openstack Project Domain id, default is Default (string value)
# OpenStack Project Domain id, default is Default (string value)
#project_domain_id = <None>
# Openstack user Domain id, default is Default (string value)
# OpenStack user Domain id, default is Default (string value)
#user_domain_id = <None>
# Openstack Project Domain name, default is Default (string value)
# OpenStack Project Domain name, default is Default (string value)
#project_domain_name = <None>
# Openstack user Domain name, default is Default (string value)
# OpenStack user Domain name, default is Default (string value)
#user_domain_name = <None>
# Openstack Authentication arguments you can pass it here as Key:Value,
# OpenStack Authentication arguments you can pass it here as Key:Value,
# Key1:Value1, ... (dict value)
#kwargs =

View File

@ -66,39 +66,39 @@ _FENCER = [
_KEYSTONE_AUTH_TOKEN = [
cfg.StrOpt('auth_uri',
help='Openstack auth URI i.e. http://controller:5000',
help='OpenStack auth URI i.e. http://controller:5000',
dest='auth_uri'), cfg.StrOpt(
'auth_url',
help='Openstack auth URL i.e. http://controller:35357/v3',
help='OpenStack auth URL i.e. http://controller:35357/v3',
dest='auth_url'),
cfg.StrOpt('auth_plugin',
help='Openstack auth plugin i.e. ( password, token, ...) '
help='OpenStack auth plugin i.e. ( password, token, ...) '
'password is the only available plugin for the time being',
dest='auth_plugin'), cfg.StrOpt('username',
help='Openstack username',
help='OpenStack username',
dest='username'),
cfg.StrOpt('password',
help='Openstack Password',
help='OpenStack Password',
dest='password'), cfg.StrOpt('project_name',
help='Openstack Project Name.',
help='OpenStack Project Name.',
dest='project_name'),
cfg.StrOpt('domain_name',
help='Openstack domain Name.',
help='OpenStack domain Name.',
dest='domain_name'), cfg.StrOpt(
'project_domain_id',
help='Openstack Project Domain id, default is Default',
help='OpenStack Project Domain id, default is Default',
dest='project_domain_id'),
cfg.StrOpt('user_domain_id',
help='Openstack user Domain id, default is Default',
help='OpenStack user Domain id, default is Default',
dest='user_domain_id'), cfg.StrOpt(
'project_domain_name',
help='Openstack Project Domain name, default is Default',
help='OpenStack Project Domain name, default is Default',
dest='project_domain_name'), cfg.StrOpt(
'user_domain_name',
help='Openstack user Domain name, default is Default',
help='OpenStack user Domain name, default is Default',
dest='user_domain_name'),
cfg.DictOpt('kwargs',
help='Openstack Authentication arguments you can pass it here '
help='OpenStack Authentication arguments you can pass it here '
'as Key:Value, Key1:Value1, ... ',
dest='kwargs',
default={})
@ -305,7 +305,7 @@ def configure():
# Keystone Auth
keystone_grp = cfg.OptGroup('keystone_authtoken',
title='Keystone Auth Options',
help='Openstack Credentials to call the nova '
help='OpenStack Credentials to call the nova '
'APIs to evacuate ')
CONF.register_group(keystone_grp)
CONF.register_opts(_KEYSTONE_AUTH_TOKEN, group='keystone_authtoken')