From bb91c8236093ae3be86ebed1d3a99d25cdda9958 Mon Sep 17 00:00:00 2001 From: Alex Ruiz Estradera Date: Mon, 7 Nov 2016 18:42:37 +0100 Subject: [PATCH] Allow single list of Zookeeper and cassandra Change-Id: I69ba8f17007eaad96a933fbd45c397cdc0c498eb --- spec/acceptance/midonet_agent_spec.rb | 3 ++- spec/acceptance/midonet_analytics_spec.rb | 4 ++++ spec/acceptance/midonet_cluster_spec.rb | 3 ++- templates/agent/midolman.conf.erb | 8 +++++++- templates/analytics/midonet.conf.erb | 8 +++++++- templates/cluster/midonet.conf.erb | 8 +++++++- templates/cluster/mn-cluster_config.sh.erb | 18 +++++++++++++++--- templates/gateway/midorc.erb | 8 +++++++- 8 files changed, 51 insertions(+), 9 deletions(-) diff --git a/spec/acceptance/midonet_agent_spec.rb b/spec/acceptance/midonet_agent_spec.rb index 1b80fdb..965341c 100644 --- a/spec/acceptance/midonet_agent_spec.rb +++ b/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' } ], diff --git a/spec/acceptance/midonet_analytics_spec.rb b/spec/acceptance/midonet_analytics_spec.rb index 1b4df8c..ea5dbc9 100644 --- a/spec/acceptance/midonet_analytics_spec.rb +++ b/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, diff --git a/spec/acceptance/midonet_cluster_spec.rb b/spec/acceptance/midonet_cluster_spec.rb index b26ca2e..d600eb7 100644 --- a/spec/acceptance/midonet_cluster_spec.rb +++ b/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' }], diff --git a/templates/agent/midolman.conf.erb b/templates/agent/midolman.conf.erb index 8d97f34..3e0d175 100644 --- a/templates/agent/midolman.conf.erb +++ b/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(",") %> diff --git a/templates/analytics/midonet.conf.erb b/templates/analytics/midonet.conf.erb index 9fab48f..b3526f4 100644 --- a/templates/analytics/midonet.conf.erb +++ b/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(",") %> diff --git a/templates/cluster/midonet.conf.erb b/templates/cluster/midonet.conf.erb index 9fab48f..b3526f4 100644 --- a/templates/cluster/midonet.conf.erb +++ b/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(",") %> diff --git a/templates/cluster/mn-cluster_config.sh.erb b/templates/cluster/mn-cluster_config.sh.erb index 0711f86..6b49bc8 100644 --- a/templates/cluster/mn-cluster_config.sh.erb +++ b/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 diff --git a/templates/gateway/midorc.erb b/templates/gateway/midorc.erb index bb3e0d1..fe70d73 100644 --- a/templates/gateway/midorc.erb +++ b/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(",") %>