US335
Merge pull request #109 from jcannava/grizzly

Merged automatically by jenkins after successful build test
Merge pull request #110 from rackerjoe/US335

Merged automatically by jenkins after successful build test
Fixed spacing in front of [ldap] render
Merge pull request #111 from john5223/grizzly

Merged automatically by jenkins after successful build test
Fix foodcritic notifications and violations in keystone

brings compat up to foodcritic 2.1.0
fix the template, but lose the foodcritic battle
Merge pull request #112 from rackerjoe/foodcritic

Merged automatically by jenkins after successful build test
Fixes https://github.com/rcbops/chef-cookbooks/issues/425
Adds internal-api to attributes which is based on the value of the management
network, service-api remains set by the public network and admin-api remains
set by the value of nova network from osops.
fixing merge conflict
Merge pull request #113 from jcannava/DE155

Merged automatically by jenkins after successful build test
Fix CentOS upgrade defects

* adds the sleep 10s back in after a keystone restart.
* fixup /var/log/nova/nova.log to be owned by nova on upgrade

Fixes rcbops/chef-cookbooks/issue#446
Partially resolves DE181
Fixes rcbops/chef-cookbooks/issues/433
Fixes DE172 - Keystone LDAP add-user role issue
This provides a workaround for https://bugs.launchpad.net/keystone/+bug/1176270

If you are using LDAP as an auth backend you will have to run chef twice
on initial setup to apply this workaround.
fix a foodcritic violation
Merge pull request #114 from rackerjoe/DE181

Fix CentOS upgrade defects
Puts member_role_id in on second run of chef-client
Merge branch 'grizzly' of https://github.com/rcbops-cookbooks/keystone into DE172
Fixing foodcritic error
Merge pull request #115 from jcannava/DE172

Merged automatically by jenkins after successful build test
move log file ownership cleanup to common instead of setup so it works on the second controller as well