x/puppet-midonet
Code Issues Proposed changes

Make cluster tenant name and keystone proto config

Browse Source 
Change-Id: I6c20ca4f2d0536f9d93ce7dc1df4784127eb870b
This commit is contained in:
Alex Ruiz Estradera
2016-09-12 12:54:50 +02:00
parent ef7a5b184b
commit d2caad83d2
3 changed files with 8 additions and 1 deletions
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, $cassandra_rep_factor,
$keystone_admin_token, $keystone_admin_token,
$keystone_host, $keystone_host,
$keystone_protocol = undef,
$keystone_tenant_name = undef,
$package_name = undef, $package_name = undef,
$service_name = undef, $service_name = undef,
$service_ensure = undef, $service_ensure = undef,
@@ -123,6 +125,8 @@ class midonet::cluster (
keystone_admin_token => $keystone_admin_token, keystone_admin_token => $keystone_admin_token,
keystone_host => $keystone_host, keystone_host => $keystone_host,
keystone_port => $keystone_port, keystone_port => $keystone_port,
keystone_tenant_name => $keystone_tenant_name,
keystone_protocol => $keystone_protocol,
is_insights => $is_insights, is_insights => $is_insights,
require => Class['midonet::cluster::install'] require => Class['midonet::cluster::install']
} }

2
manifests/cluster/run.pp
View File

@@ -28,7 +28,9 @@ class midonet::cluster::run (
$cassandra_rep_factor, $cassandra_rep_factor,
$keystone_admin_token, $keystone_admin_token,
$keystone_host, $keystone_host,
$keystone_protocol = 'http',
$keystone_port = '35357', $keystone_port = '35357',
$keystone_tenant_name = 'admin',
$service_name = 'midonet-cluster', $service_name = 'midonet-cluster',
$service_ensure = 'running', $service_ensure = 'running',
$service_enable = true, $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 { cluster.auth {
provider_class = "org.midonet.cluster.auth.keystone.KeystoneService" provider_class = "org.midonet.cluster.auth.keystone.KeystoneService"
admin_role = "admin" admin_role = "admin"
keystone.tenant_name = "admin" keystone.tenant_name = "<%= @keystone_tenant_name %>"
keystone.admin_token = "<%= @keystone_admin_token %>" keystone.admin_token = "<%= @keystone_admin_token %>"
keystone.host = <%= @keystone_host %> keystone.host = <%= @keystone_host %>
keystone.port = <%= @keystone_port %> keystone.port = <%= @keystone_port %>
keystone.protocol = <%= @keystone_protocol %>
} }
cluster.rest_api { cluster.rest_api {
http_host = <%= @cluster_host %> http_host = <%= @cluster_host %>