Merge pull request #30 from ryanpetrello/fix-isolated-awx

fix tower-expect -> awx-expect for isolated tower builds

awx/main/isolated/isolated_manager.py

@@ -170,7 +170,7 @@ class IsolatedManager(object):
         # - sets up a temporary directory for proot/bwrap (if necessary)
         # - copies encrypted job data from the controlling host to the isolated host (with rsync)
         # - writes the encryption secret to a named pipe on the isolated host
-        # - launches the isolated playbook runner via `tower-expect start <job-id>`
+        # - launches the isolated playbook runner via `awx-expect start <job-id>`
         args = self._build_args('run_isolated.yml', '%s,' % self.host, extra_vars)
         if self.instance.verbosity:
             args.append('-%s' % ('v' * min(5, self.instance.verbosity)))

awx/playbooks/check_isolated.yml

@@ -10,7 +10,7 @@
   tasks:
 
     - name: Determine if daemon process is alive.
-      shell: "tower-expect is-alive {{src}}"
+      shell: "awx-expect is-alive {{src}}"
       register: is_alive
       ignore_errors: true
 

awx/playbooks/clean_isolated.yml

@@ -11,7 +11,7 @@
   tasks:
 
     - name: cancel the job
-      command: "tower-expect stop {{private_data_dir}}"
+      command: "awx-expect stop {{private_data_dir}}"
       ignore_errors: yes
 
     - name: remove build artifacts

awx/playbooks/run_isolated.yml

@@ -29,7 +29,7 @@
       command: "mkfifo {{src}}/env"
 
     - name: spawn the playbook
-      command: "tower-expect start {{src}}"
+      command: "awx-expect start {{src}}"
 
     - name: write the secret environment data
       mkfifo:

awx/plugins/isolated/tower_capacity.py

@@ -26,7 +26,7 @@ def main():
     )
     try:
         version = subprocess.check_output(
-            ['tower-expect', '--version'],
+            ['awx-expect', '--version'],
             stderr=subprocess.STDOUT
         ).strip()
     except subprocess.CalledProcessError as e:

awx/plugins/isolated/tower_isolated_cleanup.py

@@ -51,7 +51,7 @@ def main():
                 try:
                     re_match = re.match(r'\/tmp\/ansible_tower_\d+_.+', path)
                     if re_match is not None:
-                        if subprocess.check_call(['tower-expect', 'is-alive', path]) == 0:
+                        if subprocess.check_call(['awx-expect', 'is-alive', path]) == 0:
                             continue
                         else:
                             module.debug('Deleting path {} its job has completed.'.format(path))