Merge "Allow single list of Zookeeper and cassandra"

spec/acceptance/midonet_agent_spec.rb

@@ -7,7 +7,8 @@ describe 'midonet::agent class' do
       pp = <<-EOS
       include ::midonet::repository
       class { 'midonet_openstack::role::nsdb':
-        client_ip => '127.0.0.1'
+        client_ip => '127.0.0.1',
+        id        => 1
       }
       class { 'midonet::agent':
         zookeeper_hosts => [ { 'ip' => '127.0.0.1', 'port' => '2181' } ],

spec/acceptance/midonet_analytics_spec.rb

@@ -6,6 +6,10 @@ describe 'midonet::analytics class' do
     it 'should install the midonet analytics without any errors' do
       pp = <<-EOS
       include ::midonet::repository
+      class { 'midonet_openstack::role::nsdb':
+        client_ip => '127.0.0.1',
+        id        => 1
+      }
       class { 'midonet::analytics':
         is_mem            => false,
         manage_repo       => false,

spec/acceptance/midonet_cluster_spec.rb

@@ -7,7 +7,8 @@ describe 'midonet::cluster class' do
       pp = <<-EOS
       include ::midonet::repository
       class { 'midonet_openstack::role::nsdb':
-        client_ip => '127.0.0.1'
+        client_ip => '127.0.0.1',
+        id        => 1
       }
       class { 'midonet::cluster':
         zookeeper_hosts       => [{ 'ip' => '127.0.0.1', 'port' => '2181' }],

templates/agent/midolman.conf.erb

@@ -34,7 +34,13 @@
 
 [zookeeper]
 <%- zkarr = Array.new -%>
-<%- @zookeeper_hosts.each do |s| -%>
+<%- zk_hosts = Array.new -%>
+<%- if @zookeeeper_hosts.class == Hash -%>
+  <%- zk_hosts.push(@zookeeper_hosts) -%>
+<%- else -%>
+  <%- zk_hosts = @zookeeper_hosts -%>
+<%- end -%>
+<%- zk_hosts.each do |s| -%>
   <%- zkarr.push("#{s['ip']}:#{s['port'] ||= 2181 }") -%>
 <%- end -%>
 zookeeper_hosts = <%= zkarr.join(",") %>

templates/analytics/midonet.conf.erb

@@ -14,7 +14,13 @@
                                                                                                          │
 [zookeeper]
 <%- zkarr = Array.new -%>
-<%- @zookeeper_hosts.each do |s| -%>
+<%- zk_hosts = Array.new -%>
+<%- if @zookeeeper_hosts.class == Hash -%>
+  <%- zk_hosts.push(@zookeeper_hosts) -%>
+<%- else -%>
+  <%- zk_hosts = @zookeeper_hosts -%>
+<%- end -%>
+<%- zk_hosts.each do |s| -%>
   <%- zkarr.push("#{s['ip']}:#{s['port'] ||= 2181 }") -%>
 <%- end -%>
 zookeeper_hosts = <%= zkarr.join(",") %>

templates/cluster/midonet.conf.erb

@@ -14,7 +14,13 @@
                                                                                                          │
 [zookeeper]
 <%- zkarr = Array.new -%>
-<%- @zookeeper_hosts.each do |s| -%>
+<%- zk_hosts = Array.new -%>
+<%- if @zookeeeper_hosts.class == Hash -%>
+  <%- zk_hosts.push(@zookeeper_hosts) -%>
+<%- else -%>
+  <%- zk_hosts = @zookeeper_hosts -%>
+<%- end -%>
+<%- zk_hosts.each do |s| -%>
   <%- zkarr.push("#{s['ip']}:#{s['port'] ||= 2181 }") -%>
 <%- end -%>
 zookeeper_hosts = <%= zkarr.join(",") %>

templates/cluster/mn-cluster_config.sh.erb

@@ -11,14 +11,26 @@ which mn-conf > /dev/null || {
 cat << EOF | mn-conf set -t default
 zookeeper {
   <%- zkarr = Array.new -%>
-  <%- @zookeeper_hosts.each do |s| -%>
-  <%- zkarr.push("#{s['ip']}:#{s['port'] ||= 2181 }") -%>
+  <%- zk_hosts = Array.new -%>
+  <%- if @zookeeeper_hosts.class == Hash -%>
+    <%- zk_hosts.push(@zookeeper_hosts) -%>
+  <%- else -%>
+    <%- zk_hosts = @zookeeper_hosts -%>
+  <%- end -%>
+  <%- zk_hosts.each do |s| -%>
+    <%- zkarr.push("#{s['ip']}:#{s['port'] ||= 2181 }") -%>
   <%- end -%>
   zookeeper_hosts = "<%= zkarr.join(",") %>"
 }
 
 cassandra {
-  servers = "<%= @cassandra_servers.join(",") %>"
+  <%- cass_hosts = Array.new -%>
+  <%- if @cassandra_servers.class == String -%>
+    <%- cass_hosts.push(@cassandra_servers) -%>
+  <%- else -%>
+    <%- cass_hosts = @cassandra_servers -%>
+  <%- end -%>
+  servers = "<%= cass_hosts.join(",") %>"
 }
 EOF
 echo "cassandra.replication_factor : <%= @cassandra_rep_factor %>" | mn-conf set -t default

templates/gateway/midorc.erb

@@ -35,7 +35,13 @@ USE_SCREEN="True"
 
 # ZK Hosts (comma delimited)
 <%- zkarr = Array.new -%>
-<%- @zookeeper_hosts.each do |s| -%>
+<%- zk_hosts = Array.new -%>
+<%- if @zookeeeper_hosts.class == Hash -%>
+  <%- zk_hosts.push(@zookeeper_hosts) -%>
+<%- else -%>
+  <%- zk_hosts = @zookeeper_hosts -%>
+<%- end -%>
+<%- zk_hosts.each do |s| -%>
   <%- zkarr.push("#{s['ip']}:#{s['port'] ||= 2181 }") -%>
 <%- end -%>
 ZOOKEEPER_HOSTS=<%= zkarr.join(",") %>