Cisco grizzly update

DO NOT MERGE

changes for the puppet-openstack module to work with the grizzly branch. I am not sure if this should be merged, or if this whole repo should just be rebased to be the same as upstream.