Finish to configure authtoken with modern parameters

Code Issues Proposed changes

Change-Id: I1c6f3fad8ea1896b409f57b0268883bb99a2decd

This commit is contained in:

Emilien Macchi

2016年08月30日 14:56:51 -04:00

parent ca8fb9377e

commit 0564a673c3

4 changed files with 34 additions and 20 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/gnocchi.pp

View File

@@ -28,12 +28,17 @@ class openstack_integration::gnocchi {

admin_url=>"${::openstack_integration::config::base_url}:8041",

password=>'a_big_secret',

}

class{ '::gnocchi::keystone::authtoken':

password => 'a_big_secret',

user_domain_name => 'Default',

project_domain_name => 'Default',

auth_url => $::openstack_integration::config::keystone_admin_uri,

auth_uri => $::openstack_integration::config::keystone_auth_uri,

memcached_servers => $::openstack_integration::config::memcached_servers,

}

class{ '::gnocchi::api':

enabled => true,

keystone_password => 'a_big_secret',

keystone_identity_uri => $::openstack_integration::config::keystone_admin_uri,

keystone_auth_uri => $::openstack_integration::config::keystone_admin_uri,

service_name => 'httpd',

enabled => true,

service_name => 'httpd',

}

include::apache

class{ '::gnocchi::wsgi::apache':

12
manifests/neutron.pp

View File

@@ -120,15 +120,19 @@ class openstack_integration::neutron (

key_file => "/etc/neutron/ssl/private/${::fqdn}.pem",

}

class{ '::neutron::client': }

class{ '::neutron::keystone::authtoken':

password => 'a_big_secret',

user_domain_name => 'Default',

project_domain_name => 'Default',

auth_url => $::openstack_integration::config::keystone_admin_uri,

auth_uri => $::openstack_integration::config::keystone_auth_uri,

memcached_servers => $::openstack_integration::config::memcached_servers,

}

class{ '::neutron::server':

database_connection => 'mysql+pymysql://neutron:neutron@127.0.0.1/neutron?charset=utf8',

password => 'a_big_secret',

sync_db => true,

api_workers => 2,

rpc_workers => 2,

auth_uri => $::openstack_integration::config::keystone_auth_uri,

auth_url => $::openstack_integration::config::keystone_admin_uri,

memcached_servers => $::openstack_integration::config::memcached_servers,

 service_providers => ['LOADBALANCER:Haproxy:neutron_lbaas.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default',

'LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver'],

}

6
manifests/swift.pp

View File

@@ -55,9 +55,9 @@ class openstack_integration::swift {

include::swift::proxy::tempurl

include::swift::proxy::ratelimit

class{ '::swift::proxy::authtoken':

auth_uri => "${::openstack_integration::config::keystone_auth_uri}/v2.0",

identity_uri =>"${::openstack_integration::config::keystone_admin_uri}/",

admin_password=>'a_big_secret',

auth_uri => "${::openstack_integration::config::keystone_auth_uri}/v2.0",

auth_url =>"${::openstack_integration::config::keystone_admin_uri}/",

password=>'a_big_secret',

}

class{ '::swift::proxy::keystone':

operator_roles => ['Member', 'admin', 'SwiftOperator']

21
manifests/trove.pp

View File

@@ -48,15 +48,20 @@ class openstack_integration::trove {

internal_url=>"${::openstack_integration::config::base_url}:8779/v1.0/%(tenant_id)s",

admin_url=>"${::openstack_integration::config::base_url}:8779/v1.0/%(tenant_id)s",

}

class{ '::trove::keystone::authtoken':

password => 'a_big_secret',

user_domain_name => 'Default',

project_domain_name => 'Default',

auth_url => $::openstack_integration::config::keystone_admin_uri,

auth_uri => $::openstack_integration::config::keystone_auth_uri,

memcached_servers => $::openstack_integration::config::memcached_servers,

}

class{ '::trove::api':

bind_host => $::openstack_integration::config::host,

keystone_password => 'a_big_secret',

auth_uri => $::openstack_integration::config::keystone_auth_uri,

identity_uri => $::openstack_integration::config::keystone_admin_uri,

debug => true,

workers => 2,

cert_file => $crt_file,

key_file => $key_file,

bind_host => $::openstack_integration::config::host,

debug => true,

workers => 2,

cert_file => $crt_file,

key_file => $key_file,

}

class{ '::trove::client': }

class{ '::trove::conductor':