commit f2e01f38074daffb7c6fd1e557531652b5c2dedf
author Antonio Barone <syntonyze@gmail.com> Fri Aug 21 18:17:19 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 21 18:17:19 2020 +0000
tree b517f11f68f19d09c166f3330e24b893b697cba0
parent 2dd236c9e5b22c0bfdfd50c4ba9b295f4405358a
parent 5c7aa410a0702e95d7dc14a6e5ec44c425199dcd

Merge "Reduce number of parameters used by dual-master recipe"

Secrets.md

diff --git a/Secrets.md b/Secrets.md
index 5c3a3ef..1767bd5 100644
--- a/Secrets.md
+++ b/Secrets.md
@@ -87,7 +87,7 @@
 from masters to replicas, for example:
 
 ```bash
-ssh-keygen -b 2048 -t rsa -f /tmp/secrets/replication_user_id_rsa -q -N ""
+ssh-keygen -b 2048 -m PEM -t rsa -f /tmp/secrets/replication_user_id_rsa -q -N ""
 ```
 
 * replication_user_id_rsa

dual-master/setup.env.template

diff --git a/dual-master/setup.env.template b/dual-master/setup.env.template
index 18e9e50..716edae 100644
--- a/dual-master/setup.env.template
+++ b/dual-master/setup.env.template
@@ -16,6 +16,7 @@
 SSH_HOST_PORT_MASTER1:=29418
 DNS_ROUTING_STACK_NAME:=$(AWS_PREFIX)-dns-routing
 DASHBOARD_STACK_NAME:=$(AWS_PREFIX)-dashboard
+LOAD_BALANCER_STACK_NAME:=$(AWS_PREFIX)-load-balancer
 HOSTED_ZONE_NAME:=yourcompany.com
 MASTER1_SUBDOMAIN:=$(AWS_PREFIX)-master-1.gerrit-demo
 MASTER2_SUBDOMAIN:=$(AWS_PREFIX)-master-2.gerrit-demo