Skip to content
Snippets Groups Projects
Commit 01379084 authored by istmxrein's avatar istmxrein
Browse files

no floating ip by default

parent b0df83e4
No related branches found
No related tags found
No related merge requests found
...@@ -11,7 +11,7 @@ USERNAME = os.getenv("CUSTOM_ENV_USERNAME") or os.getenv("USERNAME") ...@@ -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}" 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" 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" 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") BUILD_FAILURE_EXIT_CODE = os.getenv("BUILD_FAILURE_EXIT_CODE")
SYSTEM_FAILURE_EXIT_CODE = os.getenv("SYSTEM_FAILURE_EXIT_CODE") SYSTEM_FAILURE_EXIT_CODE = os.getenv("SYSTEM_FAILURE_EXIT_CODE")
SERVER_CREATION_TIMEOUT = os.getenv("SERVER_CREATION_TIMEOUT") or "300" SERVER_CREATION_TIMEOUT = os.getenv("SERVER_CREATION_TIMEOUT") or "300"
...@@ -19,6 +19,7 @@ def provision_server( ...@@ -19,6 +19,7 @@ def provision_server(
conn: openstack.connection.Connection, conn: openstack.connection.Connection,
public_key: str public_key: str
) -> openstack.compute.v2.server.Server: ) -> 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) conn.create_keypair(env.KEY_PAIR_NAME, public_key=public_key)
image = conn.compute.find_image(env.BUILDER_IMAGE) image = conn.compute.find_image(env.BUILDER_IMAGE)
flavor = conn.compute.find_flavor(env.FLAVOR) flavor = conn.compute.find_flavor(env.FLAVOR)
...@@ -27,6 +28,7 @@ def provision_server( ...@@ -27,6 +28,7 @@ def provision_server(
name=env.VM_NAME, name=env.VM_NAME,
flavor=flavor.id, flavor=flavor.id,
image=image.id, image=image.id,
auto_ip=floating_ip,
boot_from_volume=True, boot_from_volume=True,
terminate_volume=True, terminate_volume=True,
volume_size=env.VOLUME_SIZE, volume_size=env.VOLUME_SIZE,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment