x/puppet-midonet
Code Issues Proposed changes

Merge "Make cluster tenant name and keystone proto config"

Browse Source
This commit is contained in:
Jenkins 2016-09-12 12:53:25 +00:00 committed by Gerrit Code Review
commit a96feb45cc
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/cluster.pp
View File

@ -86,6 +86,8 @@ class midonet::cluster (
$cassandra_rep_factor,
$keystone_admin_token,
$keystone_host,
$keystone_protocol = undef,
$keystone_tenant_name = undef,
$package_name = undef,
$service_name = undef,
$service_ensure = undef,
@ -123,6 +125,8 @@ class midonet::cluster (
keystone_admin_token => $keystone_admin_token,
keystone_host => $keystone_host,
keystone_port => $keystone_port,
keystone_tenant_name => $keystone_tenant_name,
keystone_protocol => $keystone_protocol,
is_insights => $is_insights,
require => Class['midonet::cluster::install']
}

2
manifests/cluster/run.pp
View File

@ -28,7 +28,9 @@ class midonet::cluster::run (
$cassandra_rep_factor,
$keystone_admin_token,
$keystone_host,
$keystone_protocol = 'http',
$keystone_port = '35357',
$keystone_tenant_name = 'admin',
$service_name = 'midonet-cluster',
$service_ensure = 'running',
$service_enable = true,

3
templates/cluster/mn-cluster_config.sh.erb
View File

@ -29,10 +29,11 @@ cat << EOF | mn-conf set -t default
cluster.auth {
provider_class = "org.midonet.cluster.auth.keystone.KeystoneService"
admin_role = "admin"
keystone.tenant_name = "admin"
keystone.tenant_name = "<%= @keystone_tenant_name %>"
keystone.admin_token = "<%= @keystone_admin_token %>"
keystone.host = <%= @keystone_host %>
keystone.port = <%= @keystone_port %>
keystone.protocol = <%= @keystone_protocol %>
}
cluster.rest_api {
http_host = <%= @cluster_host %>