From a47a2843d2b505d2b91c155151350aff2801e7e7 Mon Sep 17 00:00:00 2001 From: Tim Gross Date: Fri, 4 Sep 2020 08:51:15 -0400 Subject: [PATCH] e2e: consolidate cloud-specific Consul configs (#8823) The `-recursor` flag in the Consul service unit files is specific to a given cloud, but we already have cloud-specific configuration files. Consolidate all the cloud-specific items into the config. --- .../linux/{consul_aws.service => consul.service} | 2 +- e2e/terraform/packer/linux/consul_azure.service | 16 ---------------- e2e/terraform/packer/linux/setup.sh | 2 +- e2e/terraform/shared/config/provision-client.sh | 2 +- e2e/terraform/shared/config/provision-server.sh | 2 +- .../shared/config/provision-windows-client.ps1 | 4 ++-- .../shared/consul/{retry_aws.json => aws.json} | 1 + .../consul/{retry_azure.json => azure.json} | 1 + 8 files changed, 8 insertions(+), 22 deletions(-) rename e2e/terraform/packer/linux/{consul_aws.service => consul.service} (93%) delete mode 100644 e2e/terraform/packer/linux/consul_azure.service rename e2e/terraform/shared/consul/{retry_aws.json => aws.json} (72%) rename e2e/terraform/shared/consul/{retry_azure.json => azure.json} (70%) diff --git a/e2e/terraform/packer/linux/consul_aws.service b/e2e/terraform/packer/linux/consul.service similarity index 93% rename from e2e/terraform/packer/linux/consul_aws.service rename to e2e/terraform/packer/linux/consul.service index 4ce8ac8a3..5e82288c2 100644 --- a/e2e/terraform/packer/linux/consul_aws.service +++ b/e2e/terraform/packer/linux/consul.service @@ -6,7 +6,7 @@ After=network-online.target [Service] Restart=on-failure Environment=CONSUL_ALLOW_PRIVILEGED_PORTS=true -ExecStart=/usr/local/bin/consul agent -config-dir="/etc/consul.d" -recursor="172.31.0.2" +ExecStart=/usr/local/bin/consul agent -config-dir="/etc/consul.d" ExecReload=/bin/kill -HUP $MAINPID KillSignal=SIGTERM User=root diff --git a/e2e/terraform/packer/linux/consul_azure.service b/e2e/terraform/packer/linux/consul_azure.service deleted file mode 100644 index 252fba77d..000000000 --- a/e2e/terraform/packer/linux/consul_azure.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Consul Agent -Requires=network-online.target -After=network-online.target - -[Service] -Restart=on-failure -Environment=CONSUL_ALLOW_PRIVILEGED_PORTS=true -ExecStart=/usr/local/bin/consul agent -config-dir="/etc/consul.d" -recursor="168.63.129.16" -ExecReload=/bin/kill -HUP $MAINPID -KillSignal=SIGTERM -User=root -Group=root - -[Install] -WantedBy=multi-user.target diff --git a/e2e/terraform/packer/linux/setup.sh b/e2e/terraform/packer/linux/setup.sh index b2f61d1e7..6c040f0ae 100755 --- a/e2e/terraform/packer/linux/setup.sh +++ b/e2e/terraform/packer/linux/setup.sh @@ -51,7 +51,7 @@ sudo chown root:root /usr/local/bin/consul echo "Configure Consul" mkdir_for_root /etc/consul.d mkdir_for_root /opt/consul -sudo mv /tmp/linux/consul_aws.service /etc/systemd/system/consul.service +sudo mv /tmp/linux/consul.service /etc/systemd/system/consul.service echo "Install Vault" curl -fsL -o /tmp/vault.zip \ diff --git a/e2e/terraform/shared/config/provision-client.sh b/e2e/terraform/shared/config/provision-client.sh index 9fee9f970..0cc38a21f 100755 --- a/e2e/terraform/shared/config/provision-client.sh +++ b/e2e/terraform/shared/config/provision-client.sh @@ -11,7 +11,7 @@ CONSUL_SRC=/ops/shared/consul CONSUL_DEST=/etc/consul.d sudo cp "$CONSUL_SRC/base.json" "$CONSUL_DEST/" -sudo cp "$CONSUL_SRC/retry_$CLOUD.json" "$CONSUL_DEST/" +sudo cp "$CONSUL_SRC/$CLOUD.json" "$CONSUL_DEST/" sudo systemctl enable consul.service sudo systemctl daemon-reload diff --git a/e2e/terraform/shared/config/provision-server.sh b/e2e/terraform/shared/config/provision-server.sh index 8ab9af4e9..e7e3b7d96 100755 --- a/e2e/terraform/shared/config/provision-server.sh +++ b/e2e/terraform/shared/config/provision-server.sh @@ -14,7 +14,7 @@ CONSUL_DEST=/etc/consul.d sed "s/SERVER_COUNT/$SERVER_COUNT/g" "$CONSUL_SRC/server.json" > /tmp/server.json sudo mv /tmp/server.json "$CONSUL_DEST/server.json" sudo cp "$CONSUL_SRC/base.json" "$CONSUL_DEST/" -sudo cp "$CONSUL_SRC/retry_$CLOUD.json" "$CONSUL_DEST/" +sudo cp "$CONSUL_SRC/$CLOUD.json" "$CONSUL_DEST/" sudo systemctl enable consul.service sudo systemctl daemon-reload diff --git a/e2e/terraform/shared/config/provision-windows-client.ps1 b/e2e/terraform/shared/config/provision-windows-client.ps1 index 2b7657b1d..3a45c1c9b 100755 --- a/e2e/terraform/shared/config/provision-windows-client.ps1 +++ b/e2e/terraform/shared/config/provision-windows-client.ps1 @@ -11,8 +11,8 @@ Copy-Item -Force ` -Path "C:\ops\shared\consul\base.json" ` -Destination "C:\opt\consul.d\base.json" Copy-Item -Force ` - -Path "C:\ops\shared\consul\retry_$Cloud.json" ` - -Destination "C:\opt\consul.d\retry_$Cloud.json" + -Path "C:\ops\shared\consul\$Cloud.json" ` + -Destination "C:\opt\consul.d\$Cloud.json" New-Service ` -Name "Consul" ` -BinaryPathName "C:\opt\consul.exe agent -config-dir C:\opt\consul.d -log-file C:\opt\consul\consul.log" ` diff --git a/e2e/terraform/shared/consul/retry_aws.json b/e2e/terraform/shared/consul/aws.json similarity index 72% rename from e2e/terraform/shared/consul/retry_aws.json rename to e2e/terraform/shared/consul/aws.json index a080caf7a..2dda95435 100644 --- a/e2e/terraform/shared/consul/retry_aws.json +++ b/e2e/terraform/shared/consul/aws.json @@ -1,3 +1,4 @@ { + "recursors": ["172.31.0.2"], "retry_join": ["provider=aws tag_key=ConsulAutoJoin tag_value=auto-join"] } diff --git a/e2e/terraform/shared/consul/retry_azure.json b/e2e/terraform/shared/consul/azure.json similarity index 70% rename from e2e/terraform/shared/consul/retry_azure.json rename to e2e/terraform/shared/consul/azure.json index 9b1a3ea04..945c46be4 100644 --- a/e2e/terraform/shared/consul/retry_azure.json +++ b/e2e/terraform/shared/consul/azure.json @@ -1,3 +1,4 @@ { + "recursors": ["168.63.129.16"], "retry_join": ["provider=azure tag_key=ConsulAutoJoin tag_value=auto-join"] }