Merge "Fix duplicate listing of MariaDB image"

2018-09-18 18:00:37 +00:00 · 2018-09-18 18:00:37 +00:00 · f3055a4e65
parent bea399ef81 14ad2a2a60
commit f3055a4e65
1 changed files with 2 additions and 4 deletions
--- a/ansible/group_vars/all/kolla
+++ b/ansible/group_vars/all/kolla
@ -166,12 +166,10 @@ overcloud_container_image_regex_map:
    enabled: "{{ kolla_enable_manila | bool }}"
  - regex: mariadb
    enabled: "{{ kolla_enable_mariadb | bool }}"
-  - regex: murano
-    enabled: "{{ kolla_enable_murano | bool }}"
-  - regex: mariadb
-    enabled: True
  - regex: memcached
    enabled: True
+  - regex: murano
+    enabled: "{{ kolla_enable_murano | bool }}"
  - regex: neutron-server
    enabled: "{{ kolla_enable_neutron | bool }}"
  # Neutron SFC agent not currently supported on CentOS binary builds.