openstack
/
puppet-tacker
Code Issues Proposed changes

Merge pull request #2 from trozet/master 

Adds heat URI for VNFM heat driver and another minor fix
This commit is contained in:
Dan Radez 2016-04-26 17:17:58 -05:00
parent 9fc256e7ef 917c452c85
commit 6934f153ab
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/client.pp
View File

@ -19,9 +19,5 @@ class tacker::client (
if $ensure == 'present' {
include '::openstacklib::openstackclient'
} else {
class { '::openstacklib::openstackclient':
package_ensure => $ensure,
}
}
}
}

11
manifests/init.pp
View File

@ -202,6 +202,10 @@
# (Optional) Password to auth to the opendaylight server.
# Defaults to admin, which is the ODL default.
#
# [*heat_uri*]
# (Optional) Heat URI to access Heat API server.
# Defaults to false.
#
# == Dependencies
# None
#
@ -234,7 +238,7 @@
# == Authors
#
# Dan Radez <dradez@redhat.com>
#
# Tim Rozet <trozet@redhat.com>
# == Copyright
#
# Copyright 2015 Red Hat Inc, unless otherwise noted.
@ -286,6 +290,7 @@ class tacker(
$opendaylight_port = 8081,
$opendaylight_username = 'admin',
$opendaylight_password = 'admin',
$heat_uri = false,
) inherits tacker::params {
tacker_config {
'DEFAULT/service_plugins' : value => 'tacker.vm.plugin.VNFMPlugin,tacker.sfc.plugin.SFCPlugin,tacker.sfc_classifier.plugin.SFCCPlugin';
@ -312,6 +317,10 @@ class tacker(
tacker_config { 'keystone_authtoken/auth_uri': ensure => absent; }
}
if $heat_uri {
tacker_config { 'servicevm_heat/heat_uri': value => $heat_uri; }
}
if $auth_type == 'keystone' {
tacker_config {
'keystone_authtoken/project_name' : value => $keystone_tenant;