diff options
| author |   Dan Prince <dprince@redhat.com> | 2015-01-23 15:52:52 -0500 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2015-02-04 09:33:13 -0500 |
| commit | 1e2a7a158154a18b779933523d090c2cf6ac58d2 (patch) | |
| tree | 46d82a925d4c0651554ca2f10690eb52bfd2efe7 /puppet | |
| parent | dd80103568c275ca8405c5a146a3bb010e1a7fc7 (diff) | |
Puppet: Heat API and Engine
This patch adds the ability to configure the Heat API and
Heat engine on controller nodes via puppet.
Change-Id: Ie81090bceed3e18199a36ebb11d1cbcaea83c410
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/hieradata/controller.yaml | 6 | ||||
| -rw-r--r-- | puppet/overcloud_controller.pp | 13 |
2 files changed, 18 insertions, 1 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml index 5f326ef4..e59211d4 100644 --- a/puppet/hieradata/controller.yaml +++ b/puppet/hieradata/controller.yaml @@ -20,6 +20,7 @@ neutron::agents::metadata::auth_tenant: 'service' cinder::api::keystone_tenant: 'service' swift::proxy::authtoken::admin_tenant_name: 'service' ceilometer::api::keystone_tenant: 'service' +heat::keystone_tenant: 'service' #swift swift::proxy::pipeline: @@ -63,4 +64,9 @@ nova::api::osapi_v3: true # cinder cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler +# heat +heat::engine::heat_stack_user_role: '' +heat::engine::configure_delegated_roles: false +heat::engine::trusts_delegated_roles: [] + mysql::server::manage_config_file: true diff --git a/puppet/overcloud_controller.pp b/puppet/overcloud_controller.pp index 6535afe1..c217c5e9 100644 --- a/puppet/overcloud_controller.pp +++ b/puppet/overcloud_controller.pp @@ -70,7 +70,7 @@ if hiera('step') >= 1 { dbname => $cinder_dsn[6], allowed_hosts => $allowed_hosts, } - $heat_dsn = split(hiera('heat_dsn'), '[@:/?]') + $heat_dsn = split(hiera('heat::database_connection'), '[@:/?]') class { 'heat::db::mysql': user => $heat_dsn[3], password => $heat_dsn[4], @@ -269,4 +269,15 @@ if hiera('step') >= 2 { Cron <| title == 'ceilometer-expirer' |> { command => "sleep $((\$(od -A n -t d -N 3 /dev/urandom) % 86400)) && ${::ceilometer::params::expirer_command}" } + # Heat + include ::heat + include ::heat::api + include ::heat::api_cfn + include ::heat::api_cloudwatch + include ::heat::engine + + heat_config { + 'DEFAULT/instance_user': value => 'heat-admin'; + } + } #END STEP 2 |