Permalink
Browse files

Replace numerous occurances of 'Identity' with 'ImageService'

  • Loading branch information...
1 parent 7b9986c commit 800b30655373da12fff335c751020e84c8a6edd4 Martin Loschwitz committed Apr 3, 2012
Showing with 19 additions and 19 deletions.
  1. +9 −9 tools/ocf/glance-api
  2. +10 −10 tools/ocf/glance-registry
View
@@ -114,33 +114,33 @@ The pid file to use for this OpenStack ImageService (glance-api) instance
<parameter name="os_username" unique="0" required="0">
<longdesc lang="en">
-The username to use when logging into Identity (glance-api) for monitoring purposes
+The username to use when logging into ImageService (glance-api) for monitoring purposes
</longdesc>
-<shortdesc lang="en">Identity (glance-api) monitoring login</shortdesc>
+<shortdesc lang="en">ImageService (glance-api) monitoring login</shortdesc>
<content type="string" />
</parameter>
<parameter name="os_password" unique="0" required="0">
<longdesc lang="en">
-The password to use when logging into Identity (glance-api) for monitoring purposes
+The password to use when logging into ImageService (glance-api) for monitoring purposes
</longdesc>
-<shortdesc lang="en">Identity (glance-api) monitoring password</shortdesc>
+<shortdesc lang="en">ImageService (glance-api) monitoring password</shortdesc>
<content type="string" />
</parameter>
<parameter name="os_tenant_name" unique="0" required="0">
<longdesc lang="en">
-The tenant to use when logging into Identity (glance-api) for monitoring purposes
+The tenant to use when logging into ImageService (glance-api) for monitoring purposes
</longdesc>
-<shortdesc lang="en">Identity (glance-api) monitoring tenant</shortdesc>
+<shortdesc lang="en">ImageService (glance-api) monitoring tenant</shortdesc>
<content type="string" />
</parameter>
<parameter name="os_auth_url" unique="0" required="0">
<longdesc lang="en">
-The URL pointing to this Identity (glance-api) instance to use when logging in for monitoring purposes
+The URL pointing to this ImageService (glance-api) instance to use when logging in for monitoring purposes
</longdesc>
-<shortdesc lang="en">Identity (glance-api) URL for monitoring login</shortdesc>
+<shortdesc lang="en">ImageService (glance-api) URL for monitoring login</shortdesc>
<content type="string" />
</parameter>
@@ -249,7 +249,7 @@ glance_api_monitor() {
index > /dev/null 2>&1; fi
rc=$?
if [ $rc -ne 0 ]; then
- ocf_log err "Failed to connect to the OpenStack Identity (glance-api): $rc"
+ ocf_log err "Failed to connect to the OpenStack ImageService (glance-api): $rc"
return $OCF_NOT_RUNNING
fi
fi
@@ -125,42 +125,42 @@ The default URL to use for monitoring this instance (glance-registry) via curl
<parameter name="keystone_url" unique="0" required="0">
<longdesc lang="en">
-The default URL to use to acquire a Identity (glance-api) token for monitoring this instance
+The default URL to use to acquire a ImageService (glance-registry) token for monitoring this instance
of OpenStack ImageService (glance-registry)
</longdesc>
-<shortdesc lang="en">OpenStack Identity (glance-api) url</shortdesc>
+<shortdesc lang="en">OpenStack ImageService (glance-registry) url</shortdesc>
<content type="string" default="${OCF_RESKEY_keystone_url_default}" />
</parameter>
<parameter name="os_username" unique="0" required="0">
<longdesc lang="en">
-The username to use when logging into Identity (glance-api) for monitoring purposes
+The username to use when connecting with ImageService (glance-registry) for monitoring purposes
</longdesc>
-<shortdesc lang="en">Identity (glance-api) monitoring login</shortdesc>
+<shortdesc lang="en">ImageService (glance-registry) monitoring login</shortdesc>
<content type="string" />
</parameter>
<parameter name="os_password" unique="0" required="0">
<longdesc lang="en">
-The password to use when logging into Identity (glance-api) for monitoring purposes
+The password to use when connecting ImageService (glance-registry) for monitoring purposes
</longdesc>
-<shortdesc lang="en">Identity (glance-api) monitoring password</shortdesc>
+<shortdesc lang="en">ImageService (glance-registry) monitoring password</shortdesc>
<content type="string" />
</parameter>
<parameter name="os_tenant_name" unique="0" required="0">
<longdesc lang="en">
-The tenant to use when logging into Identity (glance-api) for monitoring purposes
+The tenant to use when connecting ImageService (glance-registry) for monitoring purposes
</longdesc>
-<shortdesc lang="en">Identity (glance-api) monitoring tenant</shortdesc>
+<shortdesc lang="en">ImageService (glance-registry) monitoring tenant</shortdesc>
<content type="string" />
</parameter>
<parameter name="os_auth_url" unique="0" required="0">
<longdesc lang="en">
-The URL pointing to this Identity (glance-api) instance to use when logging in for monitoring purposes
+The URL pointing to this ImageService (glance-registry) instance to use when connecting for monitoring purposes
</longdesc>
-<shortdesc lang="en">Identity (glance-api) URL for monitoring login</shortdesc>
+<shortdesc lang="en">ImageService (glance-registry) URL for monitoring login</shortdesc>
<content type="string" />
</parameter>

0 comments on commit 800b306

Please sign in to comment.