Skip to content

Commit 121ae2e

Browse files
author
Gabriel Monroy
committed
Merge pull request #2172 from gabrtv/inplace-upgrade
Support for in-place upgrades
2 parents d21bb1a + 861b026 commit 121ae2e

80 files changed

Lines changed: 2324 additions & 1405 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎builder/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ full-clean: check-docker check-registry clean
1515
docker images -q $(IMAGE_PREFIX)$(COMPONENT) | xargs docker rmi -f
1616

1717
install: check-deisctl
18-
deisctl scale $(COMPONENT)=1
18+
deisctl install $(COMPONENT)
1919

2020
uninstall: check-deisctl
21-
deisctl scale $(COMPONENT)=0
21+
deisctl uninstall $(COMPONENT)
2222

2323
start: check-deisctl
2424
deisctl start $(COMPONENT)

‎cache/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ full-clean: check-docker check-registry
2020
docker images -q $(IMAGE_PREFIX)$(COMPONENT) | xargs docker rmi -f
2121

2222
install: check-deisctl
23-
deisctl scale $(COMPONENT)=1
23+
deisctl install $(COMPONENT)
2424

2525
uninstall: check-deisctl
26-
deisctl scale $(COMPONENT)=0
26+
deisctl uninstall $(COMPONENT)
2727

2828
start: check-deisctl
2929
deisctl start $(COMPONENT)

‎contrib/gce/README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -318,13 +318,13 @@ Verify that all the units are active after the operation completes:
318318
```console
319319
$ deisctl list
320320
UNIT MACHINE LOAD ACTIVE SUB
321-
deis-builder@1.service dea53588.../172.17.8.100 loaded active running
322-
deis-cache@1.service dea53588.../172.17.8.100 loaded active running
323-
deis-controller@1.service dea53588.../172.17.8.100 loaded active running
324-
deis-database@1.service dea53588.../172.17.8.100 loaded active running
321+
deis-builder.service dea53588.../172.17.8.100 loaded active running
322+
deis-cache.service dea53588.../172.17.8.100 loaded active running
323+
deis-controller.service dea53588.../172.17.8.100 loaded active running
324+
deis-database.service dea53588.../172.17.8.100 loaded active running
325325
deis-logger-data.service dea53588.../172.17.8.100 loaded active exited
326-
deis-logger@1.service dea53588.../172.17.8.100 loaded active running
327-
deis-registry@1.service dea53588.../172.17.8.100 loaded active running
326+
deis-logger.service dea53588.../172.17.8.100 loaded active running
327+
deis-registry.service dea53588.../172.17.8.100 loaded active running
328328
deis-router@1.service dea53588.../172.17.8.100 loaded active running
329329
```
330330

‎controller/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ full-clean: check-docker check-registry
1818
docker images -q $(IMAGE_PREFIX)$(COMPONENT) | xargs docker rmi -f
1919

2020
install: check-deisctl
21-
deisctl scale $(COMPONENT)=1
21+
deisctl install $(COMPONENT)
2222

2323
uninstall: check-deisctl
24-
deisctl scale $(COMPONENT)=0
24+
deisctl uninstall $(COMPONENT)
2525

2626
start: check-deisctl
2727
deisctl start $(COMPONENT)

‎controller/bin/boot‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ etcd_set_default registrationEnabled 1
3939
etcd_set_default webEnabled 0
4040
# create path for application metadata
4141
etcd_safe_mkdir /deis/services
42+
etcd_safe_mkdir /deis/domains
4243

4344
# wait for confd to run once and install initial templates
4445
until confd -onetime -node $ETCD -config-file /app/confd.toml 2>/dev/null; do

‎database/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ full-clean: check-docker check-registry
1414
docker images -q $(IMAGE_PREFIX)$(COMPONENT) | xargs docker rmi -f
1515

1616
install: check-deisctl
17-
deisctl scale $(COMPONENT)=1
17+
deisctl install $(COMPONENT)
1818

1919
uninstall: check-deisctl
20-
deisctl scale $(COMPONENT)=0
20+
deisctl uninstall $(COMPONENT)
2121

2222
start: check-deisctl
2323
deisctl start $(COMPONENT)

‎database/bin/boot‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,13 @@ until confd -onetime -node $ETCD -config-file /app/confd.toml; do
4848
sleep $(($ETCD_TTL/2)) # sleep for half the TTL
4949
done
5050

51+
# initialize database if one doesn't already exist
52+
# for example, in the case of a data container
53+
if [[ ! -d /var/lib/postgresql/9.3/main ]]; then
54+
chown -R postgres:postgres /var/lib/postgresql
55+
sudo -u postgres /usr/lib/postgresql/9.3/bin/initdb -D /var/lib/postgresql/9.3/main
56+
fi
57+
5158
# ensure WAL log bucket exists
5259
envdir /etc/wal-e.d/env /app/bin/create_bucket ${BUCKET_NAME}
5360

‎deisctl/Godeps/Godeps.json‎

Lines changed: 30 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎deisctl/Godeps/_workspace/src/github.com/coreos/fleet/etcd/action.go‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎deisctl/Godeps/_workspace/src/github.com/coreos/fleet/etcd/action_test.go‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)