pyjuju

Merge lp:~clint-fewbar/pyjuju/use-packages-yaml into lp:pyjuju

  1. use-packages-yaml
  2. Merge into trunk
Proposed by Clint Byrum
Status: Merged
Approved by: Kapil Thangavelu
Approved revision: 464
Merged at revision: 464
Proposed branch: lp:~clint-fewbar/pyjuju/use-packages-yaml
Merge into: lp:pyjuju
Diff against target: 173 lines (+23/-23)
11 files modified
juju/providers/common/cloudinit.py (+3/-3)
juju/providers/common/tests/data/cloud_init_bootstrap (+2/-2)
juju/providers/common/tests/data/cloud_init_bootstrap_zookeepers (+2/-2)
juju/providers/common/tests/data/cloud_init_distro (+2/-2)
juju/providers/common/tests/data/cloud_init_normal (+2/-2)
juju/providers/common/tests/data/cloud_init_ppa (+2/-2)
juju/providers/ec2/tests/data/bootstrap_cloud_init (+2/-2)
juju/providers/ec2/tests/data/launch_cloud_init (+2/-2)
juju/providers/ec2/tests/data/launch_cloud_init_ppa (+2/-2)
juju/providers/orchestra/tests/data/bootstrap_user_data (+2/-2)
juju/providers/orchestra/tests/data/launch_user_data (+2/-2)
To merge this branch: bzr merge lp:~clint-fewbar/pyjuju/use-packages-yaml
Reviewer Review Type Date Requested Status
Kapil Thangavelu (community) Approve
Review via email: mp+94040@code.launchpad.net

Description of the change

Simple change to use the declarative form to allow cloud-init to install packages.

To post a comment you must log in.
Revision history for this message
Clint Byrum (clint-fewbar) wrote :

Please take a look.

