pyjuju

Merge lp://staging/~clint-fewbar/pyjuju/add-egress-zookeeper-protection into lp://staging/pyjuju

add-egress-zookeeper-protection
Merge into trunk

Proposed by Clint Byrum on 2012-09-21

Status:

Needs review

Proposed branch:

lp://staging/~clint-fewbar/pyjuju/add-egress-zookeeper-protection

Merge into:

lp://staging/pyjuju

Diff against target:

1150 lines (+496/-461)

18 files modified

juju/lib/tests/data/test_prestart (+10/-0)
juju/lib/tests/test_upstart.py (+14/-0)
juju/lib/upstart.py (+6/-1)
juju/providers/common/cloudinit.py (+43/-0)
juju/providers/common/tests/data/cloud_init_bootstrap (+33/-52)
juju/providers/common/tests/data/cloud_init_bootstrap_zookeepers (+45/-52)
juju/providers/common/tests/data/cloud_init_branch (+34/-29)
juju/providers/common/tests/data/cloud_init_branch_trunk (+34/-29)
juju/providers/common/tests/data/cloud_init_distro (+30/-27)
juju/providers/common/tests/data/cloud_init_ppa (+30/-27)
juju/providers/common/tests/data/cloud_init_proposed (+30/-27)
juju/providers/ec2/tests/data/bootstrap_cloud_init (+33/-53)
juju/providers/ec2/tests/data/launch_cloud_init (+29/-27)
juju/providers/ec2/tests/data/launch_cloud_init_branch (+33/-29)
juju/providers/ec2/tests/data/launch_cloud_init_ppa (+29/-27)
juju/providers/orchestra/launch.py (+1/-1)
juju/providers/orchestra/tests/data/bootstrap_user_data (+33/-53)
juju/providers/orchestra/tests/data/launch_user_data (+29/-27)

To merge this branch:

bzr merge lp://staging/~clint-fewbar/pyjuju/add-egress-zookeeper-protection

High

In Progress

Link a bug report

Reviewer	Review Type	Date Requested	Status
Juju Engineering		2012-09-21	Pending
Review via email: mp+125832@code.staging.launchpad.net

Description of the change

protect zookeeper from non-root direct access

Adds pre-start capability to juju.lib.upstart. Also reformatted tests'
cloud-config data to be more readable.

https://codereview.appspot.com/6549051/

Revision history for this message

Clint Byrum (clint-fewbar) wrote on 2012-09-21:

Reviewers: mp+125832_code.launchpad.net,

Message:
Please take a look.

Description:
protect zookeeper from non-root direct access

Adds pre-start capability to juju.lib.upstart. Also reformatted tests'
cloud-config data to be more readable.

https://code.launchpad.net/~clint-fewbar/juju/add-egress-zookeeper-protection/+merge/125832

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/6549051/

Affected files:
   A [revision details]
   A juju/lib/tests/data/test_prestart
   M juju/lib/tests/test_upstart.py
   M juju/lib/upstart.py
   M juju/providers/common/cloudinit.py
   M juju/providers/common/tests/data/cloud_init_bootstrap
   M juju/providers/common/tests/data/cloud_init_bootstrap_zookeepers
   M juju/providers/common/tests/data/cloud_init_branch
   M juju/providers/common/tests/data/cloud_init_branch_trunk
   M juju/providers/common/tests/data/cloud_init_distro
   M juju/providers/common/tests/data/cloud_init_ppa
   M juju/providers/common/tests/data/cloud_init_proposed
   M juju/providers/ec2/tests/data/bootstrap_cloud_init
   M juju/providers/ec2/tests/data/launch_cloud_init
   M juju/providers/ec2/tests/data/launch_cloud_init_branch
   M juju/providers/ec2/tests/data/launch_cloud_init_ppa
   M juju/providers/orchestra/launch.py
   M juju/providers/orchestra/tests/data/bootstrap_user_data
   M juju/providers/orchestra/tests/data/launch_user_data

Revision history for this message

Kapil Thangavelu (hazmat) wrote on 2012-09-27:

cool. i'll have to brush on my iptables syntax. does the impl here
support service restarts?

https://codereview.appspot.com/6549051/

Unmerged revisions

588. By Clint Byrum on 2012-09-21: special case localhost because it is needed for client<->zookeeper communication
587. By Clint Byrum on 2012-09-21: fixing test data to match new pre-start
586. By Clint Byrum on 2012-09-21: fix pre-start
585. By Clint Byrum on 2012-09-21: remove debugging aids from tests
584. By Clint Byrum on 2012-09-21: fixing upstart tests
583. By Clint Byrum on 2012-09-21: fixing EC2 tests
582. By Clint Byrum on 2012-09-21: fix orchestra launch tests
581. By Clint Byrum on 2012-09-21: fixing bootstrap user data
580. By Clint Byrum on 2012-09-21: Add iptables rule as pre-start for machine agent to prevent non-root access to ZK
579. By Clint Byrum on 2012-09-20: add prestart to juju.lib.upstart