Hyphens in var names produce warnings (bug 925718)

Change-Id: Ib1b81273e2b2ec5e56dead920252684a997ce12d

files/keystone.conf

@@ -20,7 +20,7 @@ backends = keystone.backends.sqlalchemy
 
 # Dictionary Maps every service to a header.Missing services would get header
 # X_(SERVICE_NAME) Key => Service Name, Value => Header Name
-service-header-mappings = {
+service_header_mappings = {
 	'nova' : 'X-Server-Management-Url',
 	'swift' : 'X-Storage-Url',
 	'cdn' : 'X-CDN-Management-Url'}
@@ -64,13 +64,13 @@ ca_certs = /etc/keystone/ssl/certs/ca.pem
 cert_required = True
 
 #Role that allows to perform admin operations.
-keystone-admin-role = admin
+keystone_admin_role = admin
 
 #Role that allows to perform service admin operations.
-keystone-service-admin-role = KeystoneServiceAdmin
+keystone_service_admin_role = KeystoneServiceAdmin
 
 #Tells whether password user need to be hashed in the backend
-hash-password = True
+hash_password = True
 
 [keystone.backends.sqlalchemy]
 # SQLAlchemy connection string for the reference implementation registry