From dbea65b625d9937ced5ddde9c7f304c1928ef236 Mon Sep 17 00:00:00 2001
From: Jens Rosenboom <j.rosenboom@x-ion.de>
Date: Tue, 29 Mar 2016 12:38:13 +0200
Subject: [PATCH] Update dependency for apache2 cookbook

Version 3.2.0 of the apache2 cookbook was released, update our
dependency so that we are compatible with the other openstack
cookbooks and berkshelf resolution can succeed. Drop the reference to
the github version.

Change-Id: I55110726ee846f579849ea039a759ef1a0ad9bff
---
 Berksfile   | 4 ----
 metadata.rb | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Berksfile b/Berksfile
index eff649c..50da25e 100644
--- a/Berksfile
+++ b/Berksfile
@@ -4,7 +4,3 @@ metadata
 
 cookbook "openstack-common",
   github: "openstack/cookbook-openstack-common"
-# use the current master branch until the new apache listen logic has been
-# released
-cookbook 'apache2',
-  github: "svanzoest-cookbooks/apache2"
diff --git a/metadata.rb b/metadata.rb
index b450333..65f6c2a 100755
--- a/metadata.rb
+++ b/metadata.rb
@@ -15,5 +15,5 @@ recipe 'openstack-identity::openrc', 'Creates openrc file'
   supports os
 end
 
-depends 'apache2', '~> 3.1.0'
+depends 'apache2', '~> 3.1'
 depends 'openstack-common', '>= 13.0.0'