summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--environments/services/ceilometer-collector.yaml1
-rw-r--r--environments/services/zaqar.yaml1
-rw-r--r--overcloud-resource-registry-puppet.j2.yaml2
-rw-r--r--puppet/services/disabled/mongodb-disabled.yaml38
-rw-r--r--releasenotes/notes/Disable-mongodb-by-default-cce37d3254a77d27.yaml8
5 files changed, 49 insertions, 1 deletions
diff --git a/environments/services/ceilometer-collector.yaml b/environments/services/ceilometer-collector.yaml
index 4cc765f2..f97d3e0b 100644
--- a/environments/services/ceilometer-collector.yaml
+++ b/environments/services/ceilometer-collector.yaml
@@ -1,2 +1,3 @@
resource_registry:
OS::TripleO::Services::CeilometerCollector: ../../puppet/services/ceilometer-collector.yaml
+ OS::TripleO::Services::MongoDb: ../../puppet/services/database/mongodb.yaml
diff --git a/environments/services/zaqar.yaml b/environments/services/zaqar.yaml
index ee137925..e501b69c 100644
--- a/environments/services/zaqar.yaml
+++ b/environments/services/zaqar.yaml
@@ -1,2 +1,3 @@
resource_registry:
OS::TripleO::Services::Zaqar: ../../puppet/services/zaqar.yaml
+ OS::TripleO::Services::MongoDb: ../../puppet/services/database/mongodb.yaml
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 51be5644..c99fa3f1 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -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
diff --git a/puppet/services/disabled/mongodb-disabled.yaml b/puppet/services/disabled/mongodb-disabled.yaml
new file mode 100644
index 00000000..fa3fe9a8
--- /dev/null
+++ b/puppet/services/disabled/mongodb-disabled.yaml
@@ -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
diff --git a/releasenotes/notes/Disable-mongodb-by-default-cce37d3254a77d27.yaml b/releasenotes/notes/Disable-mongodb-by-default-cce37d3254a77d27.yaml
new file mode 100644
index 00000000..e6e452f2
--- /dev/null
+++ b/releasenotes/notes/Disable-mongodb-by-default-cce37d3254a77d27.yaml
@@ -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).