From 335ed05a5d2d431f1c2b8754ec322c483f3ae7b5 Mon Sep 17 00:00:00 2001
From: jacky06 <zhang.min@99cloud.net>
Date: Tue, 7 Jul 2020 23:36:39 +0800
Subject: [PATCH] Remove mongodb integration

more info: https://opendev.org/openstack/kolla-ansible/commit/a6c97d7284c7de437ebfc9f8ee289244f29e65d7

Depends-On: https://review.opendev.org/#/c/735030/
Change-Id: Ib94da2b14182ddc4157ca09066bd049c842fdf9c
---
 ansible/group_vars/all/kolla                                  | 3 ---
 ansible/roles/kolla-ansible/defaults/main.yml                 | 1 -
 ansible/roles/kolla-ansible/templates/globals.yml.j2          | 2 +-
 ansible/roles/kolla-ansible/templates/overcloud-components.j2 | 3 ---
 ansible/roles/kolla-ansible/tests/test-extras.yml             | 2 --
 ansible/roles/kolla-ansible/vars/main.yml                     | 1 -
 etc/kayobe/kolla.yml                                          | 1 -
 releasenotes/notes/remove-mongodb-fcdfba997e1abb51.yaml       | 4 ++++
 8 files changed, 5 insertions(+), 12 deletions(-)
 create mode 100644 releasenotes/notes/remove-mongodb-fcdfba997e1abb51.yaml

diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla
index 70162a52d..df978d715 100644
--- a/ansible/group_vars/all/kolla
+++ b/ansible/group_vars/all/kolla
@@ -192,8 +192,6 @@ overcloud_container_image_regex_map:
     enabled: "{{ kolla_enable_memcached | bool }}"
   - regex: mistral
     enabled: "{{ kolla_enable_mistral | bool }}"
-  - regex: mongodb
-    enabled: "{{ kolla_enable_mongodb | bool }}"
   - regex: multipathd
     enabled: "{{ kolla_enable_multipathd | bool }}"
   - regex: murano
@@ -449,7 +447,6 @@ kolla_enable_manila: "no"
 kolla_enable_masakari: "no"
 kolla_enable_mistral: "no"
 kolla_enable_monasca: "no"
-kolla_enable_mongodb: "no"
 kolla_enable_multipathd: "no"
 kolla_enable_murano: "no"
 kolla_enable_neutron_provider_networks: "no"
diff --git a/ansible/roles/kolla-ansible/defaults/main.yml b/ansible/roles/kolla-ansible/defaults/main.yml
index 588c69f90..05181f8d2 100644
--- a/ansible/roles/kolla-ansible/defaults/main.yml
+++ b/ansible/roles/kolla-ansible/defaults/main.yml
@@ -262,7 +262,6 @@ kolla_openstack_logging_debug:
 #kolla_enable_manila:
 #kolla_enable_mistral:
 #kolla_enable_monasca:
-#kolla_enable_mongodb:
 #kolla_enable_murano:
 #kolla_enable_multipathd:
 #kolla_enable_neutron_dvr:
diff --git a/ansible/roles/kolla-ansible/templates/globals.yml.j2 b/ansible/roles/kolla-ansible/templates/globals.yml.j2
index 708541761..295215818 100644
--- a/ansible/roles/kolla-ansible/templates/globals.yml.j2
+++ b/ansible/roles/kolla-ansible/templates/globals.yml.j2
@@ -309,7 +309,7 @@ enable_{{ feature_flag }}: {{ hostvars[inventory_hostname]['kolla_enable_' ~ fea
 ################
 ## Panko options
 ################
-# Valid options are [ mongodb, mysql ]
+# Valid options are [ mysql ]
 #panko_database_type: "mysql"
 
 #################
diff --git a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 b/ansible/roles/kolla-ansible/templates/overcloud-components.j2
index 98d5b25db..15a08636f 100644
--- a/ansible/roles/kolla-ansible/templates/overcloud-components.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-components.j2
@@ -99,9 +99,6 @@ monitoring
 [storm:children]
 monitoring
 
-[mongodb:children]
-control
-
 [keystone:children]
 control
 
diff --git a/ansible/roles/kolla-ansible/tests/test-extras.yml b/ansible/roles/kolla-ansible/tests/test-extras.yml
index 13afe0868..8c43d3c2d 100644
--- a/ansible/roles/kolla-ansible/tests/test-extras.yml
+++ b/ansible/roles/kolla-ansible/tests/test-extras.yml
@@ -180,7 +180,6 @@
             kolla_enable_mariadb: True
             kolla_enable_mistral: True
             kolla_enable_monasca: True
-            kolla_enable_mongodb: True
             kolla_enable_murano: True
             kolla_enable_multipathd: True
             kolla_enable_neutron_agent_ha: True
@@ -312,7 +311,6 @@
               #enable_mariadb: True
               #enable_mistral: True
               #enable_monasca: True
-              #enable_mongodb: True
               #enable_murano: True
               #enable_multipathd: True
               #enable_neutron_agent_ha: True
diff --git a/ansible/roles/kolla-ansible/vars/main.yml b/ansible/roles/kolla-ansible/vars/main.yml
index bf53313a9..27ab2cf1b 100644
--- a/ansible/roles/kolla-ansible/vars/main.yml
+++ b/ansible/roles/kolla-ansible/vars/main.yml
@@ -152,7 +152,6 @@ kolla_feature_flags:
   - memcached
   - mistral
   - monasca
-  - mongodb
   - multipathd
   - murano
   - neutron
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 4d7c24a95..8afe636db 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -265,7 +265,6 @@
 #kolla_enable_memcached:
 #kolla_enable_mistral:
 #kolla_enable_monasca:
-#kolla_enable_mongodb:
 #kolla_enable_multipathd:
 #kolla_enable_murano:
 #kolla_enable_neutron:
diff --git a/releasenotes/notes/remove-mongodb-fcdfba997e1abb51.yaml b/releasenotes/notes/remove-mongodb-fcdfba997e1abb51.yaml
new file mode 100644
index 000000000..32212b96b
--- /dev/null
+++ b/releasenotes/notes/remove-mongodb-fcdfba997e1abb51.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    Support for deploying with mongodb integrations has been removed.