Skip to content

Zookeeper Bugfix #234

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

Open
matthewdfuller wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Zookeeper Bugfix #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f1b53e
fixing reference to zookeeper endpoint in marathon and chronos
matthewdfuller Jun 8, 2016
c3fc812
Merge branch 'master' into zookeeper-bugfix
matthewdfuller Jun 8, 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
3 changes: 1 addition & 2 deletions v3/fleet-local/control/chronos@.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ Environment=ZOOKEEPER_HOST=localhost:2181
Environment="IMAGE=etcdctl get /images/chronos"
Environment="ZK_USERNAME=etcdctl get /zookeeper/config/username"
Environment="ZK_PASSWORD=etcdctl get /zookeeper/config/password"
Environment="ZK_ENDPOINT=etcdctl get /zookeeper/config/endpoint"
Environment="MESOS_USERNAME=etcdctl get /mesos/config/username"

User=core
Expand Down Expand Up @@ -41,7 +40,7 @@ ExecStart=/usr/bin/sh -c "docker run \
--http_port 4400 \
--mesos_authentication_principal $($MESOS_USERNAME) \
--mesos_authentication_secret_file /opt/mesos/framework-secret \
--master zk://$($ZK_USERNAME):$($ZK_PASSWORD)@$($ZK_ENDPOINT)/mesos \
--master zk://$($ZK_USERNAME):$($ZK_PASSWORD)@$ZOOKEEPER_HOST/mesos \
--mesos_framework_name chronos-$(hostname) \
--zk_hosts ${ZOOKEEPER_HOST}"

Expand Down
7 changes: 3 additions & 4 deletions v3/fleet-local/control/marathon@.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ Requires=docker.service
After=docker.service bootstrap.service zk-health.service mesos-master@%i.service

[Service]
Environment=ZOOKEEPER=localhost:2181
Environment=ZOOKEEPER_HOST=localhost:2181
Environment="IMAGE=etcdctl get /images/marathon"
Environment="USER=etcdctl get /marathon/config/username"
Environment="PASSWORD=etcdctl get /marathon/config/password"
Environment="MESOS_USERNAME=etcdctl get /mesos/config/username"
Environment="ZK_USERNAME=etcdctl get /zookeeper/config/username"
Environment="ZK_PASSWORD=etcdctl get /zookeeper/config/password"
Environment="ZK_ENDPOINT=etcdctl get /zookeeper/config/endpoint"

User=core
Restart=always
Expand All @@ -36,8 +35,8 @@ ExecStart=/usr/bin/sh -c "/usr/bin/docker run \
$($IMAGE) \
--mesos_authentication_principal $($MESOS_USERNAME) \
--mesos_authentication_secret_file /opt/mesos/framework-secret \
--master zk://$($ZK_USERNAME):$($ZK_PASSWORD)@$($ZK_ENDPOINT)/mesos \
--zk zk://$($ZK_USERNAME):$($ZK_PASSWORD)@$($ZK_ENDPOINT)/marathon \
--master zk://$($ZK_USERNAME):$($ZK_PASSWORD)@$ZOOKEEPER_HOST/mesos \
--zk zk://$($ZK_USERNAME):$($ZK_PASSWORD)@$ZOOKEEPER_HOST/marathon \
--http_credentials $($USER):$($PASSWORD) \
--checkpoint \
--task_launch_timeout 300000"
Expand Down