update the openstack network def with a spiff merge
add the ha_proxy_z1 job
update ha_proxy job; properly allocate etcd ips
add an extra database and role entry to support using the postgres db for console

Signed-off-by: Larry Warner <lwarner@pivotallabs.com>
updated for deploying with att