From 4a2df4d979389d7213bd93829ed4116847e7d562 Mon Sep 17 00:00:00 2001
From: Jordan Rodgers <com6056@gmail.com>
Date: Sun, 11 Feb 2018 21:15:39 -0500
Subject: [PATCH] remove ssh queue

---
 proxstar/tasks.py   | 64 +++++++++++++++++++--------------------------
 start_worker_ssh.sh |  3 ---
 2 files changed, 27 insertions(+), 40 deletions(-)
 delete mode 100755 start_worker_ssh.sh

diff --git a/proxstar/tasks.py b/proxstar/tasks.py
index fcf3d52..de4b4c9 100644
--- a/proxstar/tasks.py
+++ b/proxstar/tasks.py
@@ -1,7 +1,5 @@
 import os
 import paramiko
-from rq import Queue
-from redis import Redis
 from flask import Flask
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
@@ -21,9 +19,6 @@ else:
     config = os.path.join(app.config.get('ROOT_DIR', os.getcwd()), "config.py")
 app.config.from_pyfile(config)
 
-redis_conn = Redis(app.config['REDIS_HOST'], app.config['REDIS_PORT'])
-q = Queue(connection=redis_conn)
-
 
 def connect_db():
     engine = create_engine(app.config['SQLALCHEMY_DATABASE_URI'])
@@ -111,7 +106,6 @@ def generate_pool_cache_task():
 
 def setup_template(template_id, name, user, password, cores, memory):
     with app.app_context():
-        q = Queue('ssh', connection=redis_conn)
         proxmox = connect_proxmox()
         starrs = connect_starrs()
         db = connect_db()
@@ -125,34 +119,30 @@ def setup_template(template_id, name, user, password, cores, memory):
         time.sleep(90)
         change_vm_power(proxmox, vmid, 'start')
         time.sleep(20)
-        q.enqueue(setup_template_ssh, ip, template, user, password)
-
-
-def setup_template_ssh(ip, template, user, password):
-    client = paramiko.SSHClient()
-    client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-    retry = 0
-    while retry < 30:
-        try:
-            client.connect(
-                ip,
-                username=template['username'],
-                password=template['password'])
-            break
-        except:
-            retry += 1
-            time.sleep(3)
-    stdin, stdout, stderr = client.exec_command("useradd {}".format(user))
-    exit_status = stdout.channel.recv_exit_status()
-    root_password = gen_password(32)
-    stdin, stdout, stderr = client.exec_command(
-        "echo '{}' | passwd root --stdin".format(root_password))
-    exit_status = stdout.channel.recv_exit_status()
-    stdin, stdout, stderr = client.exec_command(
-        "echo '{}' | passwd '{}' -e --stdin".format(password, user))
-    exit_status = stdout.channel.recv_exit_status()
-    stdin, stdout, stderr = client.exec_command(
-        "echo '{} ALL=(ALL:ALL) ALL' | sudo EDITOR='tee -a' visudo".format(
-            user))
-    exit_status = stdout.channel.recv_exit_status()
-    client.close()
+        client = paramiko.SSHClient()
+        client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+        retry = 0
+        while retry < 30:
+            try:
+                client.connect(
+                    ip,
+                    username=template['username'],
+                    password=template['password'])
+                break
+            except:
+                retry += 1
+                time.sleep(3)
+        stdin, stdout, stderr = client.exec_command("useradd {}".format(user))
+        exit_status = stdout.channel.recv_exit_status()
+        root_password = gen_password(32)
+        stdin, stdout, stderr = client.exec_command(
+            "echo '{}' | passwd root --stdin".format(root_password))
+        exit_status = stdout.channel.recv_exit_status()
+        stdin, stdout, stderr = client.exec_command(
+            "echo '{}' | passwd '{}' -e --stdin".format(password, user))
+        exit_status = stdout.channel.recv_exit_status()
+        stdin, stdout, stderr = client.exec_command(
+            "echo '{} ALL=(ALL:ALL) ALL' | sudo EDITOR='tee -a' visudo".format(
+                user))
+        exit_status = stdout.channel.recv_exit_status()
+        client.close()
diff --git a/start_worker_ssh.sh b/start_worker_ssh.sh
deleted file mode 100755
index 80a1027..0000000
--- a/start_worker_ssh.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/opt/app-root/bin/rq worker -u "$PROXSTAR_REDIS_URL" --sentry-dsn "$PROXSTAR_SENTRY_DSN" ssh