Remove silly nested name deploy handling.
@@ -29,27 +29,6 @@ except ImportError:
MAX_PARALLEL = None
-def _make_name(current, new):
- '''
- Stops duplication between similarly named nested deploys, eg:
-
- Turn:
- Deploy Kubernetes master/Configure Kubernetes
- Into:
- Deploy Kubernetes master/Configure
- '''
-
- current_tokens = current.split()
- new_tokens = new.split()
-
- new = ' '.join(
- new_token for new_token in new_tokens
- if new_token not in current_tokens
- )
-
- return '/'.join((current, new))
-
-
class State(object):
'''
Manages state for a pyinfra deploy.
@@ -242,7 +221,7 @@ class State(object):
# Handle nested deploy names
if self.deploy_name:
- name = _make_name(self.deploy_name, name)
+ name = '{0} | {1}'.format(self.deploy_name, name)
# Store the previous values
old_in_deploy = self.in_deploy
