a little modified.

diff --git a/roles/Berksfile b/roles/Berksfile
index d06ed93..689a68e 100644 (file)
--- a/roles/Berksfile
+++ b/roles/Berksfile
@@ -17,7 +17,6 @@
 #grid_chef_repo = 'git://git.osdn.jp/gitroot/metasearch/grid-chef-repo.git'
 
 # for ver. 3.x
-source 'http://berks-api.gaea.test:6280'
 #source 'http://gpm00.grid.example.com:6280'
 source 'https://api.berkshelf.com'
 # for ver. 2.x

diff --git a/roles/grid-gpm.rb b/roles/grid-gpm.rb
index fc6a819..d5037d5 100644 (file)
--- a/roles/grid-gpm.rb
+++ b/roles/grid-gpm.rb
@@ -57,7 +57,8 @@ override_attributes(
         {
           'type' => 'chef_server',
           'options' => {
-            'url' => 'https://gpm00.grid.example.com/organizations/grid',
+            #'url' => 'https://gpm00.grid.example.com/organizations/grid',  # chef12
+            'url' => 'https://gpm00.grid.example.com',  # chef11
             'client_key' => '/etc/berkshelf/api-server/grid-berkshelf.pem',
             'client_name' => 'berkshelf'
           }