From a1b5732def3e98d4fe38cce45bd0cf2f669c0641 Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Fri, 24 Aug 2018 19:07:59 -0400
Subject: [PATCH] Revert "cluster-launch-installer-e2e: remove etcd nodes"

---
 cluster/test-deploy/aws/openshift.yaml | 55 +++++++++++++++++++++++++-
 1 file changed, 53 insertions(+), 2 deletions(-)

diff --git a/cluster/test-deploy/aws/openshift.yaml b/cluster/test-deploy/aws/openshift.yaml
index bcf345972324d..942562464a7c6 100644
--- a/cluster/test-deploy/aws/openshift.yaml
+++ b/cluster/test-deploy/aws/openshift.yaml
@@ -8,9 +8,43 @@ aws:
   # If name is not provided the installer will construct the name using "name", current AWS region and "baseDomain"
   # assetsS3BucketName:
 
+  # (optional) Extra AWS tags to be applied to created autoscaling group resources.
+  # This is a list of maps having the keys `key`, `value` and `propagate_at_launch`.
+  #
+  # Example: `[ { key = "foo", value = "bar", propagate_at_launch = true } ]`
+  # autoScalingGroupExtraTags:
+
   # (optional) AMI override for all nodes. Example: `ami-foobar123`.
   ec2AMIOverride: "${EC2_AMI_OVERRIDE}"
 
+  etcd:
+    # Instance size for the etcd node(s). Example: `t2.medium`. Read the [etcd recommended hardware](https:#coreos.com/etcd/docs/latest/op-guide/hardware.html) guide for best performance
+    ec2Type: t2.medium
+
+    # (optional) List of additional security group IDs for etcd nodes.
+    #
+    # Example: `["sg-51530134", "sg-b253d7cc"]`
+    # extraSGIDs:
+
+    # (optional) Name of IAM role to use for the instance profiles of etcd nodes.
+    # The name is also the last part of a role's ARN.
+    #
+    # Example:
+    #  * Role ARN  = arn:aws:iam::123456789012:role/tectonic-installer
+    #  * Role Name = tectonic-installer
+    # iamRoleName:
+
+    rootVolume:
+      # The amount of provisioned IOPS for the root block device of etcd nodes.
+      # Ignored if the volume type is not io1.
+      iops: 100
+
+      # The size of the volume in gigabytes for the root block device of etcd nodes.
+      size: 30
+
+      # The type of volume for the root block device of etcd nodes.
+      type: gp2
+
   external:
     # (optional) List of subnet IDs within an existing VPC to deploy master nodes into.
     # Required to use an existing VPC and the list must match the AZ count.
@@ -180,9 +214,14 @@ containerLinux:
   # Examples: `latest`, `1465.6.0`
   version: latest
 
-  # (optional) A list of PEM encoded CA files that will be installed in /etc/ssl/certs on master and worker nodes.
+  # (optional) A list of PEM encoded CA files that will be installed in /etc/ssl/certs on etcd, master, and worker nodes.
   # customCAPEMList:
 
+etcd:
+  # The name of the node pool(s) to use for etcd nodes
+  nodePools:
+    - etcd
+
 iscsi:
   # (optional) Start iscsid.service to enable iscsi volume attachment.
   # enabled: false
@@ -228,9 +267,16 @@ networking:
   # type: canal
 
 nodePools:
+    # The number of etcd nodes to be created.
+    # If set to zero, the count of etcd nodes will be determined automatically.
+    #
+    # Note: This is not supported on bare metal.
+  - count: 3
+    name: etcd
+
     # The number of master nodes to be created.
     # This applies only to cloud platforms.
-  - count: 3
+  - count: 1
     name: master
 
     # The number of worker nodes to be created.
@@ -253,6 +299,11 @@ platform: aws
 # [3] https://account.coreos.com/overview
 pullSecretPath: pull-secret
 
+# Validity period of the self-signed certificates (in hours).
+# Default is 3 years.
+# This setting is ignored if user provided certificates are used.
+tlsValidityPeriod: 26280
+
 worker:
   # The name of the node pool(s) to use for workers
   nodePools: