From 451e316e68756c09d21810cf94e90482df837098 Mon Sep 17 00:00:00 2001
From: Steve Kuznetsov <skuznets@redhat.com>
Date: Mon, 17 Apr 2017 15:53:51 -0400
Subject: [PATCH] Revert "Use the CI user by default on non-bare stages"

This reverts commit f50db3dddf0cebb2bd615cd2b2c919129c825cd0.
---
 oct/ansible/oct/roles/aws-up/tasks/main.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/oct/ansible/oct/roles/aws-up/tasks/main.yml b/oct/ansible/oct/roles/aws-up/tasks/main.yml
index 667399c3..c461fb08 100644
--- a/oct/ansible/oct/roles/aws-up/tasks/main.yml
+++ b/oct/ansible/oct/roles/aws-up/tasks/main.yml
@@ -118,13 +118,6 @@
 - name: determine the default user to use for SSH
   set_fact:
     origin_ci_aws_ssh_user: 'ec2-user'
-  when: origin_ci_aws_ami_stage == 'bare'
-
-- name: determine the default user to use for SSH
-  set_fact:
-    origin_ci_aws_ssh_user: 'origin'
-  when: origin_ci_aws_ami_stage != 'bare'
-
 - name: update variables for the host
   copy:
     content: