From 6ee7501c83de12db6e2ac3494dbee136bdd72bb7 Mon Sep 17 00:00:00 2001
From: Samuel Cassiba <s@cassiba.com>
Date: Fri, 2 Mar 2018 18:19:13 -0800
Subject: [PATCH] starting queens development patch and use git.openstack.org

* use git.openstack.org instead of github for berks dependency
resolution
* drop unnecessary test, as TLS is the default install

Change-Id: I58b140b6548eb7f8e3317ce566a7082623c9fc4f
---
 Berksfile                    | 2 +-
 metadata.rb                  | 4 ++--
 spec/rabbitmq-server_spec.rb | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Berksfile b/Berksfile
index 7548790..e195465 100644
--- a/Berksfile
+++ b/Berksfile
@@ -3,4 +3,4 @@ source 'https://supermarket.chef.io'
 metadata
 
 cookbook 'openstack-common',
-  github: 'openstack/cookbook-openstack-common'
+  git: 'https://git.openstack.org/openstack/cookbook-openstack-common'
diff --git a/metadata.rb b/metadata.rb
index 3b6f7f2..61be00c 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -3,7 +3,7 @@ maintainer       'openstack-chef'
 maintainer_email 'openstack-dev@lists.openstack.org'
 license          'Apache-2.0'
 description      'Provides the shared messaging configuration for Chef for OpenStack.'
-version          '16.0.0'
+version          '17.0.0'
 
 recipe 'server', 'Installs and configures server packages for messaging queue used by the deployment.'
 recipe 'rabbitmq-server', 'Installs and configures RabbitMQ and is called via the server recipe'
@@ -12,7 +12,7 @@ recipe 'rabbitmq-server', 'Installs and configures RabbitMQ and is called via th
   supports os
 end
 
-depends 'openstack-common', '>= 16.0.0'
+depends 'openstack-common', '>= 17.0.0'
 depends 'rabbitmq'
 
 issues_url 'https://launchpad.net/openstack-chef' if respond_to?(:issues_url)
diff --git a/spec/rabbitmq-server_spec.rb b/spec/rabbitmq-server_spec.rb
index faee047..133d34b 100644
--- a/spec/rabbitmq-server_spec.rb
+++ b/spec/rabbitmq-server_spec.rb
@@ -38,8 +38,6 @@ describe 'openstack-ops-messaging::rabbitmq-server' do
 
       it 'overrides rabbit ssl attributes' do
         expect(chef_run.node['openstack']['mq']['rabbitmq']['use_ssl']).to be_truthy
-        expect(chef_run.node['rabbitmq']['ssl_port']).to eq('1234')
-        expect(chef_run.node['rabbitmq']['port']).to be_nil
       end
     end