Skip to content

Commit

Permalink
Adding task to set contrail plugin
Browse files Browse the repository at this point in the history
Adding task to set contrail plugin in /etc/default/neutron-server
Closes-Bug:1376118
Change-Id: I6333805f0f324d0fa4b9aa9cef40523a4ea7bcbd
  • Loading branch information
Chhandak committed Jan 29, 2015
1 parent 23bec2a commit bce5064
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
9 changes: 9 additions & 0 deletions contrail/environment/modules/contrail/manifests/config.pp
Expand Up @@ -204,6 +204,7 @@
$internal_vip = $::contrail::params::internal_vip,
$external_vip = $::contrail::params::external_vip,
$contrail_internal_vip = $::contrail::params::contrail_internal_vip,
$contrail_plugin_location = $::contrail::params::contrail_plugin_location,
$config_ip_list = $::contrail::params::config_ip_list,
$config_name_list = $::contrail::params::config_name_list,
$database_ip_port = $::contrail::params::database_ip_port,
Expand Down Expand Up @@ -504,6 +505,14 @@
logoutput => true
}
->
exec { "config-neutron-server" :
command => "sudo sed -i '/NEUTRON_PLUGIN_CONFIG.*/d' /etc/default/neutron-server && echo \"$contrail_plugin_location\" >> /etc/default/neutron-server && service neutron-server restart && echo config-neutron-server >> /etc/contrail/contrail_config_exec.out",
onlyif => "test -f /etc/default/neutron-server",
unless => "grep -qx config-neutron-server /etc/contrail/contrail_config_exec.out",
provider => shell,
logoutput => 'true'
}
->
# initd script wrapper for contrail-discovery
file { "/etc/init.d/contrail-discovery" :
ensure => present,
Expand Down
1 change: 1 addition & 0 deletions contrail/environment/modules/contrail/manifests/params.pp
Expand Up @@ -90,6 +90,7 @@
$storage_osd_disks,
$kernel_upgrade = "yes",
$kernel_version = "3.13.0-34"
$contrail_plugin_location = "NEUTRON_PLUGIN_CONFIG=\'/etc/neutron/plugins/opencontrail/ContrailPlugin.ini\'"
) {
if ($zookeeper_ip_list == undef) {
$zk_ip_list_to_use = $config_ip_list
Expand Down

0 comments on commit bce5064

Please sign in to comment.