Add 5.4 plugin!

Change-Id: Id7428c5135eab2f8c9622c735e4be384c1ceb6cc
This commit is contained in:
Alex Ruiz Estradera 2017-02-13 14:41:56 +01:00
parent 09c832a072
commit 074aa8a2f4
30 changed files with 432 additions and 190 deletions

View File

@ -186,7 +186,7 @@ Apache License
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright {yyyy} {name of copyright owner}
Copyright 2017 Midokura
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@ -199,4 +199,3 @@ Apache License
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

View File

@ -0,0 +1,17 @@
#!/bin/bash
puppet module install puppetlabs-java --version=1.6.0 --ignore-dependencies --force
puppet module install locp-cassandra --version=1.25.2 --ignore-dependencies --force
puppet module install deric-zookeeper --version=0.6.1 --ignore-dependencies --force
puppet module install TubeMogul-curator --version=1.0.1 --ignore-dependencies --force
puppet module install elasticsearch-elasticsearch --version=0.15.1 --ignore-dependencies --force
puppet module install elastic-logstash --version=5.0.3 --ignore-dependencies --force
puppet module install electrical-file_concat --version=1.0.1 --ignore-dependencies --force
puppet module install richardc-datacat --version=0.6.2 --ignore-dependencies --force
# Dirty sed because elk packages and fuel use different sysctl packages
sed -i "s| sysctl { 'vm| sysctl::value { 'vm|g" /etc/puppet/modules/elasticsearch/manifests/config.pp
gem install faraday # This is needed by the midonet providers
gem install netaddr # This is needed to calculate cidrs

View File

