Move the provider definition into the driver
Oops, it's __opts__ in the driver
Merge pull request #12756 from techhat/cloudcachedir

Move the provider definition into the driver