Merge pull request #186 from oracle/gb/update-test-resources

Update to use available shapes and lb

Author: owainlewis

tests/create/runner.py

@@ -1,4 +1,4 @@
-#!/usr/local/bin/python2.7
+#!/usr/bin/env python2.7
 
 import argparse
 import json

tests/resources/configs/public-cluster.tfvars

@@ -9,18 +9,18 @@ control_plane_subnet_access = "public"
 k8s_master_lb_access = "public"
 master_oci_lb_enabled = "true"
 etcd_lb_enabled = "false"
-etcdShape = "VM.Standard2.4"
-k8sMasterShape = "VM.Standard2.8"
-k8sWorkerShape = "BM.DenseIO1.36"
+etcdShape = "VM.Standard1.8"
+k8sMasterShape = "VM.Standard1.8"
+k8sWorkerShape = "VM.Standard1.8"
 etcdAd1Count = "1"
-etcdAd2Count = "0"
-etcdAd3Count = "0"
+etcdAd2Count = "1"
+etcdAd3Count = "1"
 k8sMasterAd1Count = "1"
-k8sMasterAd2Count = "0"
+k8sMasterAd2Count = "1"
 k8sMasterAd3Count = "1"
 k8sWorkerAd1Count = "1"
 k8sWorkerAd2Count = "1"
-k8sWorkerAd3Count = "0"
+k8sWorkerAd3Count = "1"
 etcdLBShape = "400Mbps"
 k8sMasterLBShape = "400Mbps"
 etcd_cluster_ingress = "10.0.0.0/16"

wercker.yml

@@ -40,7 +40,7 @@ build:
           terraform validate
 
 deploy:
-  box: 
+  box:
     id: python:2.7
   steps:
     - install-packages: