diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-02 15:04:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-02 15:04:49 +0000 |
| commit | bcd726f1242d78169e6a5687e998473c1043c622 (patch) | |
| tree | 789a1805d1d9488029c5b6596c2c570371f57a65 /puppet/manifests/overcloud_controller.pp | |
| parent | 006daae9253b6545fab708c204c30325318554f2 (diff) | |
| parent | d9409b48ad6c9052defa05c79f0d28535d6ba933 (diff) | |
Merge "Composable Sahara services"
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 53bf62c7..439036a2 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -108,7 +108,6 @@ if hiera('step') >= 2 { include ::nova::db::mysql_api include ::neutron::db::mysql include ::cinder::db::mysql - include ::sahara::db::mysql if downcase(hiera('gnocchi_indexer_backend')) == 'mysql' { include ::gnocchi::db::mysql } @@ -504,11 +503,6 @@ if hiera('step') >= 4 { include ::aodh::listener include ::aodh::client - # Sahara - include ::sahara - include ::sahara::service::api - include ::sahara::service::engine - # Horizon include ::apache::mod::remoteip if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers') { |