Merge pull request alphagov#49 from alphagov/remove-carrenza-preview

rjw1 · rjw1 · commit 53a1cf0e8413 · 2014-06-27T17:04:45.000+01:00
Fix up Carrenza and Preview gateways
diff --git a/fabfile.py b/fabfile.py
@@ -182,10 +182,7 @@ def _set_gateway(name):
     setting and makes sure that the correct known_hosts file will be consulted,
     then dynamically fetches a list of hosts from the gateway box.
     """
-    if name == 'preview_carrenza':
-        env.gateway = 'jumpbox.provider1.preview.govuk.service.gov.uk'
-    else:
-        env.gateway = 'jumpbox.{0}.alphagov.co.uk'.format(name)
+    env.gateway = 'jumpbox.{0}.alphagov.co.uk'.format(name)
     env.system_known_hosts = _fetch_known_hosts()
     env.roledefs.fetch()
 
@@ -214,11 +211,6 @@ def preview():
     """Select preview environment"""
     _set_gateway('preview')
 
-@task
-def preview_carrenza():
-    """Select preview environment"""
-    _set_gateway('preview_carrenza')
-
 @task
 def all():
     """Select all machines in current environment"""
