explicit logic
Merge pull request #116 from cjoelrun/ldaplogic

explicit logic
fixed ldap/AD keystone / service user integration, fixed ipython load
Merge branch 'master' of https://github.com/rcbops-qa/monster
Merge pull request #117 from jacobwagner/master

AD/ LDAP fixes
added ceilometer to all havana
added ceilometer to configs
Merge pull request #118 from jacobwagner/master

add ceilometer to config / templates
fixed url endpoint problem
Merge pull request #119 from jacobwagner/master

fixed url endpoint problem
james | refactoring tempest tests
james | changing the behavior of the wrapper so they know what arguments to pass to their wrapped functions.
james | continued cleaning up of compute.py
james | flake8
fixed ldap/ad integration, fixed build decl wrappers
james | changing the behavior of the wrapper so they know what arguments to pass to their wrapped functions.
james | continued cleaning up of compute.py
james | flake8
james | renamed tests/utils to tests/util
james | adding back a method that i shouldn't have deleted..