fix whitespace and quoting

[mirror/dsa-puppet.git] / modules / roles / manifests / keystone.pp

diff --git a/modules/roles/manifests/keystone.pp b/modules/roles/manifests/keystone.pp
index 9f27fb4..81fd6de 100644 (file)
--- a/modules/roles/manifests/keystone.pp
+++ b/modules/roles/manifests/keystone.pp
@@ -5,12 +5,12 @@ class roles::keystone {
        $keystone_dbpass = $roles::openstack::params::keystone_dbpass
        $admin_token     = $roles::openstack::params::admin_token
        $admin_pass      = $roles::openstack::params::admin_pass
-       $rabbit_pass      = $roles::openstack::params::rabbit_pass
+       $rabbit_pass     = $roles::openstack::params::rabbit_pass
 
        class { '::keystone':
                verbose             => true,
                debug               => true,
-               sql_connection      => "postgresql://keystone:${keystone_dbpass}@bmdb1.debian.org/keystone",
+               sql_connection      => "postgresql://keystone:${keystone_dbpass}@bmdb1.debian.org:5435/keystone",
                catalog_type        => 'sql',
                admin_token         => $admin_token,
                enabled             => false,
@@ -19,15 +19,16 @@ class roles::keystone {
                rabbit_password     => $rabbit_pass,
                rabbit_userid       => 'openstack',
                rabbit_virtual_host => '/keystone',
-               memcache_servers    => ['localhost'],
+               memcache_servers    => ['localhost:11211'],
+               cache_backend       => 'keystone.cache.memcache_pool',
        }
        class { 'keystone::roles::admin':
                email    => 'test@puppetlabs.com',
                password => $admin_pass,
        }
        class { 'keystone::endpoint':
-               public_url => "https://${::fqdn}:5000/",
-               admin_url  => "https://${::fqdn}:35357/",
+               public_url => 'https://openstack.bm.debian.org:5000/',
+               admin_url  => 'https://openstack.bm.debian.org:35357/',
        }
 
        include apache