From 3487d8da14a82f8f01d0c58293c5f6597a9e4422 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Thu, 3 Sep 2015 09:12:38 +0000
Subject: [PATCH] Rename Galera to MariaDB

Change-Id: I3134ba72e2ce4e85a17facbc3b5af4c1c3438d33
Closes-Bug: #1491740
---
 ansible/roles/mariadb/defaults/main.yml       | 2 +-
 docker/base/Dockerfile.j2                     | 2 +-
 docker/{galera => mariadb}/Dockerfile.j2      | 0
 docker/{galera => mariadb}/config-external.sh | 0
 docker/{galera => mariadb}/config-galera.sh   | 0
 docker/{galera => mariadb}/start.sh           | 0
 6 files changed, 2 insertions(+), 2 deletions(-)
 rename docker/{galera => mariadb}/Dockerfile.j2 (100%)
 rename docker/{galera => mariadb}/config-external.sh (100%)
 rename docker/{galera => mariadb}/config-galera.sh (100%)
 rename docker/{galera => mariadb}/start.sh (100%)

diff --git a/ansible/roles/mariadb/defaults/main.yml b/ansible/roles/mariadb/defaults/main.yml
index e2e6dd432f..1b1f396a9a 100644
--- a/ansible/roles/mariadb/defaults/main.yml
+++ b/ansible/roles/mariadb/defaults/main.yml
@@ -10,7 +10,7 @@ database_cluster_name: "openstack"
 ####################
 # Docker
 ####################
-mariadb_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-galera"
+mariadb_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-mariadb"
 mariadb_tag: "{{ openstack_release }}"
 mariadb_image_full: "{{ mariadb_image }}:{{ mariadb_tag }}"
 
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index be54e9beea..cd41257f92 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -8,7 +8,7 @@ ENV KOLLA_INSTALL_TYPE {{ install_type }}
 
 {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
 
-# Turns on galera repos throughout the build
+# Turns on MariaDB repos throughout the build
 COPY mariadb.yum.repo /etc/yum.repos.d/MariaDB.repo
 
 RUN yum install -y http://www.percona.com/redir/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm \
diff --git a/docker/galera/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2
similarity index 100%
rename from docker/galera/Dockerfile.j2
rename to docker/mariadb/Dockerfile.j2
diff --git a/docker/galera/config-external.sh b/docker/mariadb/config-external.sh
similarity index 100%
rename from docker/galera/config-external.sh
rename to docker/mariadb/config-external.sh
diff --git a/docker/galera/config-galera.sh b/docker/mariadb/config-galera.sh
similarity index 100%
rename from docker/galera/config-galera.sh
rename to docker/mariadb/config-galera.sh
diff --git a/docker/galera/start.sh b/docker/mariadb/start.sh
similarity index 100%
rename from docker/galera/start.sh
rename to docker/mariadb/start.sh