backport of commit 87038bb672 (#15364)

Co-authored-by: Derek Menteer <derek.menteer@hashicorp.com>
pull/15362/head
hc-github-team-consul-core 2 years ago committed by GitHub
parent 6ca306f1a3
commit 329d111dcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,6 +0,0 @@
ports {
grpc_tls = 8503
}
connect {
enabled = true
}

@ -104,13 +104,6 @@ function init_workdir {
mv workdir/${CLUSTER}/consul/server.hcl workdir/${CLUSTER}/consul-server/server.hcl
fi
if test -f "workdir/${CLUSTER}/consul/peering_server.hcl" -a $REQUIRE_PEERS = "1"
then
mv workdir/${CLUSTER}/consul/peering_server.hcl workdir/${CLUSTER}/consul-server/peering_server.hcl
else
rm workdir/${CLUSTER}/consul/peering_server.hcl
fi
# copy the ca-certs for SDS so we can verify the right ones are served
mkdir -p workdir/test-sds-server/certs
cp test-sds-server/certs/ca-root.crt workdir/test-sds-server/certs/ca-root.crt

Loading…
Cancel
Save