Use UUID as the default token provider

Keystone changed it's default token provider to UUID for Juno.
This patch changes the puppet-keystone default to match.

One of the existing spec tests was incorrect, and had to be removed.
The test was expecting signing certificate setup to be performed wen
enable_ssl is True, but that setup is really only performed when
configuring PKI format tokens.  There is already a test that covers
properly enabling SSL and PKI token format configuration, so this
incorrect test can be removed.

Change-Id: Id838bbb06602b9fe5331329c74872b62932ace1b
Closes-bug: #1372991

Author: nkinder

manifests/init.pp

@@ -27,7 +27,7 @@
 #   [catalog_template_file] Path to the catalog used if catalog_type equals 'template'.
 #     Defaults to '/etc/keystone/default_catalog.templates'
 #   [token_provider] Format keystone uses for tokens. Optional.
-#     Defaults to 'keystone.token.providers.pki.Provider'
+#     Defaults to 'keystone.token.providers.uuid.Provider'
 #     Supports PKI and UUID.
 #   [token_driver] Driver to use for managing tokens.
 #     Optional.  Defaults to 'keystone.token.backends.sql.Token'
@@ -232,7 +232,7 @@
   $catalog_driver        = false,
   $catalog_template_file = '/etc/keystone/default_catalog.templates',
   $token_format          = false,
-  $token_provider        = 'keystone.token.providers.pki.Provider',
+  $token_provider        = 'keystone.token.providers.uuid.Provider',
   $token_driver          = 'keystone.token.backends.sql.Token',
   $token_expiration      = 3600,
   $public_endpoint       = false,

spec/classes/keystone_spec.rb

@@ -19,7 +19,7 @@
       'debug'                 => false,
       'catalog_type'          => 'sql',
       'catalog_driver'        => false,
-      'token_provider'        => 'keystone.token.providers.pki.Provider',
+      'token_provider'        => 'keystone.token.providers.uuid.Provider',
       'token_driver'          => 'keystone.token.backends.sql.Token',
       'cache_dir'             => '/var/cache/keystone',
       'enable_ssl'            => false,
@@ -475,28 +475,6 @@
     it { should contain_keystone_config('DEFAULT/admin_bind_host').with_value('10.0.0.2') }
   end
 
-  describe 'when configuring as SSL' do
-    let :params do
-      {
-        'admin_token' => 'service_token',
-        'enable_ssl'  => true
-      }
-    end
-    it { should contain_exec('keystone-manage pki_setup').with(
-      :creates => '/etc/keystone/ssl/private/signing_key.pem'
-    ) }
-    it { should contain_file('/var/cache/keystone').with_ensure('directory') }
-    describe 'when overriding the cache dir' do
-      let :params do
-        {
-          'admin_token' => 'service_token',
-          'enable_ssl'  => true,
-          'cache_dir'   => '/var/lib/cache/keystone'
-        }
-      end
-      it { should contain_file('/var/lib/cache/keystone') }
-    end
-  end
   describe 'when enabling SSL' do
     let :params do
       {