From a90290cb0730e38c3a633348d3693fa3492ea787 Mon Sep 17 00:00:00 2001
From: Jan Klare <j.klare@cloudbau.de>
Date: Thu, 23 Feb 2017 17:06:14 +0100
Subject: [PATCH] starting ocata development patch

Change-Id: I1bf3ea7daa127ebf4545e6c9ea809ef4351efc4b
---
 .rubocop_todo.yml | 39 +++++++++++++++++++++++----------------
 metadata.rb       |  6 +++---
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index ba011b9..3776810 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,16 +1,23 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-05-28 16:12:46 -0500 using RuboCop version 0.29.1.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 2
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/ClassAndModuleChildren:
-  Enabled: false
-
-# Offense count: 1
-# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
-Style/Next:
-  Enabled: false
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2017-02-23 16:58:27 +0100 using RuboCop version 0.39.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: nested, compact
+Style/ClassAndModuleChildren:
+  Exclude:
+    - 'recipes/apache2-server.rb'
+    - 'recipes/horizon.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
+# SupportedStyles: skip_modifier_ifs, always
+Style/Next:
+  Exclude:
+    - 'spec/horizon_spec.rb'
diff --git a/metadata.rb b/metadata.rb
index 0d7936d..792a6b0 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -6,13 +6,13 @@ source_url 'https://github.com/openstack/cookbook-openstack-dashboard' if respon
 license 'Apache 2.0'
 description 'Installs/Configures the OpenStack Dashboard (Horizon)'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '14.0.0'
+version '15.0.0'
 
 %w(ubuntu redhat centos).each do |os|
   supports os
 end
 
 depends 'apache2', '~> 3.2'
-depends 'openstack-common', '>= 14.0.0'
-depends 'openstack-identity', '>= 14.0.0'
+depends 'openstack-common', '>= 15.0.0'
+depends 'openstack-identity', '>= 15.0.0'
 depends 'poise-python', '~> 1.5.1'