Skip to content

Commit bbf5766

Browse files
committed
Merge pull request #4287 from laurrentt/disable-make-store-if-stateless
feat(Makefile): option to disable store components
2 parents 034709b + 374a608 commit bbf5766

3 files changed

Lines changed: 12 additions & 2 deletions

File tree

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ repo_path = github.com/deis/deis
1010
GO_PACKAGES = version
1111
GO_PACKAGES_REPO_PATH = $(addprefix $(repo_path)/,$(GO_PACKAGES))
1212

13-
COMPONENTS=builder cache controller database logger logspout publisher registry router store
14-
START_ORDER=publisher store logger logspout database cache registry controller builder router
13+
COMPONENTS=builder cache controller database logger logspout publisher registry router $(STORE_IF_STATEFUL)
14+
START_ORDER=publisher $(STORE_IF_STATEFUL) logger logspout database cache registry controller builder router
1515
CLIENTS=client client-go deisctl
1616

1717
all: build run

docs/contributing/hacking.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,12 @@ You can also use the same tasks on the root ``Makefile`` to operate on all
382382
components at once. For example, ``make deploy`` will build, dev-release,
383383
and restart all components on the cluster.
384384

385+
.. note::
386+
387+
You can export the ``DEIS_STATELESS=True`` environment variable to skip all
388+
store components when using the root ``Makefile``. Useful when working
389+
on a stateless platform (:ref:`running-deis-without-ceph`).
390+
385391
.. important::
386392

387393
In order to cut a dev-release, you must commit changes using ``git`` to increment

includes.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ ifndef DEIS_NUM_INSTANCES
2727
DEIS_NUM_INSTANCES = 3
2828
endif
2929

30+
ifneq ($(DEIS_STATELESS), True)
31+
STORE_IF_STATEFUL = store
32+
endif
33+
3034
define echo_cyan
3135
@echo "\033[0;36m$(subst ",,$(1))\033[0m"
3236
endef

0 commit comments

Comments
 (0)