diff --git a/config.tf b/config.tf index 5b881a35529..5689ac39b36 100644 --- a/config.tf +++ b/config.tf @@ -59,18 +59,17 @@ variable "tectonic_container_images" { default = { addon_resizer = "gcr.io/google_containers/addon-resizer:2.1" bootkube = "quay.io/coreos/bootkube:v0.10.0" - tnc_operator = "quay.io/coreos/tectonic-node-controller-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1" + tnc_operator = "quay.io/coreos/tectonic-node-controller-operator-dev:0a24db2288f00b10ced358d9643debd601ffd0f1" etcd_cert_signer = "quay.io/coreos/kube-etcd-signer-server:678cc8e6841e2121ebfdb6e2db568fce290b67d6" etcd = "quay.io/coreos/etcd:v3.2.14" - hyperkube = "openshift/origin-node:latest" - kube_core_renderer = "quay.io/coreos/kube-core-renderer-dev:436b1b4395ae54d866edc88864c9b01797cebac1" - kube_core_operator = "quay.io/coreos/kube-core-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1" - tectonic_channel_operator = "quay.io/coreos/tectonic-channel-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1" - kube_addon_operator = "quay.io/coreos/kube-addon-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1" + kube_core_renderer = "quay.io/coreos/kube-core-renderer-dev:0a24db2288f00b10ced358d9643debd601ffd0f1" + kube_core_operator = "quay.io/coreos/kube-core-operator-dev:0a24db2288f00b10ced358d9643debd601ffd0f1" + tectonic_channel_operator = "quay.io/coreos/tectonic-channel-operator-dev:0a24db2288f00b10ced358d9643debd601ffd0f1" + kube_addon_operator = "quay.io/coreos/kube-addon-operator-dev:0a24db2288f00b10ced358d9643debd601ffd0f1" tectonic_alm_operator = "quay.io/coreos/tectonic-alm-operator:v0.3.1" - tectonic_ingress_controller_operator = "quay.io/coreos/tectonic-ingress-controller-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1" - tectonic_utility_operator = "quay.io/coreos/tectonic-utility-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1" - tectonic_network_operator = "quay.io/coreos/tectonic-network-operator-dev:436b1b4395ae54d866edc88864c9b01797cebac1" + tectonic_ingress_controller_operator = "quay.io/coreos/tectonic-ingress-controller-operator-dev:0a24db2288f00b10ced358d9643debd601ffd0f1" + tectonic_utility_operator = "quay.io/coreos/tectonic-utility-operator-dev:0a24db2288f00b10ced358d9643debd601ffd0f1" + tectonic_network_operator = "quay.io/coreos/tectonic-network-operator-dev:0a24db2288f00b10ced358d9643debd601ffd0f1" } } @@ -192,26 +191,6 @@ You can download the pull secret from your Account overview page at [3]. EOF } -variable "tectonic_container_linux_channel" { - type = "string" - - description = <"} - value = "${replace(local.json, "/.*\"version\":\"(.*)\".*/", "$1")}" -} diff --git a/modules/container_linux/variables.tf b/modules/container_linux/variables.tf deleted file mode 100644 index 49172b45eb8..00000000000 --- a/modules/container_linux/variables.tf +++ /dev/null @@ -1,21 +0,0 @@ -variable "release_channel" { - type = "string" - default = "stable" - - description = < /dev/null; \ - then \ - echo CGROUP_DRIVER_FLAG=--cgroup-driver=systemd > /etc/kubernetes/kubelet-workaround; \ - mount -o remount,rw /sys/fs/cgroup; \ - ln --symbolic /sys/fs/cgroup/cpu,cpuacct /sys/fs/cgroup/cpuacct,cpu; \ - fi \ - " diff --git a/modules/ignition/resources/services/kubelet.service b/modules/ignition/resources/services/kubelet.service index ef8c3405d18..ba86d4514e1 100644 --- a/modules/ignition/resources/services/kubelet.service +++ b/modules/ignition/resources/services/kubelet.service @@ -1,58 +1,34 @@ [Unit] Description=Kubernetes Kubelet Wants=rpc-statd.service -Requires=docker.service kubelet-workaround.service -After=docker.service kubelet-workaround.service [Service] -EnvironmentFile=-/etc/kubernetes/kubelet-workaround ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests -ExecStartPre=/bin/mkdir --parents /etc/kubernetes/checkpoint-secrets -ExecStartPre=/bin/mkdir --parents /etc/kubernetes/cni/net.d -ExecStartPre=/bin/mkdir --parents /run/kubelet -ExecStartPre=/bin/mkdir --parents /var/lib/cni -ExecStartPre=/bin/mkdir --parents /var/lib/kubelet/pki - ExecStartPre=/usr/bin/bash -c "gawk '/certificate-authority-data/ {print $2}' /etc/kubernetes/kubeconfig | base64 --decode > /etc/kubernetes/ca.crt" -ExecStart=/usr/bin/docker \ - run \ - --rm \ - --net host \ - --pid host \ - --privileged \ - --volume /dev:/dev:rw \ - --volume /sys:/sys:ro \ - --volume /var/run:/var/run:rw \ - --volume /var/lib/cni/:/var/lib/cni:rw \ - --volume /var/lib/docker/:/var/lib/docker:rw \ - --volume /var/lib/kubelet/:/var/lib/kubelet:shared \ - --volume /var/log:/var/log:shared \ - --volume /etc/kubernetes:/etc/kubernetes:ro \ - --entrypoint /usr/bin/hyperkube \ - "${kubelet_image_url}:${kubelet_image_tag}" \ - kubelet \ - --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ - --kubeconfig=/var/lib/kubelet/kubeconfig \ - --rotate-certificates \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ - --cni-bin-dir=/var/lib/cni/bin \ - --network-plugin=cni \ - --lock-file=/var/run/lock/kubelet.lock \ - --exit-on-lock-contention \ - --pod-manifest-path=/etc/kubernetes/manifests \ - --allow-privileged \ - --node-labels=${node_label} \ - --minimum-container-ttl-duration=6m0s \ - --cluster-dns=${cluster_dns_ip} \ - --cluster-domain=cluster.local \ - --client-ca-file=/etc/kubernetes/ca.crt \ - --cloud-provider=${cloud_provider} \ - --anonymous-auth=false \ - ${cloud_provider_config} \ - ${debug_config} \ - ${node_taints_param} \ - $$CGROUP_DRIVER_FLAG \ +ExecStart=/usr/bin/hyperkube \ + kubelet \ + --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ + --kubeconfig=/var/lib/kubelet/kubeconfig \ + --rotate-certificates \ + --cni-conf-dir=/etc/kubernetes/cni/net.d \ + --cni-bin-dir=/var/lib/cni/bin \ + --network-plugin=cni \ + --lock-file=/var/run/lock/kubelet.lock \ + --exit-on-lock-contention \ + --pod-manifest-path=/etc/kubernetes/manifests \ + --allow-privileged \ + --node-labels=${node_label} \ + --minimum-container-ttl-duration=6m0s \ + --cluster-dns=${cluster_dns_ip} \ + --cluster-domain=cluster.local \ + --client-ca-file=/etc/kubernetes/ca.crt \ + --cloud-provider=${cloud_provider} \ + --anonymous-auth=false \ + --cgroup-driver=systemd \ + ${cloud_provider_config} \ + ${debug_config} \ + ${node_taints_param} \ Restart=always RestartSec=10 diff --git a/modules/tectonic/assets.tf b/modules/tectonic/assets.tf index 58826121223..8571bd4d6cb 100644 --- a/modules/tectonic/assets.tf +++ b/modules/tectonic/assets.tf @@ -9,52 +9,18 @@ resource "random_string" "ingress_status_password" { upper = false } -# tectonic.sh (/opt/tectonic/tectonic.sh) -data "template_file" "tectonic_sh" { - // TODO: This doesn't need to be a template anymore - template = "${file("${path.module}/resources/tectonic.sh")}" - - vars { - ingress_kind = "${var.ingress_kind}" - } -} - data "ignition_file" "tectonic_sh" { filesystem = "root" mode = "0755" path = "/opt/tectonic/tectonic.sh" content { - content = "${data.template_file.tectonic_sh.rendered}" + content = "${file("${path.module}/resources/tectonic.sh")}" } } -# (/opt/tectonic/tectonic-wrapper.sh) -data "template_file" "tectonic_wrapper_sh" { - template = "${file("${path.module}/resources/tectonic-wrapper.sh")}" - - vars { - hyperkube_image = "${var.container_images["hyperkube"]}" - } -} - -data "ignition_file" "tectonic_wrapper_sh" { - filesystem = "root" - mode = "0755" - path = "/opt/tectonic/tectonic-wrapper.sh" - - content { - content = "${data.template_file.tectonic_wrapper_sh.rendered}" - } -} - -# tectonic.service (available as output variable) -data "template_file" "tectonic_service" { - template = "${file("${path.module}/resources/tectonic.service")}" -} - data "ignition_systemd_unit" "tectonic_service" { name = "tectonic.service" enabled = true - content = "${data.template_file.tectonic_service.rendered}" + content = "${file("${path.module}/resources/tectonic.service")}" } diff --git a/modules/tectonic/output.tf b/modules/tectonic/output.tf index 8c2963dbe21..2c0438f89cb 100644 --- a/modules/tectonic/output.tf +++ b/modules/tectonic/output.tf @@ -1,19 +1,12 @@ -output "systemd_service_rendered" { - value = "${data.template_file.tectonic_service.rendered}" -} - output "systemd_service_id" { value = "${data.ignition_systemd_unit.tectonic_service.id}" } output "ignition_file_id_list" { - value = ["${flatten(list( - list( - data.ignition_file.tectonic_sh.id, - data.ignition_file.tectonic_wrapper_sh.id, - ), + value = ["${concat( + list(data.ignition_file.tectonic_sh.id), data.ignition_file.tectonic_manifest_list.*.id, - ))}"] + )}"] } output "cluster_id" { diff --git a/modules/tectonic/resources/tectonic-wrapper.sh b/modules/tectonic/resources/tectonic-wrapper.sh deleted file mode 100644 index 270cde45392..00000000000 --- a/modules/tectonic/resources/tectonic-wrapper.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -set -e - -# shellcheck disable=SC2086,SC2154 -/usr/bin/docker run \ - --volume "$PWD:/assets" \ - --network=host \ - --entrypoint=/bin/sh \ - ${hyperkube_image} \ - /assets/tectonic.sh /assets/auth/kubeconfig /assets diff --git a/modules/tectonic/resources/tectonic.service b/modules/tectonic/resources/tectonic.service index 5b100a4c631..041393f4cc7 100644 --- a/modules/tectonic/resources/tectonic.service +++ b/modules/tectonic/resources/tectonic.service @@ -1,19 +1,14 @@ [Unit] Description=Bootstrap a Tectonic cluster -ConditionPathExists=!/opt/tectonic/init_tectonic.done Requires=bootkube.service After=bootkube.service [Service] Type=oneshot RemainAfterExit=true -WorkingDirectory=/opt/tectonic +WorkingDirectory=/opt/tectonic/tectonic -User=root -Group=root - -ExecStart=/usr/bin/bash /opt/tectonic/tectonic-wrapper.sh -ExecStartPost=/bin/touch /opt/tectonic/init_tectonic.done +ExecStart=/opt/tectonic/tectonic.sh /opt/tectonic/auth/kubeconfig [Install] WantedBy=multi-user.target diff --git a/modules/tectonic/resources/tectonic.sh b/modules/tectonic/resources/tectonic.sh index 354fb0afdb3..0448938f864 100755 --- a/modules/tectonic/resources/tectonic.sh +++ b/modules/tectonic/resources/tectonic.sh @@ -2,7 +2,6 @@ set -e KUBECONFIG="$1" -ASSETS_PATH="$2" # Setup API Authentication KUBECTL="oc --config=$KUBECONFIG" @@ -96,23 +95,6 @@ wait_for_pods() { set -e } -asset_cleanup() { - echo "Cleaning up installation assets" - - # shellcheck disable=SC2034 - for d in "manifests" "auth" "tectonic" "tls"; do - rm -rf "$${ASSETS_PATH:?}/$${d:?}/"* - done - - # shellcheck disable=SC2034 - for f in "bootkube.sh" "tectonic.sh" "tectonic-wrapper.sh"; do - rm -f "$${ASSETS_PATH:?}/$${f:?}" - done -} - -# chdir into the assets path directory -cd "$ASSETS_PATH/tectonic" - # Wait for Kubernetes to be in a proper state set +e i=0 @@ -172,7 +154,6 @@ kubectl create -f updater/app_versions/app-version-tectonic-ingress.yaml # wait for Tectonic pods wait_for_pods tectonic-system -asset_cleanup echo "Tectonic installation is done" exit 0 diff --git a/steps/assets/aws/main.tf b/steps/assets/aws/main.tf index ed0da5f5ebb..30d54d2bb9f 100644 --- a/steps/assets/aws/main.tf +++ b/steps/assets/aws/main.tf @@ -4,22 +4,20 @@ module assets_base { cloud_provider = "aws" ingress_kind = "haproxy-router" - tectonic_admin_email = "${var.tectonic_admin_email}" - tectonic_admin_password = "${var.tectonic_admin_password}" - tectonic_admin_ssh_key = "${var.tectonic_admin_ssh_key}" - tectonic_base_domain = "${var.tectonic_base_domain}" - tectonic_cluster_cidr = "${var.tectonic_cluster_cidr}" - tectonic_cluster_id = "${var.tectonic_cluster_id}" - tectonic_cluster_name = "${var.tectonic_cluster_name}" - tectonic_container_images = "${var.tectonic_container_images}" - tectonic_container_linux_channel = "${var.tectonic_container_linux_channel}" - tectonic_container_linux_version = "${var.tectonic_container_linux_version}" - tectonic_image_re = "${var.tectonic_image_re}" - tectonic_kubelet_debug_config = "${var.tectonic_kubelet_debug_config}" - tectonic_networking = "${var.tectonic_networking}" - tectonic_platform = "${var.tectonic_platform}" - tectonic_pull_secret = "${var.tectonic_pull_secret}" - tectonic_service_cidr = "${var.tectonic_service_cidr}" - tectonic_update_channel = "${var.tectonic_update_channel}" - tectonic_versions = "${var.tectonic_versions}" + tectonic_admin_email = "${var.tectonic_admin_email}" + tectonic_admin_password = "${var.tectonic_admin_password}" + tectonic_admin_ssh_key = "${var.tectonic_admin_ssh_key}" + tectonic_base_domain = "${var.tectonic_base_domain}" + tectonic_cluster_cidr = "${var.tectonic_cluster_cidr}" + tectonic_cluster_id = "${var.tectonic_cluster_id}" + tectonic_cluster_name = "${var.tectonic_cluster_name}" + tectonic_container_images = "${var.tectonic_container_images}" + tectonic_image_re = "${var.tectonic_image_re}" + tectonic_kubelet_debug_config = "${var.tectonic_kubelet_debug_config}" + tectonic_networking = "${var.tectonic_networking}" + tectonic_platform = "${var.tectonic_platform}" + tectonic_pull_secret = "${var.tectonic_pull_secret}" + tectonic_service_cidr = "${var.tectonic_service_cidr}" + tectonic_update_channel = "${var.tectonic_update_channel}" + tectonic_versions = "${var.tectonic_versions}" } diff --git a/steps/assets/libvirt/main.tf b/steps/assets/libvirt/main.tf index 5017e6b896f..1382a6ecbff 100644 --- a/steps/assets/libvirt/main.tf +++ b/steps/assets/libvirt/main.tf @@ -4,22 +4,20 @@ module assets_base { cloud_provider = "" ingress_kind = "haproxy-router" - tectonic_admin_email = "${var.tectonic_admin_email}" - tectonic_admin_password = "${var.tectonic_admin_password}" - tectonic_admin_ssh_key = "${var.tectonic_admin_ssh_key}" - tectonic_base_domain = "${var.tectonic_base_domain}" - tectonic_cluster_cidr = "${var.tectonic_cluster_cidr}" - tectonic_cluster_id = "${var.tectonic_cluster_id}" - tectonic_cluster_name = "${var.tectonic_cluster_name}" - tectonic_container_images = "${var.tectonic_container_images}" - tectonic_container_linux_channel = "${var.tectonic_container_linux_channel}" - tectonic_container_linux_version = "${var.tectonic_container_linux_version}" - tectonic_image_re = "${var.tectonic_image_re}" - tectonic_kubelet_debug_config = "${var.tectonic_kubelet_debug_config}" - tectonic_networking = "${var.tectonic_networking}" - tectonic_platform = "${var.tectonic_platform}" - tectonic_pull_secret = "${var.tectonic_pull_secret}" - tectonic_service_cidr = "${var.tectonic_service_cidr}" - tectonic_update_channel = "${var.tectonic_update_channel}" - tectonic_versions = "${var.tectonic_versions}" + tectonic_admin_email = "${var.tectonic_admin_email}" + tectonic_admin_password = "${var.tectonic_admin_password}" + tectonic_admin_ssh_key = "${var.tectonic_admin_ssh_key}" + tectonic_base_domain = "${var.tectonic_base_domain}" + tectonic_cluster_cidr = "${var.tectonic_cluster_cidr}" + tectonic_cluster_id = "${var.tectonic_cluster_id}" + tectonic_cluster_name = "${var.tectonic_cluster_name}" + tectonic_container_images = "${var.tectonic_container_images}" + tectonic_image_re = "${var.tectonic_image_re}" + tectonic_kubelet_debug_config = "${var.tectonic_kubelet_debug_config}" + tectonic_networking = "${var.tectonic_networking}" + tectonic_platform = "${var.tectonic_platform}" + tectonic_pull_secret = "${var.tectonic_pull_secret}" + tectonic_service_cidr = "${var.tectonic_service_cidr}" + tectonic_update_channel = "${var.tectonic_update_channel}" + tectonic_versions = "${var.tectonic_versions}" } diff --git a/steps/bootstrap/aws/main.tf b/steps/bootstrap/aws/main.tf index 39de927ccfb..33d1fb67a23 100644 --- a/steps/bootstrap/aws/main.tf +++ b/steps/bootstrap/aws/main.tf @@ -39,13 +39,6 @@ data "ignition_config" "bootstrap_redirect" { } } -module "ami" { - source = "../../../modules/aws/ami" - - release_channel = "${var.tectonic_container_linux_channel}" - release_version = "${var.tectonic_container_linux_version}" -} - resource "aws_iam_instance_profile" "bootstrap" { name = "${var.tectonic_cluster_name}-bootstrap-profile" @@ -116,7 +109,7 @@ EOF } resource "aws_instance" "bootstrap" { - ami = "${coalesce(var.tectonic_aws_ec2_ami_override, module.ami.id)}" + ami = "${var.tectonic_aws_ec2_ami_override}" iam_instance_profile = "${aws_iam_instance_profile.bootstrap.name}" instance_type = "${var.tectonic_aws_master_ec2_type}" diff --git a/steps/infra/aws/main.tf b/steps/infra/aws/main.tf index 5897aee830f..67f5d11d620 100644 --- a/steps/infra/aws/main.tf +++ b/steps/infra/aws/main.tf @@ -15,61 +15,50 @@ provider "aws" { } } -module "container_linux" { - source = "../../../modules/container_linux" - - release_channel = "${var.tectonic_container_linux_channel}" - release_version = "${var.tectonic_container_linux_version}" -} - module "masters" { source = "../../../modules/aws/master" - elb_tnc_id = "${module.vpc.aws_elb_tnc_id}" - elb_api_internal_id = "${module.vpc.aws_elb_api_internal_id}" - elb_api_external_id = "${module.vpc.aws_elb_api_external_id}" - elb_console_id = "${module.vpc.aws_elb_console_id}" - base_domain = "${var.tectonic_base_domain}" - cluster_id = "${var.tectonic_cluster_id}" - cluster_name = "${var.tectonic_cluster_name}" - container_images = "${var.tectonic_container_images}" - container_linux_channel = "${var.tectonic_container_linux_channel}" - container_linux_version = "${module.container_linux.version}" - ec2_type = "${var.tectonic_aws_master_ec2_type}" - extra_tags = "${var.tectonic_aws_extra_tags}" - instance_count = "${var.tectonic_master_count}" - master_iam_role = "${var.tectonic_aws_master_iam_role_name}" - master_sg_ids = "${concat(var.tectonic_aws_master_extra_sg_ids, list(module.vpc.master_sg_id))}" - private_endpoints = "${local.private_endpoints}" - public_endpoints = "${local.public_endpoints}" - root_volume_iops = "${var.tectonic_aws_master_root_volume_iops}" - root_volume_size = "${var.tectonic_aws_master_root_volume_size}" - root_volume_type = "${var.tectonic_aws_master_root_volume_type}" - subnet_ids = "${module.vpc.master_subnet_ids}" - ec2_ami = "${var.tectonic_aws_ec2_ami_override}" - user_data_igns = "${var.tectonic_ignition_masters}" + elb_tnc_id = "${module.vpc.aws_elb_tnc_id}" + elb_api_internal_id = "${module.vpc.aws_elb_api_internal_id}" + elb_api_external_id = "${module.vpc.aws_elb_api_external_id}" + elb_console_id = "${module.vpc.aws_elb_console_id}" + base_domain = "${var.tectonic_base_domain}" + cluster_id = "${var.tectonic_cluster_id}" + cluster_name = "${var.tectonic_cluster_name}" + container_images = "${var.tectonic_container_images}" + ec2_type = "${var.tectonic_aws_master_ec2_type}" + extra_tags = "${var.tectonic_aws_extra_tags}" + instance_count = "${var.tectonic_master_count}" + master_iam_role = "${var.tectonic_aws_master_iam_role_name}" + master_sg_ids = "${concat(var.tectonic_aws_master_extra_sg_ids, list(module.vpc.master_sg_id))}" + private_endpoints = "${local.private_endpoints}" + public_endpoints = "${local.public_endpoints}" + root_volume_iops = "${var.tectonic_aws_master_root_volume_iops}" + root_volume_size = "${var.tectonic_aws_master_root_volume_size}" + root_volume_type = "${var.tectonic_aws_master_root_volume_type}" + subnet_ids = "${module.vpc.master_subnet_ids}" + ec2_ami = "${var.tectonic_aws_ec2_ami_override}" + user_data_igns = "${var.tectonic_ignition_masters}" } module "workers" { source = "../../../modules/aws/worker" - cluster_id = "${var.tectonic_cluster_id}" - cluster_name = "${var.tectonic_cluster_name}" - container_linux_channel = "${var.tectonic_container_linux_channel}" - container_linux_version = "${module.container_linux.version}" - ec2_type = "${var.tectonic_aws_worker_ec2_type}" - extra_tags = "${var.tectonic_aws_extra_tags}" - instance_count = "${var.tectonic_worker_count}" - load_balancers = "${var.tectonic_aws_worker_load_balancers}" - root_volume_iops = "${var.tectonic_aws_worker_root_volume_iops}" - root_volume_size = "${var.tectonic_aws_worker_root_volume_size}" - root_volume_type = "${var.tectonic_aws_worker_root_volume_type}" - sg_ids = "${concat(var.tectonic_aws_worker_extra_sg_ids, list(module.vpc.worker_sg_id))}" - subnet_ids = "${module.vpc.worker_subnet_ids}" - worker_iam_role = "${var.tectonic_aws_worker_iam_role_name}" - ec2_ami = "${var.tectonic_aws_ec2_ami_override}" - base_domain = "${var.tectonic_base_domain}" - user_data_ign = "${file("${path.cwd}/${var.tectonic_ignition_worker}")}" + cluster_id = "${var.tectonic_cluster_id}" + cluster_name = "${var.tectonic_cluster_name}" + ec2_type = "${var.tectonic_aws_worker_ec2_type}" + extra_tags = "${var.tectonic_aws_extra_tags}" + instance_count = "${var.tectonic_worker_count}" + load_balancers = "${var.tectonic_aws_worker_load_balancers}" + root_volume_iops = "${var.tectonic_aws_worker_root_volume_iops}" + root_volume_size = "${var.tectonic_aws_worker_root_volume_size}" + root_volume_type = "${var.tectonic_aws_worker_root_volume_type}" + sg_ids = "${concat(var.tectonic_aws_worker_extra_sg_ids, list(module.vpc.worker_sg_id))}" + subnet_ids = "${module.vpc.worker_subnet_ids}" + worker_iam_role = "${var.tectonic_aws_worker_iam_role_name}" + ec2_ami = "${var.tectonic_aws_ec2_ami_override}" + base_domain = "${var.tectonic_base_domain}" + user_data_ign = "${file("${path.cwd}/${var.tectonic_ignition_worker}")}" } module "dns" { diff --git a/tests/run.sh b/tests/run.sh index fa03d7be153..700a616a432 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -46,7 +46,7 @@ if test -z "${AWS_REGION+x}" then echo -e "\\e[36m Calculating the AWS region...\\e[0m" AWS_REGION="$(aws configure get region)" || - AWS_REGION="${AWS_REGION:-eu-west-1}" + AWS_REGION="${AWS_REGION:-us-east-1}" fi export AWS_DEFAULT_REGION="${AWS_REGION}" unset AWS_SESSION_TOKEN