Merge "Disable mongodb by default"

This commit is contained in:
Jenkins 2017-05-23 10:01:47 +00:00 committed by Gerrit Code Review
commit 80925bfe34
5 changed files with 49 additions and 1 deletions

View File

@ -1,2 +1,3 @@
resource_registry:
OS::TripleO::Services::CeilometerCollector: ../../puppet/services/ceilometer-collector.yaml
OS::TripleO::Services::MongoDb: ../../puppet/services/database/mongodb.yaml

View File

@ -1,2 +1,3 @@
resource_registry:
OS::TripleO::Services::Zaqar: ../../puppet/services/zaqar.yaml
OS::TripleO::Services::MongoDb: ../../puppet/services/database/mongodb.yaml

View File

@ -171,7 +171,7 @@ resource_registry:
OS::TripleO::Services::Sshd: puppet/services/sshd.yaml
OS::TripleO::Services::Redis: puppet/services/database/redis.yaml
OS::TripleO::Services::NovaConductor: puppet/services/nova-conductor.yaml
OS::TripleO::Services::MongoDb: puppet/services/database/mongodb.yaml
OS::TripleO::Services::MongoDb: puppet/services/disabled/mongodb-disabled.yaml
OS::TripleO::Services::NovaApi: puppet/services/nova-api.yaml
OS::TripleO::Services::NovaPlacement: puppet/services/nova-placement.yaml
OS::TripleO::Services::NovaMetadata: puppet/services/nova-metadata.yaml

View File

@ -0,0 +1,38 @@
heat_template_version: pike
description: >
Mongodb service, disabled by default since pike
parameters:
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
via parameter_defaults in the resource registry. This
mapping overrides those in ServiceNetMapDefaults.
type: json
DefaultPasswords:
default: {}
type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
RoleName:
default: ''
description: Role name on which the service is applied
type: string
RoleParameters:
default: {}
description: Parameters specific to the role
type: json
outputs:
role_data:
description: Role data for the disabled MongoDB role.
value:
service_name: mongodb_disabled
upgrade_tasks:
- name: Stop and disable mongodb service on upgrade
tags: step1
service: name=mongod state=stopped enabled=no

View File

@ -0,0 +1,8 @@
---
upgrade:
- Mongodb is no longer used by default, so now one has to enable it
explicitly if there's a need for using it.
other:
- Mongodb is not used by any service we enable by default, so it has been
removed from the default services. It has subsequently been added to the
services that use it (zaqar and ceilometer-collector).