From 0564a673c306cc0c3e88abe3be38e2f418c81aca Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: 2016年8月30日 14:56:51 -0400
Subject: [PATCH] Finish to configure authtoken with modern parameters
Change-Id: I1c6f3fad8ea1896b409f57b0268883bb99a2decd
---
 manifests/gnocchi.pp &#124; 15 ++++++++++-----
 manifests/neutron.pp &#124; 12 ++++++++----
 manifests/swift.pp &#124; 6 +++---
 manifests/trove.pp &#124; 21 +++++++++++++--------
 4 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/manifests/gnocchi.pp b/manifests/gnocchi.pp
index 6ba4df37a..4fca6dd92 100644
--- a/manifests/gnocchi.pp
+++ b/manifests/gnocchi.pp
@@ -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':
diff --git a/manifests/neutron.pp b/manifests/neutron.pp
index f5115ac3d..f6599a89a 100644
--- a/manifests/neutron.pp
+++ b/manifests/neutron.pp
@@ -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'],
 }
diff --git a/manifests/swift.pp b/manifests/swift.pp
index a8c2c5cc2..c1a9b08ae 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -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']
diff --git a/manifests/trove.pp b/manifests/trove.pp
index 8ece7067d..67e93a605 100644
--- a/manifests/trove.pp
+++ b/manifests/trove.pp
@@ -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':
</div><div class="naked_ctrl">
<form action="/index.cgi/larger-text" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://opendev.org/openstack/puppet-openstack-integration/commit/0564a673c306cc0c3e88abe3be38e2f418c81aca.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://opendev.org/openstack/puppet-openstack-integration/commit/0564a673c306cc0c3e88abe3be38e2f418c81aca.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast">配色反転</option>
<option value="larger-text" selected="selected">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>