Merge pull request #25253 from s0undt3ch/2015.8

Remove the deprecation warning. The driver has been renamed.
This commit is contained in:
Nicole Thomas 2015-07-08 14:48:31 -06:00
commit 4e7346aac4

View File

@ -44,7 +44,6 @@ from salt.exceptions import (
SaltCloudExecutionFailure,
SaltCloudExecutionTimeout
)
from salt.utils import warn_until
# Import Third Party Libs
try:
@ -80,22 +79,12 @@ def get_configured_provider():
'''
Return the first configured instance.
'''
configuration = config.is_provider_configured(
return config.is_provider_configured(
__opts__,
__active_provider_name__ or 'digital_ocean',
('personal_access_token',)
)
if configuration:
warn_until(
'Beryllium',
'The digital_ocean driver is deprecated and will be removed in Salt Beryllium. '
'Please convert your digital ocean provider configs to use the digital_ocean_v2 '
'driver.'
)
return configuration
def avail_locations(call=None):
'''