Merge pull request #153 from redBorder/development

Release 2.0.1

CHANGELOG.md

@@ -1,6 +1,17 @@
 cookbook-rb-manager CHANGELOG
 ===============
 
+## 2.0.1
+
+  - Miguel Alvarez
+    - [d6ecac2][e748afe][2405993]  Fix lint issues
+    - [292288d] Add hosts in node data
+    - [fd63ad2] Fix prepare and configure
+    - [ac54c02] Proper use of s3 hosts
+    - [f08e447] Configure minio nodes and load balancer
+    - [78f1562][4db8fa1][e101c2d][3220e71][4ec77f8][d89bd26][ed91ff3] Updates
+    - [6e7680a] Delete resources/templates/default/minio.erb
+
 ## 2.0.0
 
   - Miguel Álvarez

resources/attributes/default.rb

@@ -27,6 +27,7 @@
 
 # webui
 default['redborder']['webui']['port'] = 8001
+default['redborder']['webui']['hosts'] = []
 
 # memcached
 default['redborder']['memcached']['elasticache'] = false

resources/metadata.rb

@@ -3,7 +3,7 @@
 maintainer_email '[email protected]'
 license          'AGPL-3.0'
 description      'Installs/Configures redborder manager'
-version          '2.0.0'
+version          '2.0.1'
 
 depends 'rb-common'
 depends 'chef-server'

resources/recipes/configure.rb

@@ -307,6 +307,7 @@
 end
 
 webui_config 'Configure Nginx WebUI' do
+  hosts node['redborder']['webui']['hosts']
   cdomain node['redborder']['cdomain']
   port node['redborder']['webui']['port']
   if manager_services['webui'] && manager_services['nginx']

resources/recipes/prepare_system.rb

@@ -107,15 +107,19 @@
 # zk_hosts = node['redborder']['managers_per_services']['zookeeper'].map {|z| '#{z}.node:#{zk_port}'}.join(',')
 node.default['redborder']['zookeeper']['zk_hosts'] = "zookeeper.service.#{node['redborder']['cdomain']}:#{node['redborder']['zookeeper']['port']}"
 
-# Set all nodes with s3 configured (nginx load balancer)
-s3_hosts = node['redborder']['managers_per_services']['s3'].map { |z| "#{z}.node:9000" }
-node.default['redborder']['s3']['s3_hosts'] = s3_hosts
+# set webui hosts
+webui_hosts = node['redborder']['managers_per_services']['webui'].map { |z| "#{z}.node" }
+node.default['redborder']['webui']['hosts'] = webui_hosts
 
 # set kafka host index if kafka is enabled in this host
 if node['redborder']['managers_per_services']['kafka'].include?(node.name)
   node.default['redborder']['kafka']['host_index'] = node['redborder']['managers_per_services']['kafka'].index(node.name)
 end
 
+# Set all nodes with s3 configured (nginx load balancer)
+s3_hosts = node['redborder']['managers_per_services']['s3'].map { |z| "#{z}.node:9000" }
+node.default['redborder']['s3']['s3_hosts'] = s3_hosts
+
 # set druid realtime partition id (its needed in cluster mode for druid brokers)
 if node['redborder']['managers_per_services']['druid-realtime'].include?(node.name)
   node.default['redborder']['druid']['realtime']['partition_num'] = node['redborder']['managers_per_services']['druid-realtime'].index(node.name)