From 0bccc3f787b6fec6e423c09b8918e679a7ea0e24 Mon Sep 17 00:00:00 2001
From: Sam Morrison <sorrison@gmail.com>
Date: Wed, 24 Feb 2016 10:13:20 +1100
Subject: [PATCH] Remove references to non existant zookeeper and cassandra
classes
The midonet::zookeper and midonet::cassandra classes don't exist.
Change-Id: I37ac0a5b3242fb57644d2838ee88c11be6b7c611
---
README.md | 7 +++----
data/common.yaml | 11 -----------
data/osfamily/Debian/common.yaml | 4 ----
data/osfamily/RedHat/common.yaml | 4 ----
manifests/init.pp | 9 ---------
templates/zookeeper/zoo.cfg.erb | 19 -------------------
templates/zookeeper/zookeeper-env.sh.erb | 2 --
7 files changed, 3 insertions(+), 53 deletions(-)
delete mode 100644 templates/zookeeper/zoo.cfg.erb
delete mode 100644 templates/zookeeper/zookeeper-env.sh.erb
diff --git a/README.md b/README.md
index 7b47843..7783f4f 100644
--- a/README.md
+++ b/README.md
@@ -43,10 +43,9 @@ MidoNet class in your Puppet manifest:
include midonet
-That will deploy a full MidoNet installation (repos, cassandra, zookeeper,
-agent, MidoNet API and MidoNet CLI) in the target host, which is quite
-useless deployment, since MidoNet is a network controller ready to be scalable
-and distributed. However, for testing its features and demo purposes, it can
+That will deploy a full MidoNet installation (repos, agent, MidoNet API and MidoNet CLI)
+in the target host, which is quite useless deployment, since MidoNet is a network controller
+ready to be scalable and distributed. However, for testing its features and demo purposes, it can
be useful.
## Usage
diff --git a/data/common.yaml b/data/common.yaml
index 356b268..a06c90e 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -1,14 +1,3 @@
-# Zookeeper-based attributes
-midonet::zookeeper::servers:
- - id: 1
- host: 'localhost'
-midonet::zookeeper::server_id: '1'
-
-# Cassandra-based attributes
-midonet::cassandra::seeds:
- - 'localhost'
-midonet::cassandra::seed_address: 'localhost'
-
# Choose whether to manage Tomcat and Java installation (true) or use an
# existing installation instead (false).
midonet::midonet_agent::install::install_java: true
diff --git a/data/osfamily/Debian/common.yaml b/data/osfamily/Debian/common.yaml
index 3f3fbae..80793df 100644
--- a/data/osfamily/Debian/common.yaml
+++ b/data/osfamily/Debian/common.yaml
@@ -27,7 +27,3 @@ midonet::neutron_plugin::midonet_api_ip: 'localhost'
midonet::neutron_plugin::username: 'fake_user'
midonet::neutron_plugin::password: 'fake_password'
midonet::neutron_plugin::project_id: 'service'
-
-midonet::cassandra::conf_dir: '/etc/cassandra'
-midonet::cassandra::pid_dir: '/var/run/cassandra'
-midonet::cassandra::service_path: '/usr/sbin'
diff --git a/data/osfamily/RedHat/common.yaml b/data/osfamily/RedHat/common.yaml
index 4386b21..b16982b 100644
--- a/data/osfamily/RedHat/common.yaml
+++ b/data/osfamily/RedHat/common.yaml
@@ -31,10 +31,6 @@ midonet::neutron_plugin::username: 'fake_user'
midonet::neutron_plugin::password: 'fake_password'
midonet::neutron_plugin::project_id: 'service'
-midonet::cassandra::pid_dir: '/var/run/cassandra'
-midonet::cassandra::conf_dir: '/etc/cassandra/default.conf'
-midonet::cassandra::service_path: '/sbin'
-
# Temporary source for faraday package and dependencies until it gets included
# in EPEL repositories
midonet::faraday_package: 'ruby193-rubygem-faraday'
diff --git a/manifests/init.pp b/manifests/init.pp
index 242caea..e030eb7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -13,8 +13,6 @@
# documentation for the midonet's modules:
#
# - midonet::repository
-# - midonet::cassandra
-# - midonet::zookeeper
# - midonet::midonet_agent
# - midonet::midonet_api
# - midonet::midonet_cli
@@ -42,18 +40,11 @@
#
class midonet {
- # Add zookeeper
- class {'::midonet::zookeeper': }
-
- # Add cassandra
- class {'::midonet::cassandra': }
-
# Add midonet-agent
class { 'midonet::midonet_agent':
zk_servers => [{
'ip' => $::ipaddress}
],
- require => [Class['::midonet::cassandra'], Class['::midonet::zookeeper']]
}
# Add midonet-api
diff --git a/templates/zookeeper/zoo.cfg.erb b/templates/zookeeper/zoo.cfg.erb
deleted file mode 100644
index 5ddcfa2..0000000
--- a/templates/zookeeper/zoo.cfg.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-# The number of milliseconds of each tick
-tickTime=2000
-# The number of ticks that the initial
-# synchronization phase can take
-initLimit=10
-# The number of ticks that can pass between
-# sending a request and getting an acknowledgement
-syncLimit=5
-# the directory where the snapshot is stored.
-dataDir=<%= @data_dir %>
-# the port at which the clients will connect
-clientPort=2181
-
-# specify all zookeeper servers
-# The fist port is used by followers to connect to the leader
-# The second one is used for leader election
-<% @servers.each do |s| %>
-<%="server.#{s['id']}=#{s['host']}:#{s['peer_port'] ||= 2888}:#{s['lead_port'] || 3888}" %>
-<% end %>
diff --git a/templates/zookeeper/zookeeper-env.sh.erb b/templates/zookeeper/zookeeper-env.sh.erb
deleted file mode 100644
index 4338f6a..0000000
--- a/templates/zookeeper/zookeeper-env.sh.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-export JAVA_HOME=<%= @java_home %>
-export ZOO_LOG_DIR=/var/log/zookeeper