diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-15 21:29:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-15 21:29:59 +0000 |
| commit | b0ba9e8e09d70cb5871a6f343a698e3b481ac297 (patch) | |
| tree | 247664b89d1b352d27c5ef4d9865408d4a934630 /puppet | |
| parent | 765aef08425578a15b5949bdc2866c7d7358a87d (diff) | |
| parent | c569b1928bd5241be677e8c168f56e04c49abd73 (diff) | |
Merge "Install mongodb client package"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 2 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 9e5c556a..5556a40c 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -46,7 +46,7 @@ if hiera('step') >= 2 { # MongoDB if downcase(hiera('ceilometer_backend')) == 'mongodb' { include ::mongodb::globals - + include ::mongodb::client include ::mongodb::server # NOTE(gfidente): We need to pass the list of IPv6 addresses *with* port and # without the brackets as 'members' argument for the 'mongodb_replset' diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 38639a52..db3d8652 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -127,6 +127,7 @@ if hiera('step') >= 1 { if downcase(hiera('ceilometer_backend')) == 'mongodb' { include ::mongodb::globals + include ::mongodb::client class { '::mongodb::server' : service_manage => false, } |