Skip to content

Commit

Permalink
Merge pull request #25253 from s0undt3ch/2015.8
Browse files Browse the repository at this point in the history
Remove the deprecation warning. The driver has been renamed.
  • Loading branch information
Nicole Thomas committed Jul 8, 2015
2 parents 679cdba + ea7afb4 commit 4e7346a
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions salt/cloud/clouds/digital_ocean.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
SaltCloudExecutionFailure,
SaltCloudExecutionTimeout
)
from salt.utils import warn_until

# Import Third Party Libs
try:
Expand Down Expand Up @@ -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):
'''
Expand Down

0 comments on commit 4e7346a

Please sign in to comment.