openstack/puppet-openstack-integration
Code Issues Proposed changes

Configure authtoken with new method

Browse Source 
Configure Aodh, Ceilometer, Ironic and Nova authtoken sections with new
method.

Depends-On: I779cb0b76187f742555c5c77f3d6b97d35c6be28
Change-Id: I8f5b7f3d7392bfa4215fccd7defe953857cef3f6
This commit is contained in:
Emilien Macchi 2016-08-25 10:47:55 -04:00
parent 2cdb5e0282
commit 9e6130572c
4 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/aodh.pp
View File

@ -54,12 +54,16 @@ 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',
}
include ::apache

12
manifests/ceilometer.pp
View File

@ -47,12 +47,16 @@ class openstack_integration::ceilometer {
admin_url => "${::openstack_integration::config::base_url}:8777",
password => 'a_big_secret',
}
class { '::ceilometer::api':
enabled => true,
keystone_password => 'a_big_secret',
identity_uri => $::openstack_integration::config::keystone_admin_uri,
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,
service_name => 'httpd',
}
include ::apache

12
manifests/ironic.pp
View File

@ -47,13 +47,17 @@ 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',
}
include ::apache

11
manifests/nova.pp
View File

@ -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,