Skip to content

Commit

Permalink
Removed plugins_dirs
Browse files Browse the repository at this point in the history
Plugin dirs is configured via THT parameter now
https://review.opencontrail.org/#/c/45344/

Change-Id: I59c47f18674c6b53fcd8832bbfc878c9dd9c4e18
Partial-Bug: #1785611
  • Loading branch information
alexey-mr committed Aug 7, 2018
1 parent 8985704 commit 77d86fe
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions manifests/network/contrail/heat.pp
Expand Up @@ -69,7 +69,6 @@
$api_server = hiera('contrail_config_vip', hiera('internal_api_virtual_ip')),
$api_port = hiera('contrail::api_port', '8082'),
$api_server_use_ssl = hiera('contrail_internal_api_ssl', false),
$plugin_dirs = hiera('contrail_heat_plugin_dirs', '/usr/lib/python2.7/site-packages/vnc_api/gen/heat/resources,/usr/lib/python2.7/site-packages/contrail_heat/resources')
) {
if $api_server_use_ssl {
$use_ssl = 'True'
Expand All @@ -78,9 +77,6 @@
}

$heat_config = {
'DEFAULT' => {
'plugin_dirs' => $plugin_dirs,
},
'clients_contrail' => {
'api_base_url' => '/',
'api_server' => $api_server,
Expand All @@ -95,16 +91,6 @@
}

validate_hash($heat_config)

file { '/usr/lib/heat':
ensure => 'directory',
} ->
file { '/usr/lib/heat/contrail_heat':
ensure => 'link',
target => '/usr/lib/python2.7/site-packages/vnc_api/gen/heat',
}

$contrail_heat_config = { 'path' => '/etc/heat/heat.conf' }

create_ini_settings($heat_config, $contrail_heat_config)
}

0 comments on commit 77d86fe

Please sign in to comment.