diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-04 06:51:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-04 06:51:44 +0000 |
| commit | 097734fbe06d4b52fabb2ec5edecb2ebb782db2e (patch) | |
| tree | a935773de3600f35724cdd88e946ef66603f53e6 /docker/centos | |
| parent | bf8d20826fe59a64a11f224578b36cedf72535e9 (diff) | |
| parent | efbfd7912b5fff41a3d3060af9e64c35c7e89f3b (diff) | |
| download | kolla-097734fbe06d4b52fabb2ec5edecb2ebb782db2e.tar.gz kolla-097734fbe06d4b52fabb2ec5edecb2ebb782db2e.zip | |
Merge "Ansible Mariadb w/ Galera support"
Diffstat (limited to 'docker/centos')
| -rw-r--r-- | docker/centos/binary/galera/Dockerfile | 5 | ||||
| l--------- | docker/centos/binary/galera/config-external.sh | 1 | ||||
| l--------- | docker/centos/binary/galera/config-internal.sh | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/docker/centos/binary/galera/Dockerfile b/docker/centos/binary/galera/Dockerfile index ce5477097..6e0e90f25 100644 --- a/docker/centos/binary/galera/Dockerfile +++ b/docker/centos/binary/galera/Dockerfile @@ -21,7 +21,8 @@ RUN echo "[mariadb]" > /etc/yum.repos.d/MariaDB.repo && \ tar \ expect -COPY config-galera.sh /opt/kolla/config-galera.sh -COPY start.sh /start.sh +COPY config-galera.sh /opt/kolla/config/ +COPY config-internal.sh config-external.sh /opt/kolla/ +COPY start.sh / CMD ["/start.sh"] diff --git a/docker/centos/binary/galera/config-external.sh b/docker/centos/binary/galera/config-external.sh new file mode 120000 index 000000000..72a04836e --- /dev/null +++ b/docker/centos/binary/galera/config-external.sh @@ -0,0 +1 @@ +../../../common/galera/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/galera/config-internal.sh b/docker/centos/binary/galera/config-internal.sh new file mode 120000 index 000000000..edab3d51f --- /dev/null +++ b/docker/centos/binary/galera/config-internal.sh @@ -0,0 +1 @@ +../../../common/galera/config-internal.sh
\ No newline at end of file |