x/puppet-midonet
Code Issues Proposed changes

Merge "Enable MidoNet Cluster to work with non-admin user"

Browse Source
This commit is contained in:
Jenkins 2016-11-24 17:03:42 +00:00 committed by Gerrit Code Review
commit 0d2eeb2000
3 changed files with 65 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
manifests/cluster.pp
View File

@ -113,26 +113,31 @@ class midonet::cluster (
$zookeeper_hosts,
$cassandra_servers,
$cassandra_rep_factor,
$keystone_admin_token,
$keystone_host,
$keystone_protocol = undef,
$keystone_tenant_name = undef,
$package_name = undef,
$package_ensure = undef,
$service_name = undef,
$service_ensure = undef,
$service_enable = undef,
$cluster_config_path = undef,
$cluster_jvm_config_path = undef,
$cluster_host = undef,
$cluster_port = undef,
$keystone_port = undef,
$max_heap_size = undef,
$heap_newsize = undef,
$is_mem = undef,
$is_insights = undef,
$insights_ssl = undef,
$analytics_ip = undef,
$keystone_protocol = undef,
$keystone_admin_token = undef,
$keystone_user_name = undef,
$keystone_user_password = undef,
$keystone_tenant_name = undef,
$keystone_domain_name = undef,
$keystone_domain_id = undef,
$keystone_keystone_version = undef,
$package_name = undef,
$package_ensure = undef,
$service_name = undef,
$service_ensure = undef,
$service_enable = undef,
$cluster_config_path = undef,
$cluster_jvm_config_path = undef,
$cluster_host = undef,
$cluster_port = undef,
$keystone_port = undef,
$max_heap_size = undef,
$heap_newsize = undef,
$is_mem = undef,
$is_insights = undef,
$insights_ssl = undef,
$analytics_ip = undef,
) {
class { 'midonet::cluster::install':
@ -143,28 +148,33 @@ class midonet::cluster (
contain midonet::cluster::install
class { 'midonet::cluster::run':
service_name => $service_name,
service_ensure => $service_ensure,
service_enable => $service_enable,
cluster_config_path => $cluster_config_path,
cluster_jvm_config_path => $cluster_config_path,
cluster_host => $cluster_host,
cluster_port => $cluster_port,
max_heap_size => $max_heap_size,
heap_newsize => $heap_newsize,
zookeeper_hosts => $zookeeper_hosts,
cassandra_servers => $cassandra_servers,
cassandra_rep_factor => $cassandra_rep_factor,
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,
insights_ssl => $insights_ssl,
analytics_ip => $analytics_ip,
package_ensure => $package_ensure,
require => Class['midonet::cluster::install']
service_name => $service_name,
service_ensure => $service_ensure,
service_enable => $service_enable,
cluster_config_path => $cluster_config_path,
cluster_jvm_config_path => $cluster_config_path,
cluster_host => $cluster_host,
cluster_port => $cluster_port,
max_heap_size => $max_heap_size,
heap_newsize => $heap_newsize,
zookeeper_hosts => $zookeeper_hosts,
cassandra_servers => $cassandra_servers,
cassandra_rep_factor => $cassandra_rep_factor,
keystone_admin_token => $keystone_admin_token,
keystone_host => $keystone_host,
keystone_port => $keystone_port,
keystone_tenant_name => $keystone_tenant_name,
keystone_protocol => $keystone_protocol,
keystone_user_name => undef,
keystone_user_password => undef,
keystone_domain_name => 'Default',
keystone_domain_id => 'default',
keystone_keystone_version => '3',
is_insights => $is_insights,
insights_ssl => $insights_ssl,
analytics_ip => $analytics_ip,
package_ensure => $package_ensure,
require => Class['midonet::cluster::install']
}
contain midonet::cluster::run
}

7
manifests/cluster/run.pp
View File

@ -87,11 +87,16 @@ class midonet::cluster::run (
$zookeeper_hosts,
$cassandra_servers,
$cassandra_rep_factor,
$keystone_admin_token,
$keystone_host,
$keystone_admin_token = undef,
$keystone_user_name = undef,
$keystone_user_password = undef,
$keystone_protocol = 'http',
$keystone_port = '35357',
$keystone_tenant_name = 'admin',
$keystone_domain_name = 'Default',
$keystone_domain_id = 'default',
$keystone_keystone_version = '3',
$service_name = 'midonet-cluster',
$service_ensure = 'running',
$service_enable = true,

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

@ -43,9 +43,14 @@ cluster.auth {
admin_role = "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 %>
keystone.host = "<%= @keystone_host %>"
keystone.port = "<%= @keystone_port %>"
keystone.protocol = "<%= @keystone_protocol %>"
keystone.domain_name = "<%= @keystone_domain_name %>"
keystone.domain_id = "<%= @keystone_domain_id %>"
keystone.user_name = "<%= @keystone_user_name %>"
keystone.user_password = "<%= @keystone_user_password %>"
keystone.version = "<%= @keystone_keystone_version %>"
}
cluster.rest_api {
http_host = <%= @cluster_host %>