Revision history for this message
Kapil Thangavelu (hazmat) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'juju/providers/common/cloudinit.py'
2--- juju/providers/common/cloudinit.py 2012-01-10 15:56:07 +0000
3+++ juju/providers/common/cloudinit.py 2012-02-21 19:37:17 +0000
4@@ -21,9 +21,7 @@
5
6 def _install_scripts(origin, origin_url):
7 scripts = []
8- if origin in (DISTRO, PPA):
9- scripts.append("sudo apt-get -y install juju")
10- else:
11+ if origin not in (DISTRO, PPA):
12 scripts.extend(_branch_install_scripts(origin_url))
13 scripts.extend([
14 "sudo mkdir -p /var/lib/juju",
15@@ -286,6 +284,8 @@
16 if self._zookeeper:
17 packages.extend([
18 "default-jre-headless", "zookeeper", "zookeeperd"])
19+ if self._origin in (DISTRO, PPA):
20+ packages.append("juju")
21 return packages
22
23 def _collect_repositories(self):
24
25=== modified file 'juju/providers/common/tests/data/cloud_init_bootstrap'
26--- juju/providers/common/tests/data/cloud_init_bootstrap 2012-01-12 23:54:10 +0000
27+++ juju/providers/common/tests/data/cloud_init_bootstrap 2012-02-21 19:37:17 +0000
28@@ -5,8 +5,8 @@
29 machine-id: passport}
30 output: {all: '| tee -a /var/log/cloud-init-output.log'}
31 packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper,
32- default-jre-headless, zookeeper, zookeeperd]
33-runcmd: [sudo apt-get -y install juju, sudo mkdir -p /var/lib/juju, sudo mkdir -p
34+ default-jre-headless, zookeeper, zookeeperd, juju]
35+runcmd: [sudo mkdir -p /var/lib/juju, sudo mkdir -p
36 /var/log/juju, 'juju-admin initialize --instance-id=token --admin-identity=admin:19vlzY4Vc3q4Ew5OsCwKYqrq1HI=
37 --provider-type=dummy', 'cat >> /etc/init/juju-machine-agent.conf <<EOF
38
39
40=== modified file 'juju/providers/common/tests/data/cloud_init_bootstrap_zookeepers'
41--- juju/providers/common/tests/data/cloud_init_bootstrap_zookeepers 2012-01-12 23:54:10 +0000
42+++ juju/providers/common/tests/data/cloud_init_bootstrap_zookeepers 2012-02-21 19:37:17 +0000
43@@ -5,8 +5,8 @@
44 machine-id: passport}
45 output: {all: '| tee -a /var/log/cloud-init-output.log'}
46 packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper,
47- default-jre-headless, zookeeper, zookeeperd]
48-runcmd: [sudo apt-get -y install juju, sudo mkdir -p /var/lib/juju, sudo mkdir -p
49+ default-jre-headless, zookeeper, zookeeperd, juju]
50+runcmd: [sudo mkdir -p /var/lib/juju, sudo mkdir -p
51 /var/log/juju, 'juju-admin initialize --instance-id=token --admin-identity=admin:19vlzY4Vc3q4Ew5OsCwKYqrq1HI=
52 --provider-type=dummy', 'cat >> /etc/init/juju-machine-agent.conf <<EOF
53
54
55=== modified file 'juju/providers/common/tests/data/cloud_init_distro'
56--- juju/providers/common/tests/data/cloud_init_distro 2012-01-12 23:54:10 +0000
57+++ juju/providers/common/tests/data/cloud_init_distro 2012-02-21 19:37:17 +0000
58@@ -4,8 +4,8 @@
59 machine-data: {juju-provider-type: dummy, juju-zookeeper-hosts: 'cotswold:2181,longleat:2181',
60 machine-id: passport}
61 output: {all: '| tee -a /var/log/cloud-init-output.log'}
62-packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper]
63-runcmd: [sudo apt-get -y install juju, sudo mkdir -p /var/lib/juju, sudo mkdir -p
64+packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper, juju]
65+runcmd: [sudo mkdir -p /var/lib/juju, sudo mkdir -p
66 /var/log/juju, 'cat >> /etc/init/juju-machine-agent.conf <<EOF
67
68 description "Juju machine agent"
69
70=== modified file 'juju/providers/common/tests/data/cloud_init_normal'
71--- juju/providers/common/tests/data/cloud_init_normal 2012-01-09 14:17:21 +0000
72+++ juju/providers/common/tests/data/cloud_init_normal 2012-02-21 19:37:17 +0000
73@@ -5,8 +5,8 @@
74 machine-id: passport}
75 output: {all: '| tee -a /var/log/cloud-init-output.log'}
76 packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws,
77- python-zookeeper]
78-runcmd: [sudo apt-get -y install juju, sudo mkdir -p /var/lib/juju, sudo mkdir
79+ python-zookeeper, juju]
80+runcmd: [sudo mkdir -p /var/lib/juju, sudo mkdir
81 -p /var/log/juju, 'JUJU_MACHINE_ID=passport JUJU_ZOOKEEPER=cotswold:2181,longleat:2181
82 python -m juju.agents.machine -n --logfile=/var/log/juju/machine-agent.log
83 --pidfile=/var/run/juju/machine-agent.pid']
84
85=== modified file 'juju/providers/common/tests/data/cloud_init_ppa'
86--- juju/providers/common/tests/data/cloud_init_ppa 2012-01-12 23:54:10 +0000
87+++ juju/providers/common/tests/data/cloud_init_ppa 2012-02-21 19:37:17 +0000
88@@ -6,8 +6,8 @@
89 machine-data: {juju-provider-type: dummy, juju-zookeeper-hosts: 'cotswold:2181,longleat:2181',
90 machine-id: passport}
91 output: {all: '| tee -a /var/log/cloud-init-output.log'}
92-packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper]
93-runcmd: [sudo apt-get -y install juju, sudo mkdir -p /var/lib/juju, sudo mkdir -p
94+packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper, juju]
95+runcmd: [sudo mkdir -p /var/lib/juju, sudo mkdir -p
96 /var/log/juju, 'cat >> /etc/init/juju-machine-agent.conf <<EOF
97
98 description "Juju machine agent"
99
100=== modified file 'juju/providers/ec2/tests/data/bootstrap_cloud_init'
101--- juju/providers/ec2/tests/data/bootstrap_cloud_init 2012-01-12 23:54:10 +0000
102+++ juju/providers/ec2/tests/data/bootstrap_cloud_init 2012-02-21 19:37:17 +0000
103@@ -4,8 +4,8 @@
104 machine-data: {juju-provider-type: ec2, juju-zookeeper-hosts: 'localhost:2181', machine-id: '0'}
105 output: {all: '| tee -a /var/log/cloud-init-output.log'}
106 packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper,
107- default-jre-headless, zookeeper, zookeeperd]
108-runcmd: [sudo apt-get -y install juju, sudo mkdir -p /var/lib/juju, sudo mkdir -p
109+ default-jre-headless, zookeeper, zookeeperd, juju]
110+runcmd: [sudo mkdir -p /var/lib/juju, sudo mkdir -p
111 /var/log/juju, 'juju-admin initialize --instance-id=$(curl http://169.254.169.254/1.0/meta-data/instance-id)
112 --admin-identity=admin:JbJ6sDGV37EHzbG9FPvttk64cmg= --provider-type=ec2', 'cat
113 >> /etc/init/juju-machine-agent.conf <<EOF
114
115=== modified file 'juju/providers/ec2/tests/data/launch_cloud_init'
116--- juju/providers/ec2/tests/data/launch_cloud_init 2012-01-12 23:54:10 +0000
117+++ juju/providers/ec2/tests/data/launch_cloud_init 2012-02-21 19:37:17 +0000
118@@ -4,8 +4,8 @@
119 machine-data: {juju-provider-type: ec2, juju-zookeeper-hosts: 'es.example.internal:2181',
120 machine-id: '1'}
121 output: {all: '| tee -a /var/log/cloud-init-output.log'}
122-packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper]
123-runcmd: [sudo apt-get -y install juju, sudo mkdir -p /var/lib/juju, sudo mkdir -p
124+packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper, juju]
125+runcmd: [sudo mkdir -p /var/lib/juju, sudo mkdir -p
126 /var/log/juju, 'cat >> /etc/init/juju-machine-agent.conf <<EOF
127
128 description "Juju machine agent"
129
130=== modified file 'juju/providers/ec2/tests/data/launch_cloud_init_ppa'
131--- juju/providers/ec2/tests/data/launch_cloud_init_ppa 2012-01-12 23:54:10 +0000
132+++ juju/providers/ec2/tests/data/launch_cloud_init_ppa 2012-02-21 19:37:17 +0000
133@@ -6,8 +6,8 @@
134 machine-data: {juju-provider-type: ec2, juju-zookeeper-hosts: 'es.example.internal:2181',
135 machine-id: '1'}
136 output: {all: '| tee -a /var/log/cloud-init-output.log'}
137-packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper]
138-runcmd: [sudo apt-get -y install juju, sudo mkdir -p /var/lib/juju, sudo mkdir -p
139+packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper, juju]
140+runcmd: [sudo mkdir -p /var/lib/juju, sudo mkdir -p
141 /var/log/juju, 'cat >> /etc/init/juju-machine-agent.conf <<EOF
142
143 description "Juju machine agent"
144
145=== modified file 'juju/providers/orchestra/tests/data/bootstrap_user_data'
146--- juju/providers/orchestra/tests/data/bootstrap_user_data 2012-01-12 23:54:10 +0000
147+++ juju/providers/orchestra/tests/data/bootstrap_user_data 2012-02-21 19:37:17 +0000
148@@ -4,8 +4,8 @@
149 machine-id: '0'}
150 output: {all: '| tee -a /var/log/cloud-init-output.log'}
151 packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper,
152- default-jre-headless, zookeeper, zookeeperd]
153-runcmd: [sudo apt-get -y install juju, sudo mkdir -p /var/lib/juju, sudo mkdir -p
154+ default-jre-headless, zookeeper, zookeeperd, juju]
155+runcmd: [sudo mkdir -p /var/lib/juju, sudo mkdir -p
156 /var/log/juju, 'juju-admin initialize --instance-id=winston-uid --admin-identity=admin:qRBXC1ubEEUqRL6wcBhgmc9xkaY=
157 --provider-type=orchestra', 'cat >> /etc/init/juju-machine-agent.conf <<EOF
158
159
160=== modified file 'juju/providers/orchestra/tests/data/launch_user_data'
161--- juju/providers/orchestra/tests/data/launch_user_data 2012-01-12 23:54:10 +0000
162+++ juju/providers/orchestra/tests/data/launch_user_data 2012-02-21 19:37:17 +0000
163@@ -3,8 +3,8 @@
164 machine-data: {juju-provider-type: orchestra, juju-zookeeper-hosts: 'jennifer:2181',
165 machine-id: '42'}
166 output: {all: '| tee -a /var/log/cloud-init-output.log'}
167-packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper]
168-runcmd: [sudo apt-get -y install juju, sudo mkdir -p /var/lib/juju, sudo mkdir -p
169+packages: [bzr, byobu, tmux, python-setuptools, python-twisted, python-txaws, python-zookeeper, juju]
170+runcmd: [sudo mkdir -p /var/lib/juju, sudo mkdir -p
171 /var/log/juju, 'cat >> /etc/init/juju-machine-agent.conf <<EOF
172
173 description "Juju machine agent"

Subscribers

People subscribed via source and target branches

to status/vote changes: