From 013790847b808e9a2d16a2a2990877c12f864cd4 Mon Sep 17 00:00:00 2001
From: istmxrein <maximilian.reinheimer@stud.h-da.de>
Date: Mon, 8 May 2023 16:05:45 +0200
Subject: [PATCH] no floating ip by default
---
env.py | 2 +-
prepare.py | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/env.py b/env.py
index 37a5756..741dffe 100644
--- a/env.py
+++ b/env.py
@@ -11,7 +11,7 @@ USERNAME = os.getenv("CUSTOM_ENV_USERNAME") or os.getenv("USERNAME")
PRIVATE_KEY_PATH = f"{os.getenv('HOME')}/priv_key-{VM_NAME}"
SSH_TIMEOUT = os.getenv("CUSTOM_ENV_SSH_TIMEOUT") or os.getenv("SSH_TIMEOUT") or "20"
FLOATING_IP_NETWORK = os.getenv("FLOATING_IP_NETWORK") or "public"
-SSH_IP_VERSION = os.getenv("SSH_IP_VERSION") or "4"
+SSH_IP_VERSION = os.getenv("SSH_IP_VERSION") or "6"
BUILD_FAILURE_EXIT_CODE = os.getenv("BUILD_FAILURE_EXIT_CODE")
SYSTEM_FAILURE_EXIT_CODE = os.getenv("SYSTEM_FAILURE_EXIT_CODE")
SERVER_CREATION_TIMEOUT = os.getenv("SERVER_CREATION_TIMEOUT") or "300"
diff --git a/prepare.py b/prepare.py
index 2d04f95..f0da063 100644
--- a/prepare.py
+++ b/prepare.py
@@ -19,6 +19,7 @@ def provision_server(
conn: openstack.connection.Connection,
public_key: str
) -> openstack.compute.v2.server.Server:
+ floating_ip = True if env.SSH_IP_VERSION == "4" else False
conn.create_keypair(env.KEY_PAIR_NAME, public_key=public_key)
image = conn.compute.find_image(env.BUILDER_IMAGE)
flavor = conn.compute.find_flavor(env.FLAVOR)
@@ -27,6 +28,7 @@ def provision_server(
name=env.VM_NAME,
flavor=flavor.id,
image=image.id,
+ auto_ip=floating_ip,
boot_from_volume=True,
terminate_volume=True,
volume_size=env.VOLUME_SIZE,
--
GitLab