Skip to content

Commit

Permalink
Tie calicoctl to specif tag of image files
Browse files Browse the repository at this point in the history
  • Loading branch information
tomdee committed Feb 11, 2015
1 parent 433b3fd commit 406e56d
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions calicoctl.py
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,9 @@ def process_output(line):


def node(ip, etcd_authority):
# Make sure we have the correct image
docker("pull", "calico/node:v0.0.5", _err=process_output, _out=process_output).wait()

create_dirs()
modprobe("ip6_tables")
modprobe("xt_set")
Expand Down Expand Up @@ -329,6 +332,9 @@ def node(ip, etcd_authority):
def master(ip, etcd_authority):
create_dirs()

# Make sure we have the correct image
docker("pull", "calico/master:v0.0.5", _err=process_output, _out=process_output).wait()

# Add IP to etcd
client = CalicoCmdLineEtcdClient(etcd_authority)
client.set_master(ip)
Expand Down

0 comments on commit 406e56d

Please sign in to comment.