Skip to content

Fix Consul --retry-join failure #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tgross merged 3 commits into from
Dec 9, 2016
Merged

Fix Consul --retry-join failure #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e18b89
Never leave LOG_LEVEL unset in Compose file
tgross Dec 9, 2016
4bce5f0
single-node Consul server should not use ContainerPilot
tgross Dec 9, 2016
dceed78
Don't include port in --retry-join field when we rewrite CP config
tgross Dec 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions bin/manager/containerpilot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,15 @@ def load(self, envs=os.environ):
cfg = cfg.replace('}{{ end }}', '}')
config = json.loads(cfg)

consul = env('CONSUL', 'consul', envs, fn='{}:8500'.format)

if env('CONSUL_AGENT', False, envs, to_flag):
config['consul'] = 'localhost:8500'
cmd = config['coprocesses'][0]['command']
host_cfg_idx = cmd.index('-retry-join') + 1
cmd[host_cfg_idx] = consul
cmd[host_cfg_idx] = env('CONSUL', 'consul', envs)
config['coprocesses'][0]['command'] = cmd
else:
config['consul'] = consul
config['consul'] = env('CONSUL', 'consul', envs,
fn='{}:8500'.format)
config['coprocesses'] = []

self.config = config
Expand Down
12 changes: 4 additions & 8 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,12 @@ mysql:
environment:
- CONTAINERPILOT=file:///etc/containerpilot.json
- CONSUL_AGENT=1
- LOG_LEVEL
- LOG_LEVEL=INFO

consul:
image: autopilotpattern/consul:0.7r0.7
command: >-
/usr/local/bin/containerpilot
/bin/consul agent -server
-bootstrap-expect 1
-config-dir=/etc/consul
-ui-dir /ui
image: consul:0.7.1
command: >
agent -server -client=0.0.0.0 -bootstrap -ui
Copy link

@jasonpincin jasonpincin Dec 9, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well isn't that clean?

restart: always
mem_limit: 128m
ports:
Expand Down