Allow keystone start delay to be configured

Change-Id: Ibe52e26e61f204d6bac1a335b1d93731a9d1f1bc
Closes-Bug: #1453842

attributes/default.rb

@@ -35,6 +35,9 @@ default['credentials']['EC2']['admin']['secret'] = ''
 default['openstack']['identity']['verbose'] = 'False'
 default['openstack']['identity']['debug'] = 'False'
 
+# Keystone service startup delay, in seconds
+default['openstack']['identity']['start_delay'] = 10
+
 # Specify a location to retrieve keystone-paste.ini from
 # which can either be a remote url using http:// or a
 # local path to a file using file:// which would generally

recipes/server.rb

@@ -60,7 +60,7 @@ platform_options['keystone_packages'].each do |pkg|
 end
 
 execute 'Keystone: sleep' do
-  command 'sleep 10s'
+  command "sleep #{node['openstack']['identity']['start_delay']}s"
 
   action :nothing
 end

spec/server_spec.rb

@@ -67,9 +67,17 @@ describe 'openstack-identity::server' do
       expect(chef_run).to enable_service('keystone')
     end
 
-    it 'sleep on keystone service enable' do
-      expect(chef_run.service('keystone')).to notify(
-        'execute[Keystone: sleep]').to(:run)
+    describe 'sleep on keystone service enable' do
+      let(:sleep) { chef_run.execute('Keystone: sleep') }
+
+      it 'has sleep notified to run' do
+        expect(chef_run.service('keystone')).to notify(
+          "execute[#{sleep.name}]").to(:run)
+      end
+
+      it 'has correct sleep seconds' do
+        expect(sleep.command).to eq('sleep 10s')
+      end
     end
 
     it 'has flush tokens cronjob running every day at 3:30am' do