Skip to content

Commit b04b47d

Browse files
committed
feat(store): add store-volume and store-metadata
These components enable the logger and controller to mount a shared filesystem backed by CephFS.
1 parent 05b033b commit b04b47d

5 files changed

Lines changed: 9 additions & 9 deletions

File tree

api/static/500.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<div class="container">
2727
<div class="row">
2828
<h1>Internal Server Error</h1>
29-
<p>See /var/log/deis for details</p>
29+
<p>See /data for details</p>
3030
</div> <!-- .row -->
3131
</div> <!-- .main_section container-->
3232

bin/boot

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ done
5151

5252
cd /app
5353

54-
# give the deis user permissions to write to the volume mount
55-
chown -R deis:deis /var/log/deis
54+
mkdir -p /data/logs
55+
chmod 777 /data/logs
5656

5757
# run an idempotent database migration
5858
sudo -E -u deis ./manage.py syncdb --migrate --noinput

build.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/usr/bin/env bash
22

33
if [[ -z $DOCKER_BUILD ]]; then
4-
echo
4+
echo
55
echo "Note: this script is intended for use by the Dockerfile and not as a way to build the controller locally"
6-
echo
6+
echo
77
exit 1
88
fi
99

@@ -28,9 +28,6 @@ mkdir -p /app && chown -R deis:deis /app
2828
# create directory for confd templates
2929
mkdir -p /templates && chown -R deis:deis /templates
3030

31-
# create directory for logs
32-
mkdir -p /var/log/deis && chown -R deis:deis /var/log/deis
33-
3431
# install dependencies
3532
pip install -r /app/requirements.txt
3633

templates/confd_settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
CACHE_URL = 'redis://{{ .deis_cache_host }}:{{ .deis_cache_port }}/0'
3939

4040
# move log directory out of /app/deis
41-
DEIS_LOG_DIR = '/var/log/deis'
41+
DEIS_LOG_DIR = '/data/logs'
4242

4343
{{ if .deis_controller_registrationEnabled }}
4444
REGISTRATION_ENABLED = bool({{ .deis_controller_registrationEnabled }})

tests/controller_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,13 @@ func TestController(t *testing.T) {
2929
"/deis/domains",
3030
}
3131
tag, etcdPort := utils.BuildTag(), utils.RandomPort()
32+
33+
//start etcd container
3234
etcdName := "deis-etcd-" + tag
3335
cli, stdout, stdoutPipe := dockercli.NewClient()
3436
dockercli.RunTestEtcd(t, etcdName, etcdPort)
3537
defer cli.CmdRm("-f", etcdName)
38+
3639
handler := etcdutils.InitEtcd(setdir, setkeys, etcdPort)
3740
etcdutils.PublishEtcd(t, handler)
3841
mock.RunMockDatabase(t, tag, etcdPort, utils.RandomPort())

0 commit comments

Comments
 (0)