Merge "Make mariadb use a data container without a bindmount"

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

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"]