@ -4,13 +4,18 @@ if [[ -e /etc/puppet/modules/neutron/lib/puppet/type/neutron_plugin_midonet.rb ]
cd /etc/puppet/modules/neutron && patch -p1 --force --forward < midonet.diff && cd -
fi
if [[ -e lib/puppet/provider/neutron_port/neutron.rb ]]; then
# Apply the released patch of Neutron Puppet to allow midonet manifests
wget https://github.com/openstack/puppet-neutron/commit/dcfb3dd946cbc6f6083afa35f023917dfe0369e4.diff -O /etc/puppet/modules/neutron/midonet2.diff
cd /etc/puppet/modules/neutron && patch -p1 --force --forward < midonet2.diff && cd -
# Dirty way of checking if the neutron type is already patched. It is not possible to get
# version Of the current fuel version from a node.
NEUTRONTYPEPATCHED=$(cat /etc/puppet/modules/neutron/lib/puppet/type/neutron_port.rb | grep binding_host_id | head -n1)
if [[ -z ${NEUTRONTYPEPATCHED} ]]; then
if [[ -e /etc/puppet/modules/neutron/lib/puppet/provider/neutron_port/neutron.rb ]]; then
# Apply the released patch of Neutron Puppet to allow midonet manifests
wget https://github.com/openstack/puppet-neutron/commit/dcfb3dd946cbc6f6083afa35f023917dfe0369e4.diff -O /etc/puppet/modules/neutron/midonet2.diff
cd /etc/puppet/modules/neutron && patch -p1 --force --forward < midonet2.diff && cd -
fi
fi
if [[ -e lib/puppet/type/neutron_network.rb ]]; then
if [[ -e /etc/puppet/modules/neutron/lib/puppet/type/neutron_network.rb ]]; then
# Apply the released patch of Neutron Puppet to allow midonet manifests
wget https://github.com/openstack/puppet-neutron/commit/95f0514a8ef6f5491d7e5775553d234435354cf8.diff -O /etc/puppet/modules/neutron/midonet3.diff
cd /etc/puppet/modules/neutron && patch -p1 --force --forward < midonet3.diff && cd -

View File

@ -2,5 +2,5 @@ start on runlevel [123456]
stop on shutdown
script
puppet apply --modulepath=/etc/fuel/plugins/midonet-4.1/puppet/modules:/etc/puppet/modules /etc/fuel/plugins/midonet-4.1/puppet/manifests/midonet-gateway-static.pp
puppet apply --modulepath=/etc/fuel/plugins/midonet-9.2/puppet/modules:/etc/puppet/modules /etc/fuel/plugins/midonet-9.2/puppet/manifests/midonet-gateway-static.pp
end script

View File

@ -2,5 +2,5 @@ start on runlevel [123456]
stop on shutdown
script
puppet apply --modulepath=/etc/fuel/plugins/midonet-4.1/puppet/modules:/etc/puppet/modules /etc/fuel/plugins/midonet-4.1/puppet/manifests/midonet-bgp-interfaces.pp
puppet apply --modulepath=/etc/fuel/plugins/midonet-9.2/puppet/modules:/etc/puppet/modules /etc/fuel/plugins/midonet-9.2/puppet/manifests/midonet-bgp-interfaces.pp
end script

View File

@ -34,5 +34,5 @@ exec {'set up external bridge':
file {'/etc/init/midonet-network.conf':
ensure => present,
source => '/etc/fuel/plugins/midonet-4.1/puppet/files/startup.conf'
source => '/etc/fuel/plugins/midonet-9.2/puppet/files/startup.conf'
}

View File

@ -55,7 +55,7 @@ if($old_config != 'notfound')
file { 'delete masquerade script':
ensure => present,
path => '/tmp/remove_router_interfaces.sh',
content => template('/etc/fuel/plugins/midonet-4.1/puppet/templates/cleanup_masquerade.sh.erb'),
content => template('/etc/fuel/plugins/midonet-9.2/puppet/templates/cleanup_masquerade.sh.erb'),
} ->
# Finally, execute the script

View File

@ -66,7 +66,7 @@ if($old_config != 'notfound')
file { 'cleanup static script':
ensure => present,
path => '/tmp/cleanup_static_gateway.sh',
content => template('/etc/fuel/plugins/midonet-4.1/puppet/templates/cleanup_static_gateway.sh.erb'),
content => template('/etc/fuel/plugins/midonet-9.2/puppet/templates/cleanup_static_gateway.sh.erb'),
}
# Finally, execute the script
@ -80,7 +80,7 @@ if($old_config != 'notfound')
file { 'delete router interfaces script':
ensure => present,
path => '/tmp/remove_router_interfaces.sh',
content => template('/etc/fuel/plugins/midonet-4.1/puppet/templates/remove_router_interfaces.sh.erb'),
content => template('/etc/fuel/plugins/midonet-9.2/puppet/templates/remove_router_interfaces.sh.erb'),
}
# Finally, execute the script

View File

@ -54,6 +54,12 @@ service { 'libvirt' :
provider => $nova::params::special_service_provider,
}
firewall { '999 accept all to metadata interface':
proto => 'all',
iniface => 'metadata',
action => 'accept',
}
exec { 'destroy_libvirt_default_network':
command => 'virsh net-destroy default',
onlyif => 'virsh net-info default | grep -qE "Active:.* yes"',
@ -88,6 +94,7 @@ nova_config {
'DEFAULT/linuxnet_ovs_integration_bridge': value => $neutron_integration_bridge;
'DEFAULT/network_device_mtu': value => '65000';
'DEFAULT/my_ip': value => $nova_migration_ip;
'DEFAULT/force_config_drive': value => 'False';
}
class { 'nova::network::neutron' :

View File

@ -15,10 +15,10 @@ notice('MODULAR: midonet-define-repositories.pp')
$midonet_settings = hiera('midonet')
$mem = $midonet_settings['mem']
$mem_version = $midonet_settings['mem_version']
$mem_version = $midonet_settings['midonet_version']
$mem_user = $midonet_settings['mem_repo_user']
$mem_password = $midonet_settings['mem_repo_password']
$midonet_version = '5.2'
$midonet_version = $midonet_settings['midonet_version']
$openstack_release = 'mitaka'
include apt
@ -27,7 +27,7 @@ include midonet::params
if $mem {
$midonet_repo_url = "http://${mem_user}:${mem_password}@${midonet::params::midonet_repo_baseurl}/mem-${mem_version}"
$midonet_repo_url = "http://${midonet::params::midonet_repo_baseurl}/midonet-${midonet_version}"
}
else {
$midonet_repo_url = "http://${midonet::params::midonet_repo_baseurl}/midonet-${midonet_version}"
@ -41,7 +41,20 @@ apt::key { 'midorepo':
apt::source {'midonet':
comment => 'Midonet apt repository',
location => $midonet_repo_url,
release => 'stable',
release => 'unstable',
key => {
'id' => 'E9996503AEB005066261D3F38DDA494E99143E75',
'server' => 'subkeys.pgp.net',
},
include => {
'src' => false,
}
} ->
apt::source {'midonet-mem':
comment => 'Midonet mem apt repository',
location => 'http://artifactory.bcn.midokura.com/artifactory/mem-5.4-deb/',
release => 'unstable',
key => {
'id' => 'E9996503AEB005066261D3F38DDA494E99143E75',
'server' => 'subkeys.pgp.net',

View File

@ -16,5 +16,5 @@ notice('MODULAR: midonet-edge-router-cleanup-bgp-gw.pp')
file {'/etc/init/midonet-network.conf':
ensure => absent,
source => '/etc/fuel/plugins/midonet-4.1/puppet/files/startup.conf'
source => '/etc/fuel/plugins/midonet-9.2/puppet/files/startup.conf'
}

View File

@ -62,7 +62,7 @@ if($old_config != 'notfound')
file { 'delete router interfaces script':
ensure => present,
path => '/tmp/delete_router_interfaces_bgp.sh',
content => template('/etc/fuel/plugins/midonet-4.1/puppet/templates/delete_router_interfaces_bgp.sh.erb'),
content => template('/etc/fuel/plugins/midonet-9.2/puppet/templates/delete_router_interfaces_bgp.sh.erb'),
}
# Finally, execute the script

View File

@ -58,7 +58,7 @@ package { 'python-neutronclient':
file { 'create router interfaces script':
ensure => present,
path => '/tmp/create_router_interfaces.sh',
content => template('/etc/fuel/plugins/midonet-4.1/puppet/templates/create_router_interfaces.sh.erb'),
content => template('/etc/fuel/plugins/midonet-9.2/puppet/templates/create_router_interfaces.sh.erb'),
} ->
# Finally, execute the script

View File

@ -46,7 +46,7 @@ package { 'python-neutronclient':
file { 'create router interfaces script':
ensure => present,
path => '/tmp/create_router_interfaces_static.sh',
content => template('/etc/fuel/plugins/midonet-4.1/puppet/templates/create_router_interfaces_static.sh.erb'),
content => template('/etc/fuel/plugins/midonet-9.2/puppet/templates/create_router_interfaces_static.sh.erb'),
} ->
# Finally, execute the script

View File

@ -42,6 +42,6 @@ contain ::midonet::gateway::static
file {'/etc/init/midonet-network-static.conf':
ensure => present,
source => '/etc/fuel/plugins/midonet-4.1/puppet/files/startup-static.conf',
source => '/etc/fuel/plugins/midonet-9.2/puppet/files/startup-static.conf',
require => Exec['run gateway static creation script']
}

View File

@ -42,18 +42,28 @@ $ana_keys = keys($ana_hash)
$ana_mgmt_ip = empty($ana_keys)? {true => $public_vip , default => $ana_mgmt_ip_list[0] }
$midonet_version = $midonet_settings['midonet_version']
$nodes_hash = hiera('nodes')
$node = filter_nodes($nodes_hash, 'fqdn', $::fqdn)
$priv_ip = $node[0]['internal_address']
$priv_netmask = $node[0]['internal_netmask']
$pub_ip = $node[0]['public_address']
#Add MEM analytics class
class {'midonet::analytics':
zookeeper_hosts => $zoo_ips_hash,
is_mem => true,
manage_repo => false,
heap_size_gb => '3',
midonet_version => $midonet_version,
elk_bind_ip => $priv_ip,
elk_hosts => $ana_mgmt_ip_list
}
class { 'firewall': }
firewall {'507 Midonet analytics':
port => '8080',
firewall {'507 Midonet elk 1':
port => '9200',
proto => 'tcp',
action => 'accept',
}
@ -69,3 +79,15 @@ firewall {'509 Midonet flow history':
proto => 'tcp',
action => 'accept',
}
firewall {'520 Midonet elk 2':
port => '9300',
proto => 'tcp',
action => 'accept',
}
firewall {'520 Midonet elk 3':
port => '5005',
proto => 'tcp',
action => 'accept',
}

View File

@ -38,6 +38,15 @@ $ana_keys = keys($ana_hash)
$ana_mgmt_ip = empty($ana_keys)? {true => $public_vip , default => $ana_mgmt_ip_list[0] }
$insights = $midonet_settings['mem_insights']
$midonet_version = $midonet_settings['midonet_version']
$nodes_hash = hiera('nodes')
$node = filter_nodes($nodes_hash, 'fqdn', $::fqdn)
$priv_ip = $node[0]['internal_address']
$priv_netmask = $node[0]['internal_netmask']
$pub_ip = $node[0]['public_address']
include ::stdlib
class {'::midonet::cluster':
is_mem => $mem,
@ -52,7 +61,14 @@ class {'::midonet::cluster':
is_insights => $insights,
analytics_ip => $ana_mgmt_ip,
max_heap_size => '2048M',
heap_newsize => '1024M'
heap_newsize => '1024M',
midonet_version => $midonet_version,
endpoint_host => $priv_ip,
endpoint_port => '8999',
elk_seeds => join($ana_mgmt_ip_list,','),
elk_target_endpoint => generate_cidr_from_ip_netlength("${priv_ip} ${priv_netmask}"),
jarvis_enabled => false,
state_proxy_address => $priv_ip
}
# HA proxy configuration
Haproxy::Service { use_include => true }
@ -93,3 +109,21 @@ firewall {'502 Midonet cluster':
proto => 'tcp',
action => 'accept',
}
firewall {'503 Midonet cluster state proxy':
port => '2346',
proto => 'tcp',
action => 'accept',
}
firewall {'511 Midonet cluster unified endpoint':
port => '8999',
proto => 'tcp',
action => 'accept',
}
firewall {'521 Midonet flow history':
port => '5001',
proto => 'tcp',
action => 'accept',
}

View File

@ -0,0 +1,18 @@
# Copyright 2016 Midokura, SARL.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
notice('MODULAR: midonet-install-haveged.pp')
package { 'haveged':
ensure => present,
}

View File

@ -39,6 +39,10 @@ $ana_keys = keys($ana_hash)
$ana_mgmt_ip = empty($ana_keys)? {true => $public_vip , default => $ana_mgmt_ip_list[0] }
$ssl_horizon = $public_ssl_hash['horizon']
$is_insights = $midonet_settings['mem_insights']
$midonet_version = $midonet_settings['midonet_version']
$new_api = versioncmp($midonet_version,'5.2') ? {'1' => true, default => false}
service { 'apache2':
ensure => running,
enable => true,
@ -132,7 +136,7 @@ else {
file { 'mem-vhost':
ensure => present,
path => '/etc/apache2/sites-available/30-midonet-mem.conf',
content => template('/etc/fuel/plugins/midonet-4.1/puppet/templates/vhost_mem_manager.erb'),
content => template('/etc/fuel/plugins/midonet-9.2/puppet/templates/vhost_mem_manager.erb'),
}
exec { 'a2ensite 30-midonet-mem':
path => '/usr/bin:/usr/sbin:/bin',
@ -145,54 +149,110 @@ Exec<| tag == 'a2enmod-mem' |>
-> Exec['a2ensite 30-midonet-mem']
if ($is_insights)
{
if($new_api)
{
Haproxy::Service { use_include => true }
Haproxy::Balancermember { use_include => true }
Openstack::Ha::Haproxy_service {
server_names => keys($controllers_mgmt_ips),
ipaddresses => values($controllers_mgmt_ips),
public_virtual_ip => $public_vip,
internal_virtual_ip => $management_vip,
}
openstack::ha::haproxy_service { 'midonetunified':
order => 200,
listen_port => 8999,
balancermember_port => 8999,
define_backups => true,
before_start => true,
public => true,
haproxy_config_options => {
'balance' => 'roundrobin',
'option' => ['httplog'],
},
balancermember_options => 'check',
}
class { 'firewall': }
firewall {'504 Midonet Unified Endpoint':
port => '8999',
proto => 'tcp',
action => 'accept',
}
}
else
{
Haproxy::Service { use_include => true }
Haproxy::Balancermember { use_include => true }
Openstack::Ha::Haproxy_service {
server_names => keys($controllers_mgmt_ips),
ipaddresses => values($controllers_mgmt_ips),
public_virtual_ip => $public_vip,
internal_virtual_ip => $management_vip,
}
openstack::ha::haproxy_service { 'midonetsubscriptions':
order => 200,
listen_port => 8007,
balancermember_port => 8007,
define_backups => true,
before_start => true,
public => true,
haproxy_config_options => {
'balance' => 'roundrobin',
'option' => ['httplog'],
},
balancermember_options => 'check',
}
openstack::ha::haproxy_service { 'midonettrace':
order => 201,
listen_port => 8460,
balancermember_port => 8460,
define_backups => true,
before_start => true,
public => true,
haproxy_config_options => {
'balance' => 'roundrobin',
'option' => ['httplog'],
},
balancermember_options => 'check',
}
openstack::ha::haproxy_service { 'midonetfabric':
order => 202,
listen_port => 8009,
balancermember_port => 8009,
define_backups => true,
before_start => true,
public => true,
haproxy_config_options => {
'balance' => 'roundrobin',
'option' => ['httplog'],
},
balancermember_options => 'check',
}
class { 'firewall': }
firewall {'504 Midonet subscription':
port => '8007',
proto => 'tcp',
action => 'accept',
}
firewall {'505 Midonet trace':
port => '8460',
proto => 'tcp',
action => 'accept',
}
firewall {'506 Midonet fabric':
port => '8009',
proto => 'tcp',
action => 'accept',
}
}
# HA proxy configuration
Haproxy::Service { use_include => true }
Haproxy::Balancermember { use_include => true }
Openstack::Ha::Haproxy_service {
server_names => keys($controllers_mgmt_ips),
ipaddresses => values($controllers_mgmt_ips),
public_virtual_ip => $public_vip,
internal_virtual_ip => $management_vip,
}
openstack::ha::haproxy_service { 'midonetsubscriptions':
order => 200,
listen_port => 8007,
balancermember_port => 8007,
define_backups => true,
before_start => true,
public => true,
haproxy_config_options => {
'balance' => 'roundrobin',
'option' => ['httplog'],
},
balancermember_options => 'check',
}
openstack::ha::haproxy_service { 'midonettrace':
order => 201,
listen_port => 8460,
balancermember_port => 8460,
define_backups => true,
before_start => true,
public => true,
haproxy_config_options => {
'balance' => 'roundrobin',
'option' => ['httplog'],
},
balancermember_options => 'check',
}
openstack::ha::haproxy_service { 'midonetfabric':
order => 202,
listen_port => 8009,
balancermember_port => 8009,
define_backups => true,
before_start => true,
public => true,
haproxy_config_options => {
'balance' => 'roundrobin',
'option' => ['httplog'],
},
balancermember_options => 'check',
file_line { 'Update tunnel timeout on haproxy':
path => '/etc/haproxy/haproxy.cfg',
line => ' timeout tunnel 3600s',
after => ' timeout check'
}
exec { 'haproxy reload':
command => 'export OCF_ROOT="/usr/lib/ocf"; (ip netns list | grep haproxy) && ip netns exec haproxy /usr/lib/ocf/resource.d/fuel/ns_haproxy reload',
path => '/usr/bin:/usr/sbin:/bin:/sbin',
@ -202,22 +262,12 @@ if ($is_insights)
try_sleep => 10,
returns => [0, ''],
}
Haproxy::Listen <||> -> Exec['haproxy reload']
Haproxy::Balancermember <||> -> Exec['haproxy reload']
class { 'firewall': }
firewall {'504 Midonet subscription':
port => '8007',
proto => 'tcp',
action => 'accept',
}
firewall {'505 Midonet trace':
port => '8460',
proto => 'tcp',
action => 'accept',
}
firewall {'506 Midonet fabric':
port => '8009',
proto => 'tcp',
action => 'accept',
}
Haproxy::Listen <||> ->
File_line['Update tunnel timeout on haproxy'] ->
Exec['haproxy reload']
Haproxy::Balancermember <||> ->
File_line['Update tunnel timeout on haproxy'] ->
Exec['haproxy reload']
}

View File

@ -43,6 +43,8 @@ $use_syslog = hiera('use_syslog', true)
$use_stderr = hiera('use_stderr', false)
$verbose = pick($openstack_network_hash['verbose'], hiera('verbose', true))
$primary_ctrl = hiera('primary_controller')
# Unfortunately, core_plugin in the 'openstack-network-common-config'
# task is hardcoded. The core_plugin value for midonet is overrided
@ -80,11 +82,6 @@ package {'python-neutron-plugin-midonet':
ensure => absent
}
# The real plugin package
package {'python-networking-midonet':
ensure => present
}
file {'/etc/default/neutron-server':
ensure => present,
owner => 'root',
@ -97,12 +94,12 @@ class { '::midonet::neutron_plugin':
keystone_username => $username,
keystone_password => $password,
keystone_tenant => $tenant_name,
sync_db => $primary_controller ? {true => true,default => false},
sync_db => $primary_ctrl ? {true => true,default => false},
}
class { '::neutron::server':
sync_db => $primary_controller ? {true => 'primary',default => 'slave'},
sync_db => $primary_ctrl ? {true => 'primary',default => 'slave'},
username => $neutron_username,
password => $neutron_user_password,

View File

@ -18,5 +18,5 @@ $mem = $midonet_settings['mem']
file {'/etc/hiera/plugins/midonet.yaml':
ensure => file,
source => '/etc/fuel/plugins/midonet-4.1/puppet/files/midonet.yaml'
source => '/etc/fuel/plugins/midonet-9.2/puppet/files/midonet.yaml'
}

View File

@ -1,3 +1,5 @@
<% if !@new_api %>
ProxyPreserveHost On
Alias /midonet-manager "/var/www/html/midonet-manager"
@ -19,3 +21,26 @@ ProxyPassReverse /analytics ws://<%= @ana_mgmt_ip %>:8080/analytics
Header set Access-Control-Allow-Origin *
Header append Access-Control-Allow-Headers Content-Type
Header append Access-Control-Allow-Headers X-Auth-Token
<% else %>
ProxyPreserveHost On
Alias /midonet-manager "/var/www/html/midonet-manager"
ProxyPass /midonet-api http://<%= @public_vip %>:8181/midonet-api
ProxyPassReverse /midonet-api http://<%= @public_vip %>:8181/midonet-api
ProxyPass /subscription ws://<%= @public_vip %>:8999/subscription
ProxyPassReverse /subscription ws://<%= @public_vip %>:8999/subscription
ProxyPass /trace ws://<%= @public_vip %>:8999/trace
ProxyPassReverse /trace ws://<%= @public_vip %>:8999/trace
ProxyPass /fabric ws://<%= @public_vip %>:8999/fabric
ProxyPassReverse /fabric ws://<%= @public_vip %>:8999/fabric
ProxyPass /analytics ws://<%= @public_vip %>:8999/analytics
ProxyPassReverse /analytics ws://<%= @public_vip %>:8999/analytics
Header set Access-Control-Allow-Origin *
Header append Access-Control-Allow-Headers Content-Type
Header append Access-Control-Allow-Headers X-Auth-Token
<% end %>

View File

@ -68,10 +68,31 @@
type: shell
requires: [pre_deployment_start]
required_for: [pre_deployment_end]
version: 2.0.0
version: 2.1.0
parameters:
cmd: bash install_midonet_common_modules_and_gems.sh
timeout: 1440
condition:
yaql_exp: "$.midonet.midonet_version = '5.2'"
- id: install_common_deps_54
role:
- primary-controller
- controller
- compute
- nsdb
- midonet-gw
- midonet-analytics
type: shell
requires: [pre_deployment_start]
required_for: [pre_deployment_end]
version: 2.1.0
parameters:
cmd: bash install_midonet_common_modules_and_gems_54.sh
timeout: 1440
condition:
yaql_exp: "$.midonet.midonet_version = '5.4'"
- id: override_neutron_module
role:
@ -84,7 +105,7 @@
type: shell
requires: [pre_deployment_start]
required_for: [pre_deployment_end]
version: 2.0.0
version: 2.1.0
parameters:
cmd: bash override_neutron_module.sh
timeout: 1440
@ -101,7 +122,7 @@
type: puppet
requires: [pre_deployment_start]
required_for: [pre_deployment_end]
version: 2.0.0
version: 2.1.0
parameters:
puppet_manifest: puppet/manifests/midonet-override-hiera.pp
puppet_modules: "puppet/modules/:/etc/puppet/modules/"
@ -119,7 +140,7 @@
type: shell
requires: [deploy_start,setup_repositories]
required_for: [fuel_pkgs]
version: 2.0.0
version: 2.1.0
parameters:
cmd: bash install_midonet_package_from_source.sh
timeout: 1440
@ -137,7 +158,7 @@
type: shell
requires: [deploy_start,setup_repositories]
required_for: [fuel_pkgs]
version: 2.0.0
version: 2.1.0
parameters:
cmd: bash install_midonet_openstack_package.sh
timeout: 1440
@ -157,10 +178,11 @@
requires:
- netconfig
- install_common_deps
- install_common_deps_54
- install_midonet_package
- install_midonet_openstack_package
- override_neutron_module
version: 2.0.0
version: 2.1.0
type: puppet
parameters:
puppet_manifest: puppet/manifests/midonet-define-repositories.pp
@ -178,7 +200,7 @@
- deploy_end
requires:
- deploy_start
version: 2.0.0
version: 2.1.0
type: puppet
parameters:
puppet_manifest: puppet/manifests/midonet-enable-ip-forward.pp
@ -202,7 +224,7 @@
- cluster-haproxy
cross-depends:
- name: zookeeper_and_cassandra_midonet
version: 2.0.0
version: 2.1.0
type: puppet
reexecute_on:
- deploy_changes
@ -223,7 +245,7 @@
- openstack-network-start
requires:
- deploy_cluster_midonet
version: 2.0.0
version: 2.1.0
type: puppet
parameters:
puppet_manifest: puppet/manifests/midonet-install-agent.pp
@ -240,7 +262,7 @@
- openstack-network-common-config
required_for:
- openstack-network-end
version: 2.0.0
version: 2.1.0
type: puppet
parameters:
puppet_manifest: puppet/manifests/midonet-replace-guess-func.pp
@ -256,7 +278,7 @@
- setup_repositories_midonet
required_for:
- openstack-network-server-config
version: 2.0.0
version: 2.1.0
type: puppet
parameters:
puppet_manifest: puppet/manifests/midonet-neutron-configure.pp
@ -272,7 +294,7 @@
- setup_repositories_midonet
required_for:
- openstack-network-end
version: 2.0.0
version: 2.1.0
type: puppet
parameters:
puppet_manifest: puppet/manifests/midonet-neutron-networks.pp
@ -291,7 +313,7 @@
- deploy_changes
required_for:
- openstack-network-end
version: 2.0.0
version: 2.1.0
type: puppet
parameters:
puppet_manifest: puppet/manifests/midonet-cleanup-static.pp
@ -315,7 +337,7 @@
- deploy_changes
required_for:
- openstack-network-end
version: 2.0.0
version: 2.1.0
type: puppet
parameters:
puppet_manifest: puppet/manifests/midonet-edge-router-cleanup-bgp.pp
@ -340,7 +362,7 @@
- deploy_changes
required_for:
- openstack-network-end
version: 2.0.0
version: 2.1.0
type: puppet
parameters:
puppet_manifest: puppet/manifests/midonet-edge-router-setup.pp
@ -362,7 +384,7 @@
- deploy_changes
required_for:
- openstack-network-end
version: 2.0.0
version: 2.1.0
type: puppet
parameters:
puppet_manifest: puppet/manifests/midonet-edge-router-setup-bgp.pp
@ -388,7 +410,7 @@
- deploy_changes
required_for:
- openstack-network-end
version: 2.0.0
version: 2.1.0
type: puppet
parameters:
puppet_manifest: puppet/manifests/midonet-edge-router-setup-static.pp
@ -416,7 +438,7 @@
- deploy_changes
required_for:
- openstack-network-end
version: 2.0.0
version: 2.1.0
type: puppet
parameters:
puppet_manifest: puppet/manifests/midonet-edge-router-setup-static-per-host.pp
@ -440,7 +462,7 @@
- openstack-network-common-config
- openstack-network-agents-l3
- openstack-network-agents-metadata
version: 2.0.0
version: 2.1.0
type: puppet
groups:
- compute
@ -456,7 +478,7 @@
- install_midonet_openstack_package
- install_midonet_package
- netconfig
version: 2.0.0
version: 2.1.0
type: puppet
reexecute_on:
- deploy_changes
@ -477,7 +499,7 @@
- install_midonet_openstack_package
- install_midonet_package
- netconfig
version: 2.0.0
version: 2.1.0
type: puppet
parameters:
puppet_manifest: puppet/manifests/midonet-install-java8.pp
@ -486,6 +508,26 @@
condition:
yaql_exp: "$.midonet.mem = true and $.midonet.mem_insights = true"
- id: mem-analytics-haveged
role:
- midonet-analytics
required_for:
- deploy_end
requires:
- deploy_start
- install_midonet_openstack_package
- install_midonet_package
- netconfig
- mem-analytics-java8
version: 2.1.0
type: puppet
parameters:
puppet_manifest: puppet/manifests/midonet-install-haveged.pp
puppet_modules: "puppet/modules/:/etc/puppet/modules/"
timeout: 720
condition:
yaql_exp: "$.midonet.mem = true and $.midonet.mem_insights = true and $.midonet.vm_install = true"
- id: mem-analytics-install
role:
- midonet-analytics
@ -498,10 +540,11 @@
- netconfig
- mem-analytics-java8
- setup_repositories_midonet
- mem-analytics-haveged
cross-depends:
- name: zookeeper_and_cassandra_midonet
- name: deploy_cluster_midonet
version: 2.0.0
version: 2.1.0
type: puppet
parameters:
puppet_manifest: puppet/manifests/midonet-install-analytics.pp
@ -548,7 +591,7 @@
requires:
- configure_default_route
- post_deployment_start
version: 2.0.0
version: 2.1.0
type: puppet
reexecute_on:
- deploy_changes
@ -570,7 +613,7 @@
requires:
- post_deployment_start
- agent-midonet-compute
version: 2.0.0
version: 2.1.0
type: puppet
parameters:
puppet_manifest: puppet/manifests/midonet-host-registry.pp
@ -585,7 +628,7 @@
requires:
- post_deployment_start
- tunnel-zones-midonet
version: 2.0.0
version: 2.1.0
reexecute_on:
- deploy_changes
type: puppet
@ -610,7 +653,7 @@
puppet_manifest: puppet/manifests/midonet-edge-router-cleanup-bgp-gw.pp
puppet_modules: "puppet/modules/:/etc/puppet/modules/"
timeout: 720
version: 2.0.0
version: 2.1.0
condition:
yaql_exp: >
(changedAny($.midonet.gateway_type,$.midonet.bgp_local_as,
@ -627,7 +670,7 @@
- tunnel-zones-midonet
reexecute_on:
- deploy_changes
version: 2.0.0
version: 2.1.0
type: puppet
parameters:
puppet_manifest: puppet/manifests/midonet-cleanup-static-per-host.pp
@ -650,7 +693,7 @@
- tunnel-zones-midonet
reexecute_on:
- deploy_changes
version: 2.0.0
version: 2.1.0
type: puppet
parameters:
puppet_manifest: puppet/manifests/midonet-cleanup-masquerade.pp
@ -677,7 +720,7 @@
type: puppet
reexecute_on:
- deploy_changes
version: 2.0.0
version: 2.1.0
parameters:
puppet_manifest: puppet/manifests/midonet-bgp-interfaces.pp
puppet_modules: "puppet/modules/:/etc/puppet/modules/"
@ -699,7 +742,7 @@
- midonet-edge-router-cleanup-bgp-gw
- openstack-network-midonet-cleanup-masq
- openstack-network-midonet-cleanup-static-per-host
version: 2.0.0
version: 2.1.0
type: puppet
reexecute_on:
- deploy_changes
@ -727,7 +770,7 @@
- openstack-network-midonet-cleanup-static-per-host
reexecute_on:
- deploy_changes
version: 2.0.0
version: 2.1.0
type: puppet
parameters:
puppet_manifest: puppet/manifests/midonet-gateway-static-router-ifaces.pp
@ -752,7 +795,7 @@
- openstack-network-midonet-gateway-static-router-ifaces
reexecute_on:
- deploy_changes
version: 2.0.0
version: 2.1.0
type: puppet
parameters:
puppet_manifest: puppet/manifests/midonet-gateway-static.pp
@ -773,7 +816,7 @@
requires:
- post_deployment_start
- agent-midonet-compute
version: 2.0.0
version: 2.1.0
type: puppet
parameters:
puppet_manifest: puppet/manifests/midonet-ensure-rootwrap.pp
@ -793,7 +836,7 @@
type: puppet
reexecute_on:
- deploy_changes
version: 2.0.0
version: 2.1.0
parameters:
puppet_manifest: puppet/manifests/midonet-install-mem.pp
puppet_modules: "puppet/modules/:/etc/puppet/modules/"
@ -810,7 +853,7 @@
requires:
- post_deployment_start
- mem-install
version: 2.0.0
version: 2.1.0
reexecute_on:
- deploy_changes
type: puppet
@ -830,7 +873,7 @@
requires:
- post_deployment_start
- mem-install
version: 2.0.0
version: 2.1.0
reexecute_on:
- deploy_changes
type: puppet
@ -851,18 +894,20 @@
- mem-horizon-override
- agent-midonet-compute
- tunnel-zones-midonet
- midonet-edge-router-setup-bgp-gw
- openstack-network-midonet-cleanup-static-per-host
cross-depends:
- name: midonet-edge-router-setup-bgp-gw
reexecute_on:
- deploy_changes
version: 2.0.0
version: 2.1.0
type: puppet
parameters:
puppet_manifest: puppet/manifests/midonet-restart-cluster.pp
puppet_modules: "puppet/modules/:/etc/puppet/modules/"
timeout: 720
condition:
yaql_exp: "$.midonet.mem = true and $.midonet.mem_insights = true"
yaql_exp: "$.midonet.mem = true"
- id: mem-restart-agent
role:
@ -878,9 +923,10 @@
- mem-horizon-override
- agent-midonet-compute
- tunnel-zones-midonet
- midonet-edge-router-setup-bgp-gw
- openstack-network-midonet-cleanup-static-per-host
version: 2.0.0
cross-depends:
- name: midonet-edge-router-setup-bgp-gw
version: 2.1.0
reexecute_on:
- deploy_changes
type: puppet
@ -889,7 +935,7 @@
puppet_modules: "puppet/modules/:/etc/puppet/modules/"
timeout: 720
condition:
yaql_exp: "$.midonet.mem = true and $.midonet.mem_insights = true"
yaql_exp: "$.midonet.mem = true"
# Kill the unneccessary agents the hard way
- id: openstack-network-disable-services
@ -902,7 +948,7 @@
- deploy_changes
required_for:
- post_deployment_end
version: 2.0.0
version: 2.1.0
type: puppet
parameters:
puppet_manifest: puppet/manifests/midonet-disable-services.pp
@ -916,7 +962,7 @@
- id: save_old_astute
type: shell
version: 2.0.0
version: 2.1.0
role:
- controller
- primary-controller

View File

@ -1,6 +1,6 @@
.. |FuelVer| replace:: 9.0/9.1
.. |PrevPluginVer| replace:: 4.0.0
.. |PluginVer| replace:: 4.1.0
.. |FuelVer| replace:: 9.0/9.1/9.2
.. |PrevPluginVer| replace:: 4.1.0
.. |PluginVer| replace:: 9.2.0
.. raw:: pdf
@ -15,7 +15,7 @@ for Infrastructure-as-a-Service (IaaS) clouds. Plugin for Fuel |FuelVer| provide
puppet manifests to install all the components to deploy easily MidoNet with
Fuel in both lab or production environments.
Fuel MidoNet plugin is capable of deploying MidoNet v5.2_ on top of Mirantis
Fuel MidoNet plugin is capable of deploying MidoNet v5.2_ and v5.4_ on top of Mirantis
OpenStack Fuel version |FuelVer|. There are no prerequisites to use the MidoNet
plugin: MidoNet is Open Source, and the plugin sets the repositories from where
download and install MidoNet packages.
@ -42,9 +42,14 @@ Known Limitations
* The plugin has some limitations regarding node count regarding
Analytics/Insight MEM-only feature. Currently, only one such node can be
deployed.
deployed. *Starting with 5.4 Multiple Analytics node can be used*
* Current version of plugin can only deploy single MidoNet Gateway role node.
MidoNet itself supports any number of gateway nodes, it is only a plugin limitation,
additional nodes needs to be set up manually.
.. _v5.2: https://github.com/midonet/midonet/tree/v5.2.1
.. _v5.4: https://github.com/midonet/midonet/tree/v5.4
.. _MEM: http://docs.midokura.com/docs/latest/manager-guide/content/index.html
.. _provided: http://www.midokura.com/mem-eval
@ -54,15 +59,4 @@ Changes in MidoNet plugin |PluginVer|
New features:
* Support for MidoNet 5.2 including all MEM features
* Support for Fuel |FuelVer|
* support for deploying MidoNet manager web-app on controller nodes
* Support for arbitrary number of BGP gateway nodes
* Support for static, non-BGP gateway
* Support 5.4 including all MEM features

View File

@ -25,9 +25,9 @@ To install the MidoNet Fuel plugin:
::
# fuel plugins
id | name | version | package_version | releases
id | name | version | package_version | releases
---+---------+---------+-----------------+--------------------
1 | midonet | 4.1.0 | 4.0.0 | ubuntu (mitaka-9.0)
1 | midonet | 9.2.0 | 4.0.0 | ubuntu (mitaka-9.0)
.. _`Partner Community Catalog`: https://www.mirantis.com/partners/midokura/

View File

@ -60,13 +60,18 @@ slf4j http://www.slf4j.org MIT
Puppet Modules
--------------
====================== ==========
Name License
====================== ==========
ripienaar-module_data Apache 2.0
deric-zookeeper Apache 2.0
midonet-cassandra Apache 2.0
puppetlabs-java Apache 2.0
puppetlabs-tomcat Apache 2.0
midonet-midonet Apache 2.0
====================== ==========
=========================== ====================
Name License
=========================== ====================
deric-zookeeper Apache 2.0
midonet-cassandra Apache 2.0
puppetlabs-java Apache 2.0
puppetlabs-tomcat Apache 2.0
openstack-midonet Apache 2.0
midonet-midonet_openstack Apache 2.0
TubeMogul-curator Apache 2.0
elasticsearch-elasticsearch Apache 2.0
elasticsearch-logstash Apache 2.0
electrical-file_concat Apache 2.0
richardc-datacat Apache 2.0
=========================== ====================

View File

@ -1,6 +1,6 @@
.. |FuelVer| replace:: 9.0/9.1
.. |PrevPluginVer| replace:: 4.0.0
.. |PluginVer| replace:: 4.1.0
.. |FuelVer| replace:: 9.0/9.1/9.2
.. |PrevPluginVer| replace:: 4.1.0
.. |PluginVer| replace:: 9.2.0
Document purpose
================
@ -33,4 +33,7 @@ Revision history
4.2 11.11.2016 Samir Ibradzic Adapt to Fuel 9
(samir@midokura.com)
9.1 19.01.2017 Alex Ruiz Estradera Adapt for Midonet 5.4
(alex.ruiz@midokura.com)
========= =============== ========================== =========================

View File

@ -36,26 +36,35 @@ attributes:
strict: false
message: "Midokura Enterprise MidoNet (MEM) must be enabled"
mem_version:
value: "5.2"
label: "MEM release version"
description: "Choose the Midokura Enterprise MidoNet (MEM) release version"
type: "select"
vm_install:
value: false
label: "Are you installing the Analytics nodes on VM's?"
description: "If selected, it will install haveged package for entropy. DONT CHECK IF USING BARE-METAL SERVERS"
weight: 8
type: "checkbox"
restrictions:
- condition: "settings:midonet.mem_insights.value == false or settings:midonet.midonet_version == '5.2'"
message: "Midokura Enterprise MidoNet (MEM) must be enabled"
action: hide
midonet_version:
value: "5.4"
label: "MidoNet release version"
description: "Choose the MidoNet release version"
type: "select"
weight: 9
values:
- data: "5.2"
label: "5.2"
restrictions:
- condition: "settings:midonet.mem.value == false"
strict: false
message: "Midokura Enterprise MidoNet (MEM) must be enabled"
- data: "5.4"
label: "5.4"
mem_repo_user:
value: ''
label: "MEM repository username"
description: "Username for Midokura Enterprise MidoNet (MEM) repository"
type: "text"
weight: 9
weight: 10
restrictions:
- condition: "settings:midonet.mem.value == false"
strict: false
@ -66,7 +75,7 @@ attributes:
label: "MEM repository password"
description: "Password for Midokura Enterprise MidoNet (MEM) repository"
type: "password"
weight: 10
weight: 11
restrictions:
- condition: "settings:midonet.mem.value == false"
strict: false
@ -74,7 +83,7 @@ attributes:
tunnel_type:
type: "select"
weight: 11
weight: 12
value: "gre"
label: "Tunnel Type"
description: "Choose which technology MidoNet will use to encapsulate data between hosts"

View File

@ -1,8 +1,8 @@
name: midonet
title: Neutron Midonet Plugin
version: 4.1.0
version: 9.2.0
description: Enable to use plugin Midonet for Neutron
fuel_version: ['9.0','9.1']
fuel_version: ['9.0','9.1','9.2']
is_hotpluggable: false
releases:

View File

@ -26,8 +26,6 @@ midonet-analytics:
has_primary: false
public_ip_required: false
weight: 200
limits:
max: 1
conflicts:
- controller
- midonet-gw