a

app/api.py

@@ -24,40 +24,20 @@ def api():
 @click.option("--auth_seed", required=True)
 @click.option("--auth_realm", required=True)
 @click.option("--realm_allowed", multiple=True, required=True)
+@click.option("--etcd_url", required=True)
+@click.option("--etcd_password", required=True)
 @click.option(
     "--otp_server",
     default="https://otp.ungleich.ch/ungleichotp/",
     help="URL of ungleich OTP server",
 )
-def setup(path, auth_name, auth_seed, auth_realm, realm_allowed, otp_server):
+def setup(path, auth_name, auth_seed, auth_realm,
+          realm_allowed, otp_server, etcd_url,
+          etcd_password):
     os.chdir(path)
 
-    # Install etcd
-    op = PackageManagementOperation.install("etcd")
-    
-    # Add --pidfile argument to supervise daemon
-    op.add(
-        subprocess.check_output,
-        args=["sed", "-i", "-e",
-              r"""'s/supervise_daemon_args="--chdir"""
-              r""" $ETCD_DATA_DIR"/supervise_daemon_args="--chdir $ETCD_DATA_DIR"""
-              r""" --pidfile /run/etcd.pid"/g' /etc/init.d/etcd"""])
-    
-    # Change address of etcd
-    op.add(
-        subprocess.check_output,
-        args=["sed", "-i", "-e",
-              r""""s/localhost/[2a0a:e5c0:0:2:0:b3ff:fe39:7994]/g" /etc/etcd/conf.yml'"""])
-    
-    # Start and Enable etcd service
-    op.add(subprocess.check_output,
-           args="service etcd start; rc-update add etcd".split())
-
     # Git Operation Depends on success of previous operation i.e PackageManagementOperation
-    op.add(
-        GitOperation.clone,
-        url="https://code.ungleich.ch/ungleich-public/ucloud-api.git",
-    )
+    op = GitOperation.clone(url="https://code.ungleich.ch/ungleich-public/ucloud-api.git")
 
     content = (
         f"AUTH_NAME={auth_name}\n"
@@ -65,6 +45,8 @@ def setup(path, auth_name, auth_seed, auth_realm, realm_allowed, otp_server):
         f"AUTH_REALM={auth_seed}\n"
         f"REALM_ALLOWED={list(realm_allowed)}\n"
         f"OTP_SERVER={otp_server}\n"
+        f"ETCD_URL={etcd_url}\n"
+        f"ETCD_PASSWORD={etcd_password}\n"
     )
 
     # FileOperation depends on success of previos operation i.e GitOperation.clone