Browse Source

starting queens development patch and use git.openstack.org

* use git.openstack.org instead of github for berks dependency
resolution

Depends-On: https://review.openstack.org/549345
Change-Id: Iddb51ac401737a7a453560f03ff8dc468b1b67a1
Samuel Cassiba 1 year ago
parent
commit
9751d5545b
2 changed files with 12 additions and 8 deletions
  1. 9
    5
      Berksfile
  2. 3
    3
      metadata.rb

+ 9
- 5
Berksfile View File

@@ -1,10 +1,14 @@
1 1
 source 'https://supermarket.chef.io'
2 2
 
3
-metadata
3
+%w(common identity).each do |cookbook|
4
+  if Dir.exist?("../cookbook-openstack-#{cookbook}")
5
+    cookbook "openstack-#{cookbook}", path: "../cookbook-openstack-#{cookbook}"
6
+  else
7
+    cookbook "openstack-#{cookbook}", git: "https://git.openstack.org/openstack/cookbook-openstack-#{cookbook}"
8
+  end
9
+end
4 10
 
5
-cookbook 'openstack-identity',
6
-  github: 'openstack/cookbook-openstack-identity'
7
-cookbook 'openstack-common',
8
-  github: 'openstack/cookbook-openstack-common'
9 11
 cookbook 'openstackclient',
10 12
   github: 'cloudbau/cookbook-openstackclient'
13
+
14
+metadata

+ 3
- 3
metadata.rb View File

@@ -4,14 +4,14 @@ maintainer_email 'openstack-dev@lists.openstack.org'
4 4
 license          'Apache-2.0'
5 5
 description      'Installs and configures the Heat Service'
6 6
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
7
-version          '16.0.0'
7
+version          '17.0.0'
8 8
 
9 9
 %w(ubuntu redhat centos).each do |os|
10 10
   supports os
11 11
 end
12 12
 
13
-depends 'openstack-common', '>= 16.0.0'
14
-depends 'openstack-identity', '>= 16.0.0'
13
+depends 'openstack-common', '>= 17.0.0'
14
+depends 'openstack-identity', '>= 17.0.0'
15 15
 depends 'openstackclient'
16 16
 
17 17
 issues_url 'https://launchpad.net/openstack-chef' if respond_to?(:issues_url)

Loading…
Cancel
Save