diff options
| author | Diego Castro <spinolacastro@gmail.com> | 2015-10-22 16:22:43 -0300 |
|---|---|---|
| committer | Diego Castro <spinolacastro@gmail.com> | 2015-10-22 16:22:43 -0300 |
| commit | f559eb3146c65a6ec58f0fed3eb2d1124c1314c7 (patch) | |
| tree | 24975a7a87568784b88252bc70d14f7b302670b0 /playbooks/aws/openshift-cluster/vars.online.prod.yml | |
| parent | 8468d25fae71c80277c10ad975641cb1ba230fd8 (diff) | |
| parent | e6d426fddd79c08452195cd32286bb600f62d51d (diff) | |
| download | openshift-f559eb3146c65a6ec58f0fed3eb2d1124c1314c7.tar.gz openshift-f559eb3146c65a6ec58f0fed3eb2d1124c1314c7.tar.bz2 openshift-f559eb3146c65a6ec58f0fed3eb2d1124c1314c7.tar.xz openshift-f559eb3146c65a6ec58f0fed3eb2d1124c1314c7.zip | |
fix merge conflicts
Diffstat (limited to 'playbooks/aws/openshift-cluster/vars.online.prod.yml')
| -rw-r--r-- | playbooks/aws/openshift-cluster/vars.online.prod.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/aws/openshift-cluster/vars.online.prod.yml b/playbooks/aws/openshift-cluster/vars.online.prod.yml index bbef9cc56..18a53e12e 100644 --- a/playbooks/aws/openshift-cluster/vars.online.prod.yml +++ b/playbooks/aws/openshift-cluster/vars.online.prod.yml @@ -3,7 +3,7 @@ ec2_image: ami-9101c8fa ec2_image_name: libra-ops-rhel7* ec2_region: us-east-1 ec2_keypair: mmcgrath_libra -ec2_master_instance_type: t2.small +ec2_master_instance_type: t2.medium ec2_master_security_groups: [ 'production', 'production-master' ] ec2_infra_instance_type: c4.large ec2_infra_security_groups: [ 'production', 'production-infra' ] |