Merge "Add base cinder common interface"

1 files changed, 97 insertions, 16 deletions

diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample
index 566d92db5..3628fc1a7 100644
--- a/etc/ironic/ironic.conf.sample
+++ b/etc/ironic/ironic.conf.sample
@@ -900,6 +900,103 @@
 #action_interval = 10
 
 
+[cinder]
+
+#
+# From ironic
+#
+
+# Authentication URL (string value)
+#auth_url = <None>
+
+# Authentication type to load (string value)
+# Deprecated group/name - [cinder]/auth_plugin
+#auth_type = <None>
+
+# PEM encoded Certificate Authority to use when verifying
+# HTTPs connections. (string value)
+#cafile = <None>
+
+# PEM encoded client certificate cert file (string value)
+#certfile = <None>
+
+# Optional domain ID to use with v3 and v2 parameters. It will
+# be used for both the user and project domain in v3 and
+# ignored in v2 authentication. (string value)
+#default_domain_id = <None>
+
+# Optional domain name to use with v3 API and v2 parameters.
+# It will be used for both the user and project domain in v3
+# and ignored in v2 authentication. (string value)
+#default_domain_name = <None>
+
+# Domain ID to scope to (string value)
+#domain_id = <None>
+
+# Domain name to scope to (string value)
+#domain_name = <None>
+
+# Verify HTTPS connections. (boolean value)
+#insecure = false
+
+# PEM encoded client certificate key file (string value)
+#keyfile = <None>
+
+# User's password (string value)
+#password = <None>
+
+# Domain ID containing project (string value)
+#project_domain_id = <None>
+
+# Domain name containing project (string value)
+#project_domain_name = <None>
+
+# Project ID to scope to (string value)
+# Deprecated group/name - [cinder]/tenant-id
+#project_id = <None>
+
+# Project name to scope to (string value)
+# Deprecated group/name - [cinder]/tenant-name
+#project_name = <None>
+
+# Client retries in the case of a failed request connection.
+# (integer value)
+#retries = 3
+
+# Tenant ID (string value)
+#tenant_id = <None>
+
+# Tenant Name (string value)
+#tenant_name = <None>
+
+# Timeout value for http requests (integer value)
+#timeout = <None>
+
+# Trust ID (string value)
+#trust_id = <None>
+
+# URL for connecting to cinder. If set, the value must start
+# with either http:// or https://. (string value)
+#url = <None>
+
+# Timeout value for connecting to cinder in seconds. (integer
+# value)
+#url_timeout = 30
+
+# User's domain id (string value)
+#user_domain_id = <None>
+
+# User's domain name (string value)
+#user_domain_name = <None>
+
+# User id (string value)
+#user_id = <None>
+
+# Username (string value)
+# Deprecated group/name - [cinder]/user-name
+#username = <None>
+
+
 [cisco_ucs]
 
 #
@@ -2081,22 +2178,6 @@
 # Reason: PKI token format is no longer supported.
 #hash_algorithms = md5
 
-# A choice of roles that must be present in a service token.
-# Service tokens are allowed to request that an expired token
-# can be used and so this check should tightly control that
-# only actual services should be sending this token. Roles
-# here are applied as an ANY check so any role in this list
-# must be present. For backwards compatibility reasons this
-# currently only affects the allow_expired check. (list value)
-#service_token_roles = service
-
-# For backwards compatibility reasons we must let valid
-# service tokens pass that don't pass the service_token_roles
-# check as valid. Setting this true will become the default in
-# a future release and should be enabled if possible. (boolean
-# value)
-#service_token_roles_required = false
-
 # Authentication type to load (string value)
 # Deprecated group/name - [keystone_authtoken]/auth_plugin
 #auth_type = <None>