Skip to content

Commit c6722df

Browse files
committed
[Manager] Change init mode, making swarm init optional
Signed-off-by: Valentino Maiorca <[email protected]>
1 parent 2c1d515 commit c6722df

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/beers/scripts/beers

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ def _setup_swarmprom(swarmprom_base_domain: str, swarmprom_user: str, traefik: b
149149

150150
def run_event_listener():
151151
import docker
152-
from docker.models.nodes import Node
153152

154153
logger = logging.getLogger("SwarmEventListener")
155154

@@ -209,24 +208,25 @@ def _init_manager(
209208
swarmprom_base_domain: str = typer.Option(None, prompt=False, envvar="SWARMPROM_BASE_DOMAIN"),
210209
swarmprom_user: str = typer.Option(None, prompt=False, envvar="SWARMPROM_USER"),
211210
#
212-
swarm_reset: bool = typer.Option(True, prompt=True, envvar="SWARM_RESET"),
211+
swarm_init: str = typer.Option(default=True, prompt=True, envvar="SWARM_INIT"),
213212
):
214213
import docker
215214

216215
client = docker.from_env()
217216

218-
if swarm_reset:
217+
if swarm_init:
219218
client.swarm.leave(force=True)
220219

221-
_: str = client.swarm.init(
222-
advertise_addr=advertise_addr,
223-
listen_addr=f"{ip}:{swarm_port}",
224-
force_new_cluster=swarm_reset,
225-
# default_addr_pool=["10.43.0.0/16"],
226-
# subnet_size=24,
227-
# snapshot_interval=5000,
228-
# log_entries_for_slow_followers=1200,
229-
)
220+
_: str = client.swarm.init(
221+
advertise_addr=advertise_addr,
222+
listen_addr=f"{ip}:{swarm_port}",
223+
force_new_cluster=True,
224+
# default_addr_pool=["10.43.0.0/16"],
225+
# subnet_size=24,
226+
# snapshot_interval=5000,
227+
# log_entries_for_slow_followers=1200,
228+
)
229+
230230
Process(target=run_event_listener).start()
231231

232232
worker_token: str = client.swarm.attrs["JoinTokens"]["Worker"]

0 commit comments

Comments
 (0)