x
/
fuel-plugin-contrail
Code Issues Proposed changes

Update configs for Contrail 3.1 

Change-Id: I74060fdd8ef993733982fffa2aa022235d41d238
Signed-off-by: Illia Polliul <ipolliul@mirantis.com>
This commit is contained in:
Illia Polliul 2016-08-10 00:07:50 +03:00
parent 1470968240
commit c15bf2ba9c
5 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment_scripts/puppet/modules/contrail/files/supervisord_config.conf
View File

@ -7,7 +7,7 @@
; variables can be expanded using this syntax: "%(ENV_HOME)s".
[unix_http_server]
file=/tmp/supervisord_config.sock ; (the path to the socket file)
file=/var/run/supervisord_config.sock ; (the path to the socket file)
chmod=0700 ; socket file mode (default 0700)
;chown=nobody:nogroup ; socket file uid:gid owner
;username=user ; (default is no username (open server))

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

@ -61,25 +61,30 @@ class contrail::controller {
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:/usr/lib/python2.7/dist-packages/neutron_lbaas/extensions/';
'DEFAULT/service_plugins': value => 'neutron_plugin_contrail.plugins.opencontrail.loadbalancer.plugin.LoadBalancerPlugin';
'DEFAULT/service_plugins': value => 'neutron_plugin_contrail.plugins.opencontrail.loadbalancer.v2.plugin.LoadBalancerPluginV2';
'DEFAULT/allow_overlapping_ips': value => 'True';
'service_providers/service_provider': value => 'LOADBALANCER:Opencontrail:neutron_plugin_contrail.plugins.opencontrail.loadbalancer.driver.OpencontrailLoadbalancerDriver:default';
'keystone_authtoken/auth_host': value => $contrail::keystone_address;
'keystone_authtoken/admin_user': value => 'neutron';
'keystone_authtoken/admin_password': value => $::contrail::service_token;
'keystone_authtoken/admin_tenant_name': value => $::contrail::service_tenant;
'keystone_authtoken/auth_host': value => $::contrail::keystone_address;
'keystone_authtoken/auth_type': ensure => absent;
'keystone_authtoken/auth_port': value => '35357';
'keystone_authtoken/auth_protocol': value => $contrail::keystone_protocol;
'keystone_authtoken/auth_protocol': value => $::contrail::keystone_protocol;
'keystone_authtoken/identity_uri': value => $::identity_uri;
'QUOTAS/quota_network': value => '-1';
'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'),
} ->

3
deployment_scripts/puppet/modules/contrail/templates/contrail-api.conf.erb
View File

@ -6,7 +6,6 @@ ifmap_password=api-server
cassandra_server_list=<%= scope.lookupvar('contrail::contrail_db_ips').map{ |ip| "#{ip}:9160" }.join(' ') %>
listen_ip_addr=0.0.0.0
listen_port=9100
multi_tenancy=True
log_file=/var/log/contrail/contrail-api.log
log_local=1
log_level=SYS_NOTICE
@ -18,6 +17,8 @@ rabbit_server=<%= scope.lookupvar('contrail::contrail_private_vip') %>
rabbit_port=5673
list_optimization_enabled=True
auth = keystone
aaa_mode=cloud-admin
cloud_admin_role=admin
rabbit_user = nova
rabbit_password = <%= scope.lookupvar('contrail::rabbit_password') %>

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

@ -5,7 +5,7 @@ auth_port=35357
auth_url=<%= scope.lookupvar('contrail::auth_url') %>
admin_user=<%= scope.lookupvar('contrail::neutron_user') %>
admin_password=<%= scope.lookupvar('contrail::service_token') %>
admin_token=<%= scope.lookupvar('contrail::admin_token') %>
#admin_token=<%= scope.lookupvar('contrail::admin_token') %>
admin_tenant_name=<%= scope.lookupvar('contrail::service_tenant') %>
insecure=True
memcache_servers=<%= scope.lookupvar('contrail::memcache_ips').map{ |ip| "#{ip}:11211" }.join(',') %>

3
deployment_scripts/puppet/modules/contrail/templates/contrailplugin.ini.erb
View File

@ -1,7 +1,8 @@
[APISERVER]
api_server_ip = <%= scope.lookupvar('contrail::contrail_mgmt_vip') %>
api_server_port = 8082
multi_tenancy = True
aaa_mode=cloud-admin
cloud_admin_role=admin
contrail_extensions = ipam:neutron_plugin_contrail.plugins.opencontrail.contrail_plugin_ipam.NeutronPluginContrailIpam,policy:neutron_plugin_contrail.plugins.opencontrail.contrail_plugin_policy.NeutronPluginContrailPolicy,route-table:neutron_plugin_contrail.plugins.opencontrail.contrail_plugin_vpc.NeutronPluginContrailVpc,contrail:None
[COLLECTOR]