From c2b92c5e96857ea88f8b01df8a81b6418087a259 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Sat, 21 Mar 2015 16:17:01 -0700
Subject: [PATCH] Make mariadb use a data container without a bindmount

A data container is meant to operate without bindmounts.

Change-Id: I2624a63fd75db7ed8050054c17e19885f8a7ac8a
Co-Authored-By: Daneyon Hansen (danehans@cisco.com)
---
 compose/mariadb.yml            | 8 +++-----
 docker/mariadb-data/Dockerfile | 2 ++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compose/mariadb.yml b/compose/mariadb.yml
index d93c7b26c5..5a60c3ef05 100644
--- a/compose/mariadb.yml
+++ b/compose/mariadb.yml
@@ -1,14 +1,12 @@
 mariadbdata:
   image: kollaglue/centos-rdo-mariadb-data
-  volumes:
-    - /var/lib/mysql:/var/lib/mysql
-  net: "host"
-  privileged: true
+  name: mariadbdata
+
 mariadbapp:
   image: kollaglue/centos-rdo-mariadb-app
+  name: mariadbapp
   env_file:
     - openstack.env
   volumes_from:
     - mariadbdata
   net: "host"
-  privileged: true
diff --git a/docker/mariadb-data/Dockerfile b/docker/mariadb-data/Dockerfile
index 4f1a9b455c..a558313117 100644
--- a/docker/mariadb-data/Dockerfile
+++ b/docker/mariadb-data/Dockerfile
@@ -1,6 +1,8 @@
 FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
+VOLUME [ "/var/lib/mysql" ]
+
 # Command needed to start the data container.
 # Note: data containers do not need to be persistent.
 CMD ["/bin/sh"]