8 files changed, 23 insertions, 18 deletions
diff --git a/playbooks/adhoc/zabbix_setup/clean_zabbix.yml b/playbooks/adhoc/zabbix_setup/clean_zabbix.yml
index bd71e6d1d..610d18b28 100644
--- a/playbooks/adhoc/zabbix_setup/clean_zabbix.yml
+++ b/playbooks/adhoc/zabbix_setup/clean_zabbix.yml
@@ -2,7 +2,9 @@
 - hosts: localhost
   gather_facts: no
   vars:
-    g_zserver: http://oso-rhel7-zabbix-web.kwoodsontest2.opstest.online.openshift.com/zabbix/api_jsonrpc.php
+    # Use this for local ZAIO
+    g_zserver: http://localhost/zabbix/api_jsonrpc.php
+
     g_zuser: Admin
     g_zpassword: zabbix
   roles:
diff --git a/playbooks/adhoc/zabbix_setup/roles b/playbooks/adhoc/zabbix_setup/roles
new file mode 120000
index 000000000..e2b799b9d
--- /dev/null
+++ b/playbooks/adhoc/zabbix_setup/roles
@@ -0,0 +1 @@
+../../../roles/
+\ No newline at end of file
diff --git a/playbooks/adhoc/zabbix_setup/setup_zabbix.yml b/playbooks/adhoc/zabbix_setup/setup_zabbix.yml
index 286f699e5..8b44f2adf 100644
--- a/playbooks/adhoc/zabbix_setup/setup_zabbix.yml
+++ b/playbooks/adhoc/zabbix_setup/setup_zabbix.yml
@@ -5,7 +5,9 @@
   - vars/template_heartbeat.yml
   - vars/template_os_linux.yml
   vars:
-    g_zserver: http://oso-rhel7-zabbix-web.kwoodsontest2.opstest.online.openshift.com/zabbix/api_jsonrpc.php
+    # Use this for local ZAIO
+    g_zserver: http://localhost/zabbix/api_jsonrpc.php
+
     g_zuser: Admin
     g_zpassword: zabbix
   roles:
diff --git a/playbooks/aws/openshift-cluster/library/ec2_ami_find.py b/playbooks/aws/openshift-cluster/library/ec2_ami_find.py
index 29e594a65..2b1db62d8 100644
--- a/playbooks/aws/openshift-cluster/library/ec2_ami_find.py
+++ b/playbooks/aws/openshift-cluster/library/ec2_ami_find.py
@@ -158,7 +158,7 @@ EXAMPLES = '''
 # Launch an EC2 instance
 - ec2:
     image: "{{ ami_search.results[0].ami_id }}"
-    instance_type: m3.medium
+    instance_type: m4.medium
     key_name: mykey
     wait: yes
 '''
diff --git a/playbooks/aws/openshift-cluster/vars.online.int.yml b/playbooks/aws/openshift-cluster/vars.online.int.yml
index fc8b8d2d2..b9ee29b83 100644
--- a/playbooks/aws/openshift-cluster/vars.online.int.yml
+++ b/playbooks/aws/openshift-cluster/vars.online.int.yml
@@ -3,13 +3,13 @@ ec2_image: ami-9101c8fa
 ec2_image_name: libra-ops-rhel7*
 ec2_region: us-east-1
 ec2_keypair: mmcgrath_libra
-ec2_master_instance_type: m3.large
+ec2_master_instance_type: m4.large
 ec2_master_security_groups: [ 'integration', 'integration-master' ]
-ec2_infra_instance_type: m3.large
+ec2_infra_instance_type: m4.large
 ec2_infra_security_groups: [ 'integration', 'integration-infra' ]
-ec2_node_instance_type: m3.large
+ec2_node_instance_type: m4.large
 ec2_node_security_groups: [ 'integration', 'integration-node' ]
