3 files changed, 13 insertions, 9 deletions
diff --git a/playbooks/aws/README.md b/playbooks/aws/README.md
index 2b3d4329e..816cb35b4 100644
--- a/playbooks/aws/README.md
+++ b/playbooks/aws/README.md
@@ -87,11 +87,6 @@ masters
 nodes
 etcd
 
-[OSEv3:children]
-masters
-nodes
-etcd
-
 [OSEv3:vars]
 ################################################################################
 # Ensure these variables are set for bootstrap
diff --git a/playbooks/aws/openshift-cluster/build_ami.yml b/playbooks/aws/openshift-cluster/build_ami.yml
index fc11205d8..1e54f0467 100644
--- a/playbooks/aws/openshift-cluster/build_ami.yml
+++ b/playbooks/aws/openshift-cluster/build_ami.yml
@@ -47,9 +47,12 @@
       groups: nodes
       name: "{{ instancesout.instances[0].public_dns_name }}"
 
+- hosts: nodes
+  gather_facts: False
+  tasks:
   - name: set the user to perform installation
     set_fact:
-      ansible_ssh_user: root
+      ansible_ssh_user: "{{ openshift_aws_build_ami_ssh_user | default('root') }}"
 
 - name: normalize groups
   include: ../../byo/openshift-cluster/initialize_groups.yml
@@ -63,8 +66,14 @@
 - name: run the std_include
   include: ../../common/openshift-cluster/initialize_openshift_repos.yml
 
-- name: install node config
-  include: ../../common/openshift-node/config.yml
+- name: run node config setup
+  include: ../../common/openshift-node/setup.yml
+
+- name: run node config
+  include: ../../common/openshift-node/configure_nodes.yml
+
+- name: Re-enable excluders
+  include: ../../common/openshift-node/enable_excluders.yml
 
 - hosts: localhost
   connection: local
diff --git a/playbooks/aws/openshift-cluster/provision.yml b/playbooks/aws/openshift-cluster/provision.yml
index db7afac6f..8f018abd0 100644
--- a/playbooks/aws/openshift-cluster/provision.yml
+++ b/playbooks/aws/openshift-cluster/provision.yml
@@ -11,7 +11,7 @@
     debug:
       msg: "openshift_aws_region={{ openshift_aws_region | default('us-east-1') }}"
 
-  - name: create default vpc
+  - name: provision cluster
     include_role:
       name: openshift_aws
       tasks_from: provision.yml