diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-01-12 17:31:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-01-12 17:31:04 +0000 |
| commit | c662d0f7cc2286b038e0a04f12507322fd2ba78f (patch) | |
| tree | 53ee3e045979c475a2a114be8ae711224b85df0b /puppet/manifests/overcloud_controller.pp | |
| parent | 31b05b17bfd028d16990231079c4bfde777cde40 (diff) | |
| parent | d69868ea9eec3d1f0a59b1fd6635a2c14df6e609 (diff) | |
Merge "Sahara Integration"
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 2ea9c60d..29af6ca2 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -103,6 +103,7 @@ if hiera('step') >= 2 { include ::neutron::db::mysql include ::cinder::db::mysql include ::heat::db::mysql + include ::sahara::db::mysql if downcase(hiera('ceilometer_backend')) == 'mysql' { include ::ceilometer::db::mysql } @@ -564,6 +565,11 @@ if hiera('step') >= 3 { include ::heat::api_cloudwatch include ::heat::engine + # Sahara + include ::sahara + include ::sahara::service::api + include ::sahara::service::engine + # Horizon if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers') { $_profile_support = 'cisco' |