Remove references to non existant zookeeper and cassandra classes

The midonet::zookeper and midonet::cassandra classes don't exist.

Change-Id: I37ac0a5b3242fb57644d2838ee88c11be6b7c611
This commit is contained in:
Sam Morrison 2016-02-24 10:13:20 +11:00
parent 2d4c0223fd
commit 0bccc3f787
7 changed files with 3 additions and 53 deletions

View File

@ -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

View File

@ -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

View File

@ -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'

View File

@ -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'

View File

@ -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

View File

@ -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 %>

View File

@ -1,2 +0,0 @@
export JAVA_HOME=<%= @java_home %>
export ZOO_LOG_DIR=/var/log/zookeeper