Merge pull request #7 from maf23/role_refactor

Role refactor

Author: ismell

Diff for: recipes/application_server.rb

@@ -0,0 +1,23 @@
+#
+# Cookbook Name:: docker-registry
+# Recipe:: application_server
+# Author:: Raul E Rangel (<[email protected]>)
+#
+# Copyright 2014, Raul E Rangel
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+node.default['docker-registry']['application_server'] = true
+
+include_recipe "docker-registry"

Diff for: recipes/default.rb

@@ -127,7 +127,7 @@
   end
 
   gunicorn do
-    only_if { node['roles'].include?('docker-registry_application_server') }
+    only_if { node['docker-registry']['application_server'] }
 
     requirements "requirements.txt"
     max_requests node['docker-registry']['max_requests']
@@ -141,7 +141,7 @@
   end
 
   nginx_load_balancer do
-    only_if { node['roles'].include?('docker-registry_load_balancer') }
+    only_if { node['docker-registry']['load_balancer'] }
 
     application_port node['docker-registry']['internal_port']
     application_server_role node['docker-registry']['application_server_role']

Diff for: recipes/load_balancer.rb

@@ -0,0 +1,23 @@
+#
+# Cookbook Name:: docker-registry
+# Recipe:: load_balancer
+# Author:: Raul E Rangel (<[email protected]>)
+#
+# Copyright 2014, Raul E Rangel
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+node.default['docker-registry']['load_balancer'] = true
+
+include_recipe "docker-registry"

Diff for: roles/docker-registry_application_server.json

@@ -8,7 +8,7 @@
   },
   "chef_type": "role",
   "run_list": [
-    "recipe[docker-registry]"
+    "recipe[docker-registry::application_server]"
   ],
   "env_run_lists": {
   }

Diff for: roles/docker-registry_load_balancer.json

@@ -15,7 +15,7 @@
   },
   "chef_type": "role",
   "run_list": [
-    "recipe[docker-registry]"
+    "recipe[docker-registry::load_balancer]"
   ],
   "env_run_lists": {
   }