Updates to new CI cluster size

Author: smarterclayton

cluster/ci/Makefile

@@ -1,3 +1,26 @@
+LATEST = $(shell curl -q "https://storage.googleapis.com/origin-ci-test/branch-logs/origin/master/builds/.latest" 2>/dev/null)/artifacts/rpms
+REPO ?= $(LATEST)
+INSTANCE_PREFIX ?= $(WHAT)
+export INSTANCE_PREFIX
+
+up: check-cluster
+	cd data/ && ../../bin/local.sh ansible-playbook -e "openshift_test_repo=$(REPO)" playbooks/launch.yaml
+.PHONY: up
+
+down: check-cluster
+	cd data/ && ../../bin/local.sh ansible-playbook playbooks/terminate.yaml
+.PHONY: down
+
+sh: check-cluster
+	cd datata/ && ../../bin/local.sh
+.PHONY: sh
+
+check-cluster:
+.PHONY: check-cluster
+
+#
+# Copied code above, deploy custom code below
+#
 
 deploy:
 	-oc apply -f config/
@@ -8,3 +31,4 @@ deploy:
 	oc rollout latest -n default router
 	oadm policy add-cluster-role-to-user -z heapster -n kube-system cluster-reader
 	oc process heapster-standalone | oc apply -f - -n kube-system
+.PHONY: deploy

cluster/ci/data/vars.yaml

@@ -30,7 +30,7 @@ openshift_node_port_range: 30000-32000
 
 # Authentication and authorization
 
-openshift_master_identity_providers: "{{ (lookup('file', 'files/identity-providers.json' ) | default('{\"items\":[]}') | from_json).get('items') }}"
+openshift_master_identity_providers_file: "identity-providers.json"
 provision_role_mappings: [{"user": "smarterclayton", "role": "cluster-admin"}]
 
 # Paths on the local system for the certificate files. If empty, self-signed
@@ -74,9 +74,9 @@ provision_gce_node_groups:
 - name: node
   suffix: n
   tags: ocp-node,preserve
-  machine_type: n1-standard-4
+  machine_type: n1-standard-8
   boot_disk_size: 150
-  scale: 3
+  scale: 10
 - name: node-flex
   suffix: nf
   tags: ocp-node,preserve