x
/
fuel-plugin-contrail
Code Issues Proposed changes

Merge "Fuel 8.0 Contrail plugin with Liberty support"

This commit is contained in:
Jenkins 2016-04-19 09:39:02 +00:00 committed by Gerrit Code Review
parent 2075ae0dd1 6660a85479
commit c89eaba396
6 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment_scripts/puppet/modules/contrail/manifests/analytics.pp
View File

@ -33,7 +33,7 @@ class contrail::analytics {
# Packages
package { 'redis-server': } ->
package { 'contrail-analytics': } ->
package { 'contrail-analytics': }
package { 'contrail-openstack-analytics': }
# Analytics config files

17
deployment_scripts/puppet/modules/contrail/manifests/controller.pp
View File

@ -50,7 +50,7 @@ class contrail::controller {
# Neutron configuration
neutron_config {
'DEFAULT/core_plugin': value => 'neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2';
'DEFAULT/api_extensions_path': value => 'extensions:/usr/lib/python2.7/dist-packages/neutron_plugin_contrail/extensions';
'DEFAULT/api_extensions_path': value => 'extensions:/usr/lib/python2.7/dist-packages/neutron_plugin_contrail/extensions:/usr/lib/python2.7/dist-packages/neutron_lbaas/extensions/';
'DEFAULT/service_plugins': value => 'neutron_plugin_contrail.plugins.opencontrail.loadbalancer.plugin.LoadBalancerPlugin';
'DEFAULT/allow_overlapping_ips': value => 'True';
'service_providers/service_provider': value => 'LOADBALANCER:Opencontrail:neutron_plugin_contrail.plugins.opencontrail.loadbalancer.driver.OpencontrailLoadbalancerDriver:default';
@ -61,15 +61,21 @@ class contrail::controller {
'QUOTAS/quota_subnet': value => '-1';
'QUOTAS/quota_port': value => '-1';
} ->
file_line {'add_neutron_defaults':
ensure => 'present',
line => '. /etc/default/neutron-server',
path => '/etc/init/neutron-server.conf',
after => 'neutron_plugin_ini_path',
} ->
file { '/etc/contrail/vnc_api_lib.ini':
content => template('contrail/vnc_api_lib.ini.erb')
} ->
file {'/etc/neutron/plugins/opencontrail/ContrailPlugin.ini':
content => template('contrail/ContrailPlugin.ini.erb'),
file {'/etc/neutron/plugins/opencontrail/contrailplugin.ini':
content => template('contrail/contrailplugin.ini.erb'),
} ->
file {'/etc/neutron/plugin.ini':
ensure => link,
target => '/etc/neutron/plugins/opencontrail/ContrailPlugin.ini'
target => '/etc/neutron/plugins/opencontrail/contrailplugin.ini'
}
# Contrail-specific heat templates settings
@ -128,8 +134,9 @@ class contrail::controller {
require => [Package['neutron-server'],
Package['neutron-plugin-contrail'],
],
subscribe => [File['/etc/neutron/plugins/opencontrail/ContrailPlugin.ini'],
subscribe => [File['/etc/neutron/plugins/opencontrail/contrailplugin.ini'],
File['/etc/neutron/plugin.ini'],
File_line['add_neutron_defaults'],
],
}

2
deployment_scripts/puppet/modules/contrail/templates/contrail-named.conf.erb
View File

@ -36,5 +36,5 @@ view "_default_view_" {
match-clients {any;};
match-destinations {any;};
match-recursive-only no;
forwarders { <%= external_dns['dns_list'].map{ |ip| "#{ip};" }.join(' ') %> };
forwarders { <%= external_dns['dns_list'].split(',').map{ |ip| "#{ip};" }.join(' ') %> };
};

0
deployment_scripts/puppet/modules/contrail/templates/ContrailPlugin.ini.erb → deployment_scripts/puppet/modules/contrail/templates/contrailplugin.ini.erb
View File

4
deployment_tasks.yaml
View File

@ -266,10 +266,6 @@
type: skipped
- id: openstack-network-agents-l3
type: skipped
- id: primary-openstack-network-plugins-l2
type: skipped
- id: openstack-network-plugins-l2
type: skipped
- id: primary-openstack-network-agents-dhcp
type: skipped
- id: openstack-network-agents-dhcp

4
metadata.yaml
View File

@ -7,13 +7,13 @@ version: 3.0.1
# Description
description: Contrail plugin for Fuel provides the functionality to add Juniper Contrail SDN for Mirantis OpenStack as network backend using Fuel Web UI in a user-friendly manner
# Required fuel version
fuel_version: ['9.0']
fuel_version: ['8.0']
is_hotpluggable: false
# The plugin is compatible with releases in the list
releases:
- os: ubuntu
version: liberty-9.0
version: liberty-8.0
mode: ['ha', 'multinode']
deployment_scripts_path: deployment_scripts/
repository_path: repositories/ubuntu