diff options
| -rw-r--r-- | ansible/roles/mariadb/defaults/main.yml | 2 | ||||
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/mariadb/Dockerfile.j2 (renamed from docker/galera/Dockerfile.j2) | 0 | ||||
| -rw-r--r-- | docker/mariadb/config-external.sh (renamed from docker/galera/config-external.sh) | 0 | ||||
| -rwxr-xr-x | docker/mariadb/config-galera.sh (renamed from docker/galera/config-galera.sh) | 0 | ||||
| -rwxr-xr-x | docker/mariadb/start.sh (renamed from docker/galera/start.sh) | 0 |
6 files changed, 2 insertions, 2 deletions
diff --git a/ansible/roles/mariadb/defaults/main.yml b/ansible/roles/mariadb/defaults/main.yml index e2e6dd432..1b1f396a9 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 be54e9bee..cd41257f9 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 index 38e66ee14..38e66ee14 100644 --- a/docker/galera/Dockerfile.j2 +++ b/docker/mariadb/Dockerfile.j2 diff --git a/docker/galera/config-external.sh b/docker/mariadb/config-external.sh index 43447a51c..43447a51c 100644 --- a/docker/galera/config-external.sh +++ b/docker/mariadb/config-external.sh diff --git a/docker/galera/config-galera.sh b/docker/mariadb/config-galera.sh index cfdd7d9a2..cfdd7d9a2 100755 --- a/docker/galera/config-galera.sh +++ b/docker/mariadb/config-galera.sh diff --git a/docker/galera/start.sh b/docker/mariadb/start.sh index 986cca733..986cca733 100755 --- a/docker/galera/start.sh +++ b/docker/mariadb/start.sh |