From 9e6130572c8f88e2ba84213ef235bcda1f6b0a45 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 25 Aug 2016 10:47:55 -0400 Subject: [PATCH] Configure authtoken with new method Configure Aodh, Ceilometer, Ironic and Nova authtoken sections with new method. Depends-On: I779cb0b76187f742555c5c77f3d6b97d35c6be28 Change-Id: I8f5b7f3d7392bfa4215fccd7defe953857cef3f6 --- manifests/aodh.pp | 16 ++++++++++------ manifests/ceilometer.pp | 16 ++++++++++------ manifests/ironic.pp | 16 ++++++++++------ manifests/nova.pp | 11 ++++++++--- 4 files changed, 38 insertions(+), 21 deletions(-) diff --git a/manifests/aodh.pp b/manifests/aodh.pp index 1dfe0235b..a90ba9bc5 100644 --- a/manifests/aodh.pp +++ b/manifests/aodh.pp @@ -54,13 +54,17 @@ class openstack_integration::aodh { admin_url => "${::openstack_integration::config::base_url}:8042", password => 'a_big_secret', } + class { '::aodh::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 { '::aodh::api': - enabled => true, - keystone_password => 'a_big_secret', - keystone_auth_url => $::openstack_integration::config::keystone_admin_uri, - keystone_auth_uri => $::openstack_integration::config::keystone_admin_uri, - memcached_servers => $::openstack_integration::config::memcached_servers, - service_name => 'httpd', + enabled => true, + service_name => 'httpd', } include ::apache class { '::aodh::wsgi::apache': diff --git a/manifests/ceilometer.pp b/manifests/ceilometer.pp index 3a26ac79e..c0371f230 100644 --- a/manifests/ceilometer.pp +++ b/manifests/ceilometer.pp @@ -47,13 +47,17 @@ class openstack_integration::ceilometer { admin_url => "${::openstack_integration::config::base_url}:8777", password => 'a_big_secret', } + class { '::ceilometer::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 { '::ceilometer::api': - enabled => true, - keystone_password => 'a_big_secret', - identity_uri => $::openstack_integration::config::keystone_admin_uri, - auth_uri => $::openstack_integration::config::keystone_auth_uri, - memcached_servers => $::openstack_integration::config::memcached_servers, - service_name => 'httpd', + enabled => true, + service_name => 'httpd', } include ::apache class { '::ceilometer::wsgi::apache': diff --git a/manifests/ironic.pp b/manifests/ironic.pp index 751a9c16b..b9d5c584e 100644 --- a/manifests/ironic.pp +++ b/manifests/ironic.pp @@ -47,14 +47,18 @@ class openstack_integration::ironic { admin_url => "${::openstack_integration::config::base_url}:6385", password => 'a_big_secret', } + class { '::ironic::api::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 { '::ironic::client': } class { '::ironic::api': - auth_uri => $::openstack_integration::config::keystone_auth_uri, - identity_uri => $::openstack_integration::config::keystone_admin_uri, - memcached_servers => $::openstack_integration::config::memcached_servers, - neutron_url => "http://${::openstack_integration::config::ip_for_url}:9696", - admin_password => 'a_big_secret', - service_name => 'httpd', + neutron_url => "http://${::openstack_integration::config::ip_for_url}:9696", + service_name => 'httpd', } include ::apache class { '::ironic::wsgi::apache': diff --git a/manifests/nova.pp b/manifests/nova.pp index 11be7ad78..9aae1fae1 100644 --- a/manifests/nova.pp +++ b/manifests/nova.pp @@ -57,6 +57,14 @@ class openstack_integration::nova ( admin_url => "${::openstack_integration::config::base_url}:8774/v2.1", password => 'a_big_secret', } + class { '::nova::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 { '::nova': database_connection => 'mysql+pymysql://nova:nova@127.0.0.1/nova?charset=utf8', api_database_connection => 'mysql+pymysql://nova_api:nova@127.0.0.1/nova_api?charset=utf8', @@ -73,9 +81,6 @@ class openstack_integration::nova ( notify_on_state_change => 'vm_and_task_state', } class { '::nova::api': - admin_password => 'a_big_secret', - auth_uri => $::openstack_integration::config::keystone_auth_uri, - identity_uri => $::openstack_integration::config::keystone_admin_uri, api_bind_address => $::openstack_integration::config::host, neutron_metadata_proxy_shared_secret => 'a_big_secret', metadata_workers => 2,