Skip to content

initiate an etcdctl call using username:password #222

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
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

initiate an etcdctl call using username:password #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fd3c057
initiate an etcdctl call using username:password
anshupande May 23, 2016
552c4b5
add authentication
anshupande May 24, 2016
91cce6d
testing
anshupande May 24, 2016
a90369e
more testing
anshupande May 24, 2016
c233eff
testing
anshupande May 25, 2016
faec0c9
still testing
anshupande May 25, 2016
5203256
testing
anshupande May 25, 2016
a6e75a7
testing
anshupande May 25, 2016
4e817c2
testing auth stuff
anshupande May 26, 2016
360feaa
more testing
anshupande May 26, 2016
1c0ded7
test
anshupande May 26, 2016
e5e8e53
test
anshupande May 26, 2016
6c21207
more test
anshupande May 26, 2016
deadcdb
testing
anshupande May 26, 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
10 changes: 5 additions & 5 deletions v3/fleet-local/control/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ Requires=docker.service
[Service]
# NOTE: chronos doesn't need the `zk://`
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"
Environment="IMAGE=etcdctl -u $(cat /opt/etcdctl/root):$(cat /opt/etcdctl/root-password) get /images/chronos"
Environment="ZK_USERNAME=etcdctl -u $(cat /opt/etcdctl/root):$(cat /opt/etcdctl/root-password) get /zookeeper/config/username"
Environment="ZK_PASSWORD=etcdctl -u $(cat /opt/etcdctl/root):$(cat /opt/etcdctl/root-password) get /zookeeper/config/password"
Environment="ZK_ENDPOINT=etcdctl -u $(cat /opt/etcdctl/root):$(cat /opt/etcdctl/root-password) get /zookeeper/config/endpoint"
Environment="MESOS_USERNAME=etcdctl -u $(cat /opt/etcdctl/root):$(cat /opt/etcdctl/root-password) get /mesos/config/username"

User=core
Restart=always
Expand Down
12 changes: 6 additions & 6 deletions v3/fleet-local/worker/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ After=docker.service bootstrap.service
Requires=docker.service bootstrap.service

[Service]
Environment="IMAGE=etcdctl get /images/mesos-slave"
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="IMAGE=etcdctl -u $(cat /opt/etcdctl/root):$(cat /opt/etcdctl/root-password) get /images/mesos-slave"
Environment="ZK_USERNAME=etcdctl -u $(cat /opt/etcdctl/root):$(cat /opt/etcdctl/root-password) get /zookeeper/config/username"
Environment="ZK_PASSWORD=etcdctl -u $(cat /opt/etcdctl/root):$(cat /opt/etcdctl/root-password) get /zookeeper/config/password"
Environment="ZK_ENDPOINT=etcdctl -u $(cat /opt/etcdctl/root):$(cat /opt/etcdctl/root-password) get /zookeeper/config/endpoint"
EnvironmentFile=/etc/environment

User=core
Expand All @@ -20,7 +20,7 @@ ExecStartPre=/usr/bin/systemctl is-active update-os.service
# ExecStart from spinning up and mounting / creating .dockercfg/ as a dir
ExecStartPre=/usr/bin/bash -c "if [ ! -f /home/core/.dockercfg ]; then exit 1; fi"
ExecStartPre=/usr/bin/bash -c "if [ ! -f /opt/mesos/credentials ]; then exit 1; fi"
ExecStartPre=/usr/bin/sh -c "source /etc/profile.d/etcdctl.sh && docker pull $($IMAGE)"
ExecStartPre=/usr/bin/sh -c "source /etc/profile.d/etcdctl.sh && docker pull $IMAGE"
ExecStartPre=-/usr/bin/docker kill mesos-slave
ExecStartPre=-/usr/bin/docker rm mesos-slave

Expand All @@ -39,7 +39,7 @@ ExecStart=/usr/bin/bash -c "source /etc/profile.d/etcdctl.sh && \
-v /lib64/libgcrypt.so:/lib/libgcrypt.so.20:ro \
-v /var/lib/mesos/slave:/var/lib/mesos/slave \
-v /opt/mesos/credentials:/opt/mesos/credentials:ro \
$($IMAGE) \
$IMAGE \
--ip=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4) \
--attributes=zone:$(curl -s http://169.254.169.254/latest/meta-data/placement/availability-zone)\;os:coreos\;worker_group:$WORKER_GROUP \
--containerizers=docker,mesos \
Expand Down
8 changes: 7 additions & 1 deletion v3/setup/etcdctl-auth.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ sudo cat << EOF > $CRED_DIR/${1}.json
"password": "$2"
}
EOF
sudo cat << EOF > $CRED_DIR/${1}
$1
EOF
sudo cat << EOF > $CRED_DIR/${1}-password
$2
EOF
}

add_users $ROOT_USERNAME $ROOT_PASSWORD
Expand Down Expand Up @@ -62,4 +68,4 @@ curl -L http://127.0.0.1:2379/v2/auth/users/${WRITE_USERNAME} -XPUT -d "@$CRED_D
# Enable authentication
etcdctl auth enable

sudo rm -rf $CRED_DIR
sudo rm -rf $CRED_DIR/read-user.json $CRED_DIR/root.json