Merge lp:~1chb1n/ubuntu-openstack-ci/sharing-dellstack-maas-lab into lp:ubuntu-openstack-ci

[Ryan Beisner]

Adjustments related to sharing the dellstack maas lab. Jobs need to inject maas tags into the bundles used for bare metal testing.

* Add a bundle_constrainer.py cli tool
* Relocate other existing tools into ./tools/
* Update job scripts
* Update juju status usage re: eventual default output format change
* Disable flake8 ignores

[lp:~1chb1n/ubuntu-openstack-ci/sharing-dellstack-maas-lab]

146. By Ryan Beisner on 2015-07-10

Relocate existing tools to the new tools dir, update affected scripts.

147. By Ryan Beisner on 2015-07-10

update juju status usage re: eventual default output format change; disable flake8 ignores

148. By Ryan Beisner on 2015-07-10

update readme

=== modified file 'admin/910-bounce-all.sh'
--- admin/910-bounce-all.sh	2014-10-02 15:18:00 +0000
+++ admin/910-bounce-all.sh	2015-07-10 21:48:32 +0000
@@ -13,7 +13,7 @@
 
 if [ "$param" == "YES" ]; then
   # Get jenkins units
-  units=$(juju status | egrep "osci[-]?(slave)?/[0-9]{1,10}:" \
+  units=$(juju status --format=yaml | egrep "osci[-]?(slave)?/[0-9]{1,10}:" \
     | cut -d ":" -f 1 | sed 's/^ *//')
   for unit in $units; do
     echo "rebooting ${unit}!"

=== modified file 'admin/912-bounce-slaves.sh'
--- admin/912-bounce-slaves.sh	2014-10-02 15:18:00 +0000
+++ admin/912-bounce-slaves.sh	2015-07-10 21:48:32 +0000
@@ -13,7 +13,7 @@
 
 if [ "$param" == "YES" ]; then
   # Get jenkins units
-  units=$(juju status | egrep "osci-slave/" \
+  units=$(juju status --format=yaml | egrep "osci-slave/" \
     | cut -d ":" -f 1 | sed 's/^ *//')
   for unit in $units; do
     echo "rebooting ${unit}!"

=== modified file 'admin/913-shutdown-all.sh'
--- admin/913-shutdown-all.sh	2014-11-22 16:16:10 +0000
+++ admin/913-shutdown-all.sh	2015-07-10 21:48:32 +0000
@@ -13,7 +13,7 @@
 
 if [ "$param" == "YES" ]; then
   # Get jenkins units
-  units=$(juju status | egrep "osci[-]?(slave)?/[0-9]{1,10}:" \
+  units=$(juju status --format=yaml | egrep "osci[-]?(slave)?/[0-9]{1,10}:" \
     | cut -d ":" -f 1 | sed 's/^ *//')
   for unit in $units; do
     echo "shutting down ${unit}!"

=== modified file 'admin/915-shutdown-slaves.sh'
--- admin/915-shutdown-slaves.sh	2014-11-22 16:16:10 +0000
+++ admin/915-shutdown-slaves.sh	2015-07-10 21:48:32 +0000
@@ -13,7 +13,7 @@
 
 if [ "$param" == "YES" ]; then
   # Get jenkins units
-  units=$(juju status | egrep "osci-slave/" \
+  units=$(juju status --format=yaml | egrep "osci-slave/" \
     | cut -d ":" -f 1 | sed 's/^ *//')
   for unit in $units; do
     echo "shutting down ${unit}!"

=== modified file 'admin/920-juju-bootstrap-all.sh'
--- admin/920-juju-bootstrap-all.sh	2014-10-02 15:18:00 +0000
+++ admin/920-juju-bootstrap-all.sh	2015-07-10 21:48:32 +0000
@@ -5,7 +5,7 @@
 # useful for verifying juju environments and networks
 
 # Get jenkins units
-units=$(juju status | egrep "osci[-]?(slave)?/[0-9]{1,10}:" \
+units=$(juju status --format=yaml | egrep "osci[-]?(slave)?/[0-9]{1,10}:" \
   | cut -d ":" -f 1 | sed 's/^ *//')
 
 for unit in $units; do

=== modified file 'admin/924-check-juju-enviros.sh'
--- admin/924-check-juju-enviros.sh	2014-10-02 15:18:00 +0000
+++ admin/924-check-juju-enviros.sh	2015-07-10 21:48:32 +0000
@@ -4,7 +4,7 @@
 # look at juju enviro yamls
 
 # Get jenkins units
-units=$(juju status | egrep "osci[-]?(slave)?/[0-9]{1,10}:" \
+units=$(juju status --format=yaml | egrep "osci[-]?(slave)?/[0-9]{1,10}:" \
   | cut -d ":" -f 1 | sed 's/^ *//')
 
 for unit in $units; do

=== modified file 'admin/925-juju-destroy-all.sh'
--- admin/925-juju-destroy-all.sh	2014-10-02 15:18:00 +0000
+++ admin/925-juju-destroy-all.sh	2015-07-10 21:48:32 +0000
@@ -15,7 +15,7 @@
 
 if [ "$param" == "YES" ]; then
   # Get jenkins units
-  units=$(juju status | egrep "osci[-]?(slave)?/[0-9]{1,10}:" \
+  units=$(juju status --format=yaml | egrep "osci[-]?(slave)?/[0-9]{1,10}:" \
     | cut -d ":" -f 1 | sed 's/^ *//')
 
   for unit in $units; do

=== modified file 'admin/926-juju-delete-enviro-files-all.sh'
--- admin/926-juju-delete-enviro-files-all.sh	2014-10-02 15:18:00 +0000
+++ admin/926-juju-delete-enviro-files-all.sh	2015-07-10 21:48:32 +0000
@@ -17,7 +17,7 @@
 
 if [ "$param" == "YES" ]; then
   # Get jenkins units
-  units=$(juju status | egrep "osci[-]?(slave)?/[0-9]{1,10}:" \
+  units=$(juju status --format=yaml | egrep "osci[-]?(slave)?/[0-9]{1,10}:" \
     | cut -d ":" -f 1 | sed 's/^ *//')
 
   if [ -z "$units" ]; then

=== modified file 'admin/930-images-delete.sh'
--- admin/930-images-delete.sh	2014-12-08 22:02:26 +0000
+++ admin/930-images-delete.sh	2015-07-10 21:48:32 +0000
@@ -13,7 +13,7 @@
 fi
 
 # Get jenkins units
-units=$(juju status | egrep "osci[-]?(slave)?/[0-9]{1,10}:" \
+units=$(juju status --format=yaml | egrep "osci[-]?(slave)?/[0-9]{1,10}:" \
     | cut -d ":" -f 1 | sed 's/^ *//')
 for unit in $units; do
   echo "----- ${unit} -----"

=== modified file 'admin/940-jenkins-master-info.sh'
--- admin/940-jenkins-master-info.sh	2014-10-02 15:18:00 +0000
+++ admin/940-jenkins-master-info.sh	2015-07-10 21:48:32 +0000
@@ -8,7 +8,7 @@
 . ~/novarc
 
 # Get UUID of jenkins instance
-master_uuid=$(juju status ${MASTER} | grep instance-id | awk '{ print $2 }' |\
+master_uuid=$(juju status --format=yaml ${MASTER} | grep instance-id | awk '{ print $2 }' |\
    egrep '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}')
 if [ -z "$master_uuid" ]; then
   echo "Couldn't get UUID for jenkins master instance."

=== modified file 'admin/945-juju-gui-info.sh'
--- admin/945-juju-gui-info.sh	2014-10-03 14:43:06 +0000
+++ admin/945-juju-gui-info.sh	2015-07-10 21:48:32 +0000
@@ -8,7 +8,7 @@
 . ~/novarc
 
 # Get UUID of jenkins instance
-unit_uuid=$(juju status juju-gui | grep instance-id | awk '{ print $2 }' |\
+unit_uuid=$(juju status --format=yaml juju-gui | grep instance-id | awk '{ print $2 }' |\
    egrep '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}')
 if [ -z "$unit_uuid" ]; then
   echo "Couldn't get UUID for jenkins master instance."

=== modified file 'admin/946-units-meminfo.sh'
--- admin/946-units-meminfo.sh	2014-11-22 16:16:10 +0000
+++ admin/946-units-meminfo.sh	2015-07-10 21:48:32 +0000
@@ -3,7 +3,7 @@
 
 # Show memory usage of each juju unit
 
-units=$(juju status | grep '":' | tr -d : | tr -d \")
+units=$(juju status --format=yaml | grep '":' | tr -d : | tr -d \")
 
 for unit in $units; do
   echo "---------- unit ${unit} mem: ----------"

=== modified file 'admin/991-restart-jenkins-slaves-services.sh'
--- admin/991-restart-jenkins-slaves-services.sh	2014-10-03 14:43:06 +0000
+++ admin/991-restart-jenkins-slaves-services.sh	2015-07-10 21:48:32 +0000
@@ -3,7 +3,7 @@
 
 # Restart the jenkins service on all slave units
 
-units=$(juju status | egrep "osci-slave/" \
+units=$(juju status --format=yaml | egrep "osci-slave/" \
     | cut -d ":" -f 1 | sed 's/^ *//')
 
 for unit in $units; do

=== modified file 'common/osci_utils.py'
--- common/osci_utils.py	2015-03-12 04:38:42 +0000
+++ common/osci_utils.py	2015-07-10 21:48:32 +0000
@@ -97,9 +97,10 @@
     '''
     try:
         if jenv_name:
-            cmd = 'timeout {} juju status -e {}'.format(timeout, jenv_name)
+            cmd = ('timeout {} juju status --format=yaml -e '
+                   '{}'.format(timeout, jenv_name))
         else:
-            cmd = 'timeout {} juju status'.format(timeout)
+            cmd = 'timeout {} juju status --format=yaml'.format(timeout)
         j_stat = yaml.load(subprocess.check_output(cmd.split()))
     except subprocess.CalledProcessError:
         logging.warning(' ! Juju status attempt returned non-zero, '

=== modified file 'deployment/bin/120-install-plugins.sh'
--- deployment/bin/120-install-plugins.sh	2014-10-03 21:52:24 +0000
+++ deployment/bin/120-install-plugins.sh	2015-07-10 21:48:32 +0000
@@ -10,7 +10,7 @@
 plugins="deploy-files/plugins"
 
 # Get jenkins master ip and url
-master_ip=$(juju status ${MASTER} | grep public-address | awk '{ print $2 }')
+master_ip=$(juju status --format=yaml ${MASTER} | grep public-address | awk '{ print $2 }')
 master_url="http://${master_ip}:8080"
 clijar_path="/jnlpJars/jenkins-cli.jar"
 

=== modified file 'deployment/bin/220-master-floating-ip.sh'
--- deployment/bin/220-master-floating-ip.sh	2014-10-02 15:18:00 +0000
+++ deployment/bin/220-master-floating-ip.sh	2015-07-10 21:48:32 +0000
@@ -9,7 +9,7 @@
 
 . $(dirname $0)/../../env-common
 
-nova list 
+nova list
 
 ip_f_str="10.98."
 
@@ -20,7 +20,7 @@
 }
 
 # Get UUID of jenkins instance
-master_uuid=$(juju status ${MASTER} | grep instance-id | awk '{ print $2 }' |\
+master_uuid=$(juju status --format=yaml ${MASTER} | grep instance-id | awk '{ print $2 }' |\
    egrep '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}')
 if [ -z "$master_uuid" ]; then
   echo "Couldn't get UUID for jenkins master instance."
@@ -49,7 +49,7 @@
 # Associate the floating IP
 nova floating-ip-associate $master_uuid $ip_f
 echo "===================jenkins master info ==================="
-juju status ${MASTER}
+juju status --format=yaml ${MASTER}
 nova list | grep $master_uuid
 curl http://${ip_f}:8080 -I 2> /dev/null | egrep 'X-Jenkins:|HTTP'
 echo "Jenkins master floating IP:  ${ip_f}"

=== modified file 'deployment/bin/225-juju-gui-float.sh'
--- deployment/bin/225-juju-gui-float.sh	2014-11-22 16:16:10 +0000
+++ deployment/bin/225-juju-gui-float.sh	2015-07-10 21:48:32 +0000
@@ -14,7 +14,7 @@
 }
 
 # Get UUID of jenkins instance
-unit_uuid=$(juju status juju-gui | grep instance-id | awk '{ print $2 }' |\
+unit_uuid=$(juju status --format=yaml juju-gui | grep instance-id | awk '{ print $2 }' |\
    egrep '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}')
 if [ -z "$unit_uuid" ]; then
   echo "Couldn't get UUID for juju gui instance."
@@ -43,7 +43,7 @@
 # Associate the floating IP
 nova floating-ip-associate $unit_uuid $ip_f
 echo "===================juju gui info ==================="
-juju status juju-gui
+juju status --format=yaml juju-gui
 nova list | grep $unit_uuid
 echo "Juju GUI floating IP:  ${ip_f}"
 

=== modified file 'env-common'
--- env-common	2015-02-18 04:49:11 +0000
+++ env-common	2015-07-10 21:48:32 +0000
@@ -16,7 +16,7 @@
 FILE_TRIGGER_DIR="${JENKINS_HOME}/file-triggers"
 
 # master and all slaves
-UNITS=$(juju status | egrep "osci[-]?(slave)?/[0-9]{1,10}:" \
+UNITS=$(juju status --format=yaml | egrep "osci[-]?(slave)?/[0-9]{1,10}:" \
   | cut -d ":" -f 1 | sed 's/^ *//')
 
 LP_ID="openstack-ubuntu-testing-bot"

=== modified file 'job-parts/README'
--- job-parts/README	2015-01-21 05:31:11 +0000
+++ job-parts/README	2015-07-10 21:48:32 +0000
@@ -47,4 +47,5 @@
 
 Other
 =====
+  * Also see the ../tools/ dir.
   * Also see the main README.

=== modified file 'job-parts/juju_deploy_ok.sh'
--- job-parts/juju_deploy_ok.sh	2015-01-22 02:35:31 +0000
+++ job-parts/juju_deploy_ok.sh	2015-07-10 21:48:32 +0000
@@ -12,7 +12,7 @@
 . ${OSCI_ROOT}/job-parts/osci_job_common.sh
 . ~/novarc
 
-bad_states="$(juju stat 2>&1 | egrep 'agent\-state:|instance\-state:' | egrep -v 'ACTIVE|started' || true)"
+bad_states="$(juju stat --format=yaml 2>&1 | egrep 'agent\-state:|instance\-state:' | egrep -v 'ACTIVE|started' || true)"
 jenvs="$(ls ${HOME}/.juju/environments/*jenv -alh 2> /dev/null || true)"
 good_instances=$(timeout 30 nova list | grep "\-${JENV_NAME}\-machine" | grep 'ACTIVE' || true)
 bad_instances=$(timeout 30 nova list | grep "\-${JENV_NAME}\-machine" | grep -v 'ACTIVE' || true)

=== modified file 'job-parts/osci_job_common.sh'
--- job-parts/osci_job_common.sh	2015-07-08 19:54:32 +0000
+++ job-parts/osci_job_common.sh	2015-07-10 21:48:32 +0000
@@ -47,7 +47,7 @@
   [[ -n "$1" ]] && PARAM1="$1" || PARAM1=""
   f_line "Checking juju stat health: $PARAM1"
 
-  ${OSCI_ROOT}/job-parts/juju_status_health_check.py 2>&1 | tee $WORKSPACE/deploy-health${PARAM1}.$BUILD_NUMBER; ret_code=${PIPESTATUS[0]}
+  ${OSCI_ROOT}/tools/juju_status_health_check.py 2>&1 | tee $WORKSPACE/deploy-health${PARAM1}.$BUILD_NUMBER; ret_code=${PIPESTATUS[0]}
   echo "Returned:  ${ret_code}"
   case "$ret_code" in
     0)
@@ -295,14 +295,14 @@
   f_juju_stat "-collect" || true
 
   . $JENKINS_HOME/novarc
-  ${OSCI_ROOT}/job-parts/nova_instances_summarize.py || true
+  ${OSCI_ROOT}/tools/nova_instances_summarize.py || true
   ${OSCI_ROOT}/job-parts/collect_charm_revno_info.sh || true
-  ${OSCI_ROOT}/job-parts/juju_pull_logs.py || true
+  ${OSCI_ROOT}/tools/juju_pull_logs.py || true
 }
 
 
 function f_juju_stat() {
-  juju stat &> $WORKSPACE/juju-stat${1}.$BUILD_NUMBER || true
+  juju stat --format=yaml &> $WORKSPACE/juju-stat${1}.$BUILD_NUMBER || true
   juju stat --format=tabular &> $WORKSPACE/juju-stat-tab${1}.$BUILD_NUMBER || true
 }
 
@@ -344,13 +344,13 @@
 function f_amulet_no_teardown() {
 # Hack up the makefile to prevent amulet from tearing down enviro
   cd $CO_DIR
-  $OSCI_ROOT/job-parts/find_replace.py -yd -i Makefile -o Makefile -f "juju test -v" -r "juju test --set-e -v" || true
+  $OSCI_ROOT/tools/find_replace.py -yd -i Makefile -o Makefile -f "juju test -v" -r "juju test --set-e -v" || true
 }
 
 
 function f_amulet_set_timeout() {
-  $OSCI_ROOT/job-parts/find_replace.py -yd -i Makefile -o Makefile -f "--timeout 900" -r "--timeout 2700" || true
-  $OSCI_ROOT/job-parts/find_replace.py -yd -i Makefile -o Makefile -f "--timeout 1200" -r "--timeout 2700" || true
+  $OSCI_ROOT/tools/find_replace.py -yd -i Makefile -o Makefile -f "--timeout 900" -r "--timeout 2700" || true
+  $OSCI_ROOT/tools/find_replace.py -yd -i Makefile -o Makefile -f "--timeout 1200" -r "--timeout 2700" || true
 }
 
 

=== modified file 'job-parts/osci_openstack_common.sh'
--- job-parts/osci_openstack_common.sh	2015-05-14 15:56:01 +0000
+++ job-parts/osci_openstack_common.sh	2015-07-10 21:48:32 +0000
@@ -9,7 +9,7 @@
 # Undercloud should have a flavor which exactly matches mem, otherwise
 # the next largest flavor (probably 8G) will be chosen.
   echo "Modifying bundle constraints (4G:4160M)."
-  $OSCI_ROOT/job-parts/find_replace.py -yd -i "$BUNDLE_FILE" -o "$BUNDLE_FILE" -f "mem=4G" -r "mem=4160M" || touch $WORKSPACE/fyi-${test:0:4}.bundle-constraint-mod.failed
+  $OSCI_ROOT/tools/find_replace.py -yd -i "$BUNDLE_FILE" -o "$BUNDLE_FILE" -f "mem=4G" -r "mem=4160M" || touch $WORKSPACE/fyi-${test:0:4}.bundle-constraint-mod.failed
 }
 
 
@@ -19,7 +19,7 @@
     echo "Triggered by merge proposal: ${MP_TRIGGER}"
     echo "Substituting proposed branch in deployer bundle..."
     echo '' > $WORKSPACE/custom-other.yaml || true
-    $OSCI_ROOT/job-parts/find_replace.py -yd -i "$OPENSTACK_CHARM_TESTING_ROOT/$CHARM_SET" -o "$WORKSPACE/custom-other.yaml" -f "$MP_TGT_BR" -r "$MP_SRC_BR" || touch $WORKSPACE/fyi-${test:0:4}.mp-branch-replace.failed
+    $OSCI_ROOT/tools/find_replace.py -yd -i "$OPENSTACK_CHARM_TESTING_ROOT/$CHARM_SET" -o "$WORKSPACE/custom-other.yaml" -f "$MP_TGT_BR" -r "$MP_SRC_BR" || touch $WORKSPACE/fyi-${test:0:4}.mp-branch-replace.failed
     export CHARM_SET="custom-other.yaml"
   fi
 }
@@ -325,9 +325,9 @@
 # Display juju gui and openstack dashboard URLs if they exist.
 # Also announce ubuntu/0 floating IP for debug purposes, if exists.
   f_line "GUI info, if available"
-  jgui_fip=$(juju stat juju-gui/0 | grep public-address | cut -f 2 -d ":" | xargs || true)
-  dash_fip=$(juju stat openstack-dashboard/0 | grep public-address | cut -f 2 -d ":" | xargs || true)
-  ubnt_fip=$(juju stat ubuntu/0 | grep public-address | cut -f 2 -d ":" | xargs || true)
+  jgui_fip=$(juju stat --format=yaml juju-gui/0 | grep public-address | cut -f 2 -d ":" | xargs || true)
+  dash_fip=$(juju stat --format=yaml openstack-dashboard/0 | grep public-address | cut -f 2 -d ":" | xargs || true)
+  ubnt_fip=$(juju stat --format=yaml ubuntu/0 | grep public-address | cut -f 2 -d ":" | xargs || true)
   [[ -n "$jgui_fip" ]] && echo "Juju GUI URL:  https://${jgui_fip}" || true
   [[ -n "$dash_fip" ]] && echo "OpenStack Dashboard URL:  http://${dash_fip}/horizon" || true
   [[ -n "$ubnt_fip" ]] && echo "Ubuntu Floating IP:  ${ubnt_fip}" || true

=== added directory 'tools'
=== added file 'tools/README'
--- tools/README	1970-01-01 00:00:00 +0000
+++ tools/README	2015-07-10 21:48:32 +0000
@@ -0,0 +1,25 @@
+UOSCI TOOLS
+===========
+
+This tools directory contains command-line tools, used by various UOSCI
+jobs and test runners.  But these are also usable as stand-alone utilities.
+
+bundle_constrainer.py        A tool to add or remove service constraints in a
+                             Juju bundle yaml file.
+
+dummy_bundle.yaml            A sample bundle with bogus charm references, useful
+                             in exercising various yaml tools.
+
+find_replace.py              Basically, "s/find/replace/g" -i but prettier.
+
+juju_pull_logs.py            Pull /var/log from all juju units.
+
+juju_status_health_check.py  A basic juju status check based on juju unit status,
+                             agent states, SSH, ICMP and TCP connection checks.
+
+nova_instances_summarize.py  Create a yaml summary file, containing nova instance
+                             info, filtered based on default juju environment name.
+
+yaml_spit.py                 Read a bundle or any yaml and spit it back out, using
+                             python-yaml to standardize the syntax.  Useful for
+                             checking hand-generated yaml data.

=== added file 'tools/__init__.py'
--- tools/__init__.py	1970-01-01 00:00:00 +0000
+++ tools/__init__.py	2015-07-10 21:48:32 +0000
@@ -0,0 +1,1 @@
+#

=== added file 'tools/bundle_constrainer.py'
--- tools/bundle_constrainer.py	1970-01-01 00:00:00 +0000
+++ tools/bundle_constrainer.py	2015-07-10 21:48:32 +0000
@@ -0,0 +1,196 @@
+#!/usr/bin/env python
+'''
+A tool to add or remove constraints in a Juju bundle YAML file.  Useful to
+inject MAAS tags, mem, arch or other constraints.
+'''
+
+import logging
+import optparse
+import os
+import sys
+import yaml
+
+sys.path.insert(1, os.path.join(sys.path[0], '..'))
+from common import osci_utils
+
+USAGE = '''Usage: %prog [options]
+
+bundle_constrainer
+==============================================================================
+A tool to add or remove constraints in a Juju bundle YAML file.  Useful to
+inject MAAS tags, mem, arch or other constraints.
+
+Default behavior:
+  The specified constraint key-value pairs override existing pairs
+  when the keys are identical.  If the specified constraints contain
+  keys which do not already exist in the bundle, the new ones are
+  added and the existing constraint key pairs remain.
+
+  Services with placement ("to:") are ignored altogether.
+
+  Will not overwrite an existing file without -y.
+
+Usage examples:
+  Add constraints and overwrite the original file, with debug output:
+    %prog -yd -i my.yaml -o my.yaml --constraints "mem=1G tags=dell,intel"
+
+  Remove existing constraints, add new constraints, and overwrite:
+    %prog -yr -i my.yaml -o my.yaml --constraints "mem=1G tags=dell"
+
+  Remove all constraints and write to a new bundle yaml file:
+    %prog -i old.yaml -o new.yaml --remove-all
+
+  Remove all constraints, excluding the listed services, and overwrite:
+    %prog -yr -i my.yaml -o my.yaml -e "ceilometer-agent,neutron-api"
+'''
+
+CNSTR = 'constraints'
+
+
+def constraint_str_dict(constraint_string):
+    '''Convert a juju constraint string into a dictionary.'''
+    _constraints = {}
+    for pair in constraint_string.split():
+        key, val = pair.split('=')
+        _constraints[key] = val
+    return _constraints
+
+
+def constraint_dict_str(constraint_dict):
+    '''Convert a dictionary into a juju constraint string.'''
+    _constraint_string = ''
+    for key, val in constraint_dict.items():
+        _constraint_string = '{} {}={}'.format(_constraint_string, key, val)
+    return _constraint_string.strip()
+
+
+def merge_constraints(org_constraints, new_constraints):
+    '''Merge new constraints with original constraints, where new wins.'''
+    _constraints = org_constraints.copy()
+    _constraints.update(new_constraints)
+    return _constraints
+
+
+def update_constraints(bundle_dict, opts):
+    '''Use command line options to mangle the bundle's dictionary data.'''
+    if opts.exclude_services:
+        exclude_services = opts.exclude_services.split(',')
+        logging.info('Excluding services: {}'.format(exclude_services))
+    else:
+        exclude_services = []
+
+    for target, t_v in bundle_dict.items():
+        logging.debug('Target: {}'.format(target))
+        for operation, o_v in t_v.items():
+            logging.debug('Operation: {}'.format(operation))
+            if operation == 'services':
+                # NOTE: operation may commonly be: relation, services,
+                #       overrides or inherits.
+                for service, s_v in o_v.items():
+                    logging.debug('Service: {}'.format(service))
+
+                    if 'to' in s_v.keys():
+                        logging.info('Skipping {} as it uses placement '
+                                     '({}).'.format(service, s_v['to']))
+                        continue
+
+                    if CNSTR in s_v.keys():
+                        org_constraints = \
+                            constraint_str_dict(s_v[CNSTR])
+                        logging.info('{} has existing constraints '
+                                     '({}).'.format(service, org_constraints))
+
+                        if opts.remove_all and service not in exclude_services:
+                            logging.info('Removing existing constraints for '
+                                         '{}'.format(service))
+                            del bundle_dict[target][operation][service][CNSTR]
+                    else:
+                        org_constraints = {}
+
+                    if opts.constraints and service not in exclude_services:
+                        new_constraints = constraint_str_dict(opts.constraints)
+                        merged_constraints = merge_constraints(org_constraints,
+                                                               new_constraints)
+
+                        bundle_dict[target][operation][service][CNSTR] = \
+                            constraint_dict_str(merged_constraints)
+
+    return bundle_dict
+
+
+def main():
+    '''Define and handle command line parameters
+    '''
+    # Define command line options
+    parser = optparse.OptionParser(USAGE)
+    parser.add_option("-d", "--debug",
+                      help="Enable debug logging",
+                      dest="debug", action="store_true", default=False)
+    parser.add_option('-y', '--yes-overwrite',
+                      help='Overwrite the output file',
+                      dest='overwrite', action='store_true', default=False)
+    parser.add_option("-i", "--in-file",
+                      help="YAML input (source) file",
+                      action="store", type="string", dest="in_file")
+    parser.add_option("-o", "--out-file",
+                      help="YAML output (destination) file",
+                      action="store", type="string", dest="out_file")
+    parser.add_option("--constraints",
+                      help="Constraints string to force onto service units.",
+                      action="store", type="string", dest="constraints")
+    parser.add_option("-e", "--exclude-services",
+                      help="Comma-separated list of service names to exclude",
+                      action="store", type="string", dest="exclude_services")
+    parser.add_option("-r", "--remove-all",
+                      help="Remove all constraints.",
+                      dest="remove_all", action="store_true", default=False)
+
+    params = parser.parse_args()
+    (opts, args) = params
+
+    # Handle parameters, inform user
+    if opts.debug:
+        logging.basicConfig(level=logging.DEBUG)
+        logging.info('Logging level set to DEBUG!')
+        logging.debug('parse opts: \n{}'.format(
+            yaml.dump(vars(opts), default_flow_style=False)))
+        logging.debug('arg count: {}'.format(len(args)))
+        logging.debug('parse args: {}'.format(args))
+    else:
+        logging.basicConfig(level=logging.INFO)
+
+    # Validate options
+    if not opts.in_file or not opts.out_file:
+        parser.print_help()
+        sys.exit(1)
+
+    # Validate and process files
+    if os.path.isfile(opts.out_file) and opts.overwrite:
+        logging.warning('Output file exists and will be '
+                        'overwritten: {}'.format(opts.out_file))
+    elif os.path.isfile(opts.out_file) and not opts.overwrite:
+        logging.warning('Output file exists and will NOT '
+                        'be overwritten: {}'.format(opts.out_file))
+        raise ValueError('Output file exists, overwrite option not set.')
+
+    if not os.path.isfile(opts.in_file):
+        raise ValueError('Input file not found.')
+
+    if not opts.constraints and not opts.remove_all:
+        raise ValueError('No action taken.  Specify new constraints '
+                         'and/or existing constraint removal.')
+
+    # Read the infile
+    logging.info('Reading input file: {}'.format(opts.in_file))
+    org_bundle_dict = osci_utils.read_yaml(opts.in_file)
+
+    # Mangle dict data
+    new_bundle_dict = update_constraints(org_bundle_dict, opts)
+
+    # Write the outfile
+    logging.info('Writing out file: {}'.format(opts.out_file))
+    osci_utils.write_yaml(new_bundle_dict, opts.out_file)
+
+
+if __name__ == '__main__':
+    main()

=== added file 'tools/dummy-bundle.yaml'
--- tools/dummy-bundle.yaml	1970-01-01 00:00:00 +0000
+++ tools/dummy-bundle.yaml	2015-07-10 21:48:32 +0000
@@ -0,0 +1,48 @@
+#  A dummy bundle for testing various yaml-mangling tools.
+#
+your-target:
+  services:
+    white-service:
+      branch: lp:some/white/charm/branch
+      options:
+        shade: "white is white"
+      to:
+        - "lxc:0"
+    blue-service:
+      branch: lp:some/blue/charm/branch
+      num_units: 3
+      constraints: "arch=ppc64el"
+      options:
+        shade: light
+  relations:
+  - [ white-service, blue-service ]
+# Variation on that first target.
+modified-target:
+  inherits: your-target
+  series: p-past
+  services:
+    red-service:
+      branch: lp:some/red/charm/branch
+      constraints: "mem=1G tags=x86,sales arch=amd64"
+      options:
+        shade: dark
+    green-service:
+      branch: lp:some/green/charm/branch
+      constraints: "mem=4G tags=ppc64el,support"
+      options:
+        shade: dark
+  relations:
+  - [ green-service, red-service ]
+  - [ green-service, white-service ]
+  - - blue-service:dummy
+    - blue-service:dummy
+  overrides:
+    shade: dark
+# Comments will disappear if parsed with python-yaml.
+really-modified-target:
+  inherits: modified-target
+  series: x-future
+  relations:
+  - [ "green-service:dummy", white-service ]
+  overrides:
+    shade: bright

=== renamed file 'job-parts/find_replace.py' => 'tools/find_replace.py'
--- job-parts/find_replace.py	2015-01-07 19:32:26 +0000
+++ tools/find_replace.py	2015-07-10 21:48:32 +0000
@@ -13,7 +13,8 @@
 USAGE = '''Usage: %prog [options]
 
 Default behavior:
-  Find string matches in a file, replace with text, write to a different file.
+  Find string matches in a file, replace with text, write to a different file,
+  with optional debug output.
 
 For example:
 

=== renamed file 'job-parts/juju_pull_logs.py' => 'tools/juju_pull_logs.py'
=== renamed file 'job-parts/juju_status_health_check.py' => 'tools/juju_status_health_check.py'
=== renamed file 'job-parts/nova_instances_summarize.py' => 'tools/nova_instances_summarize.py'
=== renamed file 'job-parts/yaml_spit.py' => 'tools/yaml_spit.py'
=== modified file 'tox.ini'
--- tox.ini	2015-01-09 20:09:53 +0000
+++ tox.ini	2015-07-10 21:48:32 +0000
@@ -2,5 +2,5 @@
 # The following checks should be re-enabled in the future
 # for python3 syntax correctness and sanity.
 #
-ignore = H233,H301,H302,H305,H306,H402,H403,H405,H904
+#ignore = H233,H301,H302,H305,H306,H402,H403,H405,H904
 #show-source = True