Left: | ||
Right: |
LEFT | RIGHT |
---|---|
1 from base64 import b64encode | 1 from base64 import b64encode |
2 from subprocess import Popen, PIPE | 2 from subprocess import Popen, PIPE |
3 | 3 |
4 | 4 |
5 from juju.errors import CloudInitError | 5 from juju.errors import CloudInitError |
6 from juju.lib.upstart import UpstartService | 6 from juju.lib.upstart import UpstartService |
7 from juju.lib import serializer | 7 from juju.lib import serializer |
8 from juju.lib.zk import CLIENT_SESSION_TIMEOUT | 8 from juju.lib.zk import ( |
9 CLIENT_SESSION_TIMEOUT, TICK_TIME, MAX_SESSION_TIMEOUT) | |
9 from juju.providers.common.utils import format_cloud_init | 10 from juju.providers.common.utils import format_cloud_init |
10 from juju.state.auth import make_identity | 11 from juju.state.auth import make_identity |
11 | 12 |
12 import juju | 13 import juju |
13 import os | 14 import os |
14 | 15 |
15 DISTRO = "distro" | 16 DISTRO = "distro" |
16 PPA = "ppa" | 17 PPA = "ppa" |
17 BRANCH = "branch" | 18 BRANCH = "branch" |
18 PROPOSED = "proposed" | 19 PROPOSED = "proposed" |
(...skipping 14 matching lines...) Expand all Loading... | |
33 | 34 |
34 scripts.extend([ | 35 scripts.extend([ |
35 "sudo mkdir -p /var/lib/juju", | 36 "sudo mkdir -p /var/lib/juju", |
36 "sudo mkdir -p /var/log/juju"]) | 37 "sudo mkdir -p /var/log/juju"]) |
37 return scripts | 38 return scripts |
38 | 39 |
39 | 40 |
40 def _zookeeper_scripts(instance_id, secret, constraints, provider_type): | 41 def _zookeeper_scripts(instance_id, secret, constraints, provider_type): |
41 return [ | 42 return [ |
42 'sed -i -e s/tickTime=2000/tickTime=%d/g /etc/zookeeper/conf/zoo.cfg' % ( | 43 'sed -i -e s/tickTime=2000/tickTime=%d/g /etc/zookeeper/conf/zoo.cfg' % ( |
43 int(CLIENT_SESSION_TIMEOUT / 2)), | 44 TICK_TIME), |
44 'echo "minSessionTimeout=%d" >> /etc/zookeeper/conf/zoo.cfg' % ( | 45 'echo "minSessionTimeout=%d" >> /etc/zookeeper/conf/zoo.cfg' % ( |
45 CLIENT_SESSION_TIMEOUT), | 46 CLIENT_SESSION_TIMEOUT), |
46 'echo "maxSessionTimeout=%d" >> /etc/zookeeper/conf/zoo.cfg' % ( | 47 'echo "maxSessionTimeout=%d" >> /etc/zookeeper/conf/zoo.cfg' % ( |
bcsaller
2013/02/01 17:12:20
It might make sense that these are defined in lib.
hazmat
2013/02/01 17:50:14
done.
| |
47 CLIENT_SESSION_TIMEOUT * 2), | 48 MAX_SESSION_TIMEOUT), |
48 "juju-admin initialize" | 49 "juju-admin initialize" |
49 " --instance-id=%s" | 50 " --instance-id=%s" |
50 " --admin-identity=%s" | 51 " --admin-identity=%s" |
51 " --constraints-data=%s" | 52 " --constraints-data=%s" |
52 " --provider-type=%s" | 53 " --provider-type=%s" |
53 % (instance_id, make_identity("admin:%s" % secret), | 54 % (instance_id, make_identity("admin:%s" % secret), |
54 b64encode(serializer.dump(constraints.data)), provider_type)] | 55 b64encode(serializer.dump(constraints.data)), provider_type)] |
55 | 56 |
56 | 57 |
57 def _machine_scripts(machine_id, zookeeper_hosts): | 58 def _machine_scripts(machine_id, zookeeper_hosts): |
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
423 self._env_id)) | 424 self._env_id)) |
424 if self._provision: | 425 if self._provision: |
425 scripts.extend(_provision_scripts(self._join_zookeeper_hosts())) | 426 scripts.extend(_provision_scripts(self._join_zookeeper_hosts())) |
426 return scripts | 427 return scripts |
427 | 428 |
428 def _collect_machine_data(self): | 429 def _collect_machine_data(self): |
429 return { | 430 return { |
430 "machine-id": self._machine_id, | 431 "machine-id": self._machine_id, |
431 "juju-provider-type": self._provider_type, | 432 "juju-provider-type": self._provider_type, |
432 "juju-zookeeper-hosts": self._join_zookeeper_hosts()} | 433 "juju-zookeeper-hosts": self._join_zookeeper_hosts()} |
LEFT | RIGHT |