Skip to content

Commit eae2cfe

Browse files
author
Matthew Fisher
committed
Merge pull request #3627 from bacongobbler/move-mkdir-to-boot
ref(controller): move mkdir to bin/boot
2 parents 3fa5df5 + 358f346 commit eae2cfe

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

controller/bin/boot

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,10 @@ etcd_set_default webEnabled 0
5252
etcd_set_default unitHostname default
5353

5454
# safely create required keyspaces
55-
etcd_safe_mkdir /deis/services
5655
etcd_safe_mkdir /deis/domains
5756
etcd_safe_mkdir /deis/platform
57+
etcd_safe_mkdir /deis/scheduler
58+
etcd_safe_mkdir /deis/services
5859

5960
# run etcd data migrations
6061
echo "controller: running etcd data migrations..."

deisctl/units/deis-controller.service

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ After=deis-store-volume.service
66
[Service]
77
EnvironmentFile=/etc/environment
88
TimeoutStartSec=20m
9-
ExecStartPre=-/usr/bin/etcdctl mkdir /deis/scheduler >/dev/null 2>&1
109
ExecStartPre=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/controller` && docker history $IMAGE >/dev/null 2>&1 || docker pull $IMAGE"
1110
ExecStartPre=/bin/sh -c "docker inspect deis-controller >/dev/null 2>&1 && docker rm -f deis-controller || true"
1211
ExecStart=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/controller` && docker run --name deis-controller --rm -p 8000:8000 -e EXTERNAL_PORT=8000 -e HOST=$COREOS_PRIVATE_IPV4 -v /var/run/fleet.sock:/var/run/fleet.sock -v /var/lib/deis/store:/data $IMAGE"

0 commit comments

Comments
 (0)