-ec2_etcd_instance_type: m3.large
+ec2_etcd_instance_type: m4.large
 ec2_etcd_security_groups: [ 'integration', 'integration-etcd' ]
 ec2_vpc_subnet: subnet-987c0def
 ec2_assign_public_ip: yes
diff --git a/playbooks/aws/openshift-cluster/vars.online.prod.yml b/playbooks/aws/openshift-cluster/vars.online.prod.yml
index f68d41fc4..691582834 100644
--- a/playbooks/aws/openshift-cluster/vars.online.prod.yml
+++ b/playbooks/aws/openshift-cluster/vars.online.prod.yml
@@ -3,13 +3,13 @@ ec2_image: ami-9101c8fa
 ec2_image_name: libra-ops-rhel7*
 ec2_region: us-east-1
 ec2_keypair: mmcgrath_libra
-ec2_master_instance_type: m3.large
+ec2_master_instance_type: m4.large
 ec2_master_security_groups: [ 'production', 'production-master' ]
-ec2_infra_instance_type: m3.large
+ec2_infra_instance_type: m4.large
 ec2_infra_security_groups: [ 'production', 'production-infra' ]
-ec2_node_instance_type: m3.large
+ec2_node_instance_type: m4.large
 ec2_node_security_groups: [ 'production', 'production-node' ]
-ec2_etcd_instance_type: m3.large
+ec2_etcd_instance_type: m4.large
 ec2_etcd_security_groups: [ 'production', 'production-etcd' ]
 ec2_vpc_subnet: subnet-987c0def
 ec2_assign_public_ip: yes
diff --git a/playbooks/aws/openshift-cluster/vars.online.stage.yml b/playbooks/aws/openshift-cluster/vars.online.stage.yml
index ce9869fcd..2ec43ad4c 100644
--- a/playbooks/aws/openshift-cluster/vars.online.stage.yml
+++ b/playbooks/aws/openshift-cluster/vars.online.stage.yml
@@ -3,13 +3,13 @@ ec2_image: ami-9101c8fa
 ec2_image_name: libra-ops-rhel7*
 ec2_region: us-east-1
 ec2_keypair: mmcgrath_libra
-ec2_master_instance_type: m3.large
+ec2_master_instance_type: m4.large
 ec2_master_security_groups: [ 'stage', 'stage-master' ]
-ec2_infra_instance_type: m3.large
+ec2_infra_instance_type: m4.large
 ec2_infra_security_groups: [ 'stage', 'stage-infra' ]
-ec2_node_instance_type: m3.large
+ec2_node_instance_type: m4.large
 ec2_node_security_groups: [ 'stage', 'stage-node' ]
-ec2_etcd_instance_type: m3.large
+ec2_etcd_instance_type: m4.large
 ec2_etcd_security_groups: [ 'stage', 'stage-etcd' ]
 ec2_vpc_subnet: subnet-987c0def
 ec2_assign_public_ip: yes
diff --git a/playbooks/aws/openshift-cluster/vars.yml b/playbooks/aws/openshift-cluster/vars.yml
index 07e453f89..fb1793a51 100644
--- a/playbooks/aws/openshift-cluster/vars.yml
+++ b/playbooks/aws/openshift-cluster/vars.yml
@@ -8,7 +8,7 @@ deployment_vars:
     ssh_user: fedora
     sudo: yes
     keypair: libra
-    type: m3.large
+    type: m4.large
     security_groups: [ 'public' ]
     vpc_subnet:
     assign_public_ip:
@@ -20,7 +20,7 @@ deployment_vars:
     ssh_user: root
     sudo: no
     keypair: libra
-    type: m3.large
+    type: m4.large
     security_groups: [ 'public' ]
     vpc_subnet:
     assign_public_ip:
@@ -32,7 +32,7 @@ deployment_vars:
     ssh_user: ec2-user
     sudo: yes
     keypair: libra
-    type: m3.large
+    type: m4.large
     security_groups: [ 'public' ]
     vpc_subnet:
     assign_public_ip: