From a8b664d74cf779ae7178356267661b8b193b3c68 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Tue, 29 Nov 2016 00:29:13 +0000 Subject: [PATCH] Change according to preferred word choice According to preferred word choice document [1] we should use only "OpenStack" term in our guides, READme documents and so on. This patch fix our docs and other files according to these requirements. [1] http://docs.openstack.org/contributor-guide/writing-style/word-choice.html Change-Id: Iff395ad887f733245da338ec707b862a8ec42d8b --- README.rst | 4 ++-- etc/freezer-dr.conf.sample | 24 ++++++++++++------------ freezer_dr/common/config.py | 26 +++++++++++++------------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/README.rst b/README.rst index 6afb3c4..9ff7f4c 100644 --- a/README.rst +++ b/README.rst @@ -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, ...) diff --git a/etc/freezer-dr.conf.sample b/etc/freezer-dr.conf.sample index 54ce5d1..f25883e 100644 --- a/etc/freezer-dr.conf.sample +++ b/etc/freezer-dr.conf.sample @@ -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 = -# Openstack auth URL i.e. http://controller:35357/v3 (string value) +# OpenStack auth URL i.e. http://controller:35357/v3 (string value) #auth_url = -# 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 = -# Openstack username (string value) +# OpenStack username (string value) #username = -# Openstack Password (string value) +# OpenStack Password (string value) #password = -# Openstack Project Name. (string value) +# OpenStack Project Name. (string value) #project_name = -# Openstack domain Name. (string value) +# OpenStack domain Name. (string value) #domain_name = -# Openstack Project Domain id, default is Default (string value) +# OpenStack Project Domain id, default is Default (string value) #project_domain_id = -# Openstack user Domain id, default is Default (string value) +# OpenStack user Domain id, default is Default (string value) #user_domain_id = -# Openstack Project Domain name, default is Default (string value) +# OpenStack Project Domain name, default is Default (string value) #project_domain_name = -# Openstack user Domain name, default is Default (string value) +# OpenStack user Domain name, default is Default (string value) #user_domain_name = -# 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 = diff --git a/freezer_dr/common/config.py b/freezer_dr/common/config.py index 0fd6f6c..2b64e43 100644 --- a/freezer_dr/common/config.py +++ b/freezer_dr/common/config.py @@ -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')