add code to store the private address of the OpenStack Controller for the Cinder module. removed --force-yes to test the repo fix
Insert updates to controller.sh.  Still need to update nova.conf and cinder.conf

Merge branch 'master' into cinder