github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'add-charms' of github.com:mbruzek/kubernetes into add-charms

Browse Source 
Resolved conflicts in:
	cluster/juju/util.sh
This commit is contained in:
Matt Bruzek 2015-04-22 10:36:42 -05:00
commit 35301bbcfd
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/juju/bundles/local.yaml
View File

@ -9,7 +9,7 @@ kubernetes-local:
options: options:
version: "v0.15.0" version: "v0.15.0"
docker: docker:
charm: docker-0 charm: docker
branch: https://github.com/chuckbutler/docker-charm.git branch: https://github.com/chuckbutler/docker-charm.git
num_units: 2 num_units: 2
options: options:

1
cluster/juju/charms/trusty/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/docker

8
cluster/juju/charms/trusty/kubernetes/hooks/lib/registrator.py
View File

@ -2,6 +2,7 @@ import httplib
import json import json
import time import time
class Registrator: class Registrator:
def __init__(self): def __init__(self):
@ -41,11 +42,10 @@ class Registrator:
body = response.read() body = response.read()
print(body) print(body)
result = json.loads(body) result = json.loads(body)
print("Response status:%s reason:%s body:%s" % ( print("Response status:%s reason:%s body:%s" % \
response.status, response.reason, result)) (response.status, response.reason, result))
return response, result return response, result
def update(self): def update(self):
''' Contact the API Server to update a registration ''' ''' Contact the API Server to update a registration '''
# do a get on the API for the node # do a get on the API for the node
@ -80,5 +80,3 @@ class Registrator:
print("Registration error") print("Registration error")
# TODO - get request data # TODO - get request data
raise RuntimeError("Unable to register machine with") raise RuntimeError("Unable to register machine with")

11
cluster/juju/util.sh
View File

@ -106,10 +106,17 @@ function sleep-status() {
maxtime=900 maxtime=900
jujustatus='' jujustatus=''
echo "Waiting up to 15 minutes to allow the cluster to come online... wait for it..." echo "Waiting up to 15 minutes to allow the cluster to come online... wait for it..."
jujustatus=$(juju status kubernetes-master --format=oneline)
if [[ $jujustatus == *"started"* ]];
then
return
fi
while [[ $i < $maxtime && $jujustatus != *"started"* ]]; do while [[ $i < $maxtime && $jujustatus != *"started"* ]]; do
sleep 15
i+=15
jujustatus=$(juju status kubernetes-master --format=oneline) jujustatus=$(juju status kubernetes-master --format=oneline)
sleep 30
i+=30
done done
# sleep because we cannot get the status back of where the minions are in the deploy phase # sleep because we cannot get the status back of where the minions are in the deploy phase