From 2b3620ef1d9adeb10863fc352494c68740f2747f Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Mon, 22 Feb 2016 16:20:07 -0500
Subject: [PATCH] Renamed x86 architecture

---
 automation/ansible/hosts                      | 32 ++++++++++++-------
 automation/ansible/site.yml                   |  4 +--
 .../{slave-x64.yml => slave-amd64.yml}        |  2 +-
 .../ansible/{slave-x32.yml => slave-i386.yml} |  2 +-
 4 files changed, 25 insertions(+), 15 deletions(-)
 rename automation/ansible/{slave-x64.yml => slave-amd64.yml} (87%)
 rename automation/ansible/{slave-x32.yml => slave-i386.yml} (88%)

diff --git a/automation/ansible/hosts b/automation/ansible/hosts
index f1494ab..28f3842 100644
--- a/automation/ansible/hosts
+++ b/automation/ansible/hosts
@@ -24,19 +24,29 @@ ci-slave-powerpc-01
 140.211.168.186
 140.211.168.187
 
-[slave-x32]
-ci-slave-32-02
-ci-slave-32-03
-ci-slave-32-04
-
-[slave-x64]
-ci-slave-64-02
-ci-slave-64-03
-ci-slave-64-04
+[slave-i386]
+ci-slave-i386-04-01
+ci-slave-i386-04-02
+ci-slave-i386-04-03
+ci-slave-i386-04-04
+ci-slave-i386-05-01
+ci-slave-i386-05-02
+ci-slave-i386-05-03
+ci-slave-i386-05-04
+
+[slave-amd64]
+ci-slave-amd64-04-01
+ci-slave-amd64-04-02
+ci-slave-amd64-04-03
+ci-slave-amd64-04-04
+ci-slave-amd64-05-01
+ci-slave-amd64-05-02
+ci-slave-amd64-05-03
+ci-slave-amd64-05-04
 
 [slave:children]
-slave-x32
-slave-x64
+slave-i386
+slave-amd64
 slave-armhf
 slave-arm64
 slave-powerpc
diff --git a/automation/ansible/site.yml b/automation/ansible/site.yml
index 9f9dee5..b706081 100644
--- a/automation/ansible/site.yml
+++ b/automation/ansible/site.yml
@@ -4,5 +4,5 @@
 - include: slave-arm64.yml
 - include: slave-powerpc.yml
 - include: slave-ppc64el.yml
-- include: slave-x32.yml
-- include: slave-x64.yml
+- include: slave-i386.yml
+- include: slave-amd64.yml
diff --git a/automation/ansible/slave-x64.yml b/automation/ansible/slave-amd64.yml
similarity index 87%
rename from automation/ansible/slave-x64.yml
rename to automation/ansible/slave-amd64.yml
index 67143a2..3835701 100644
--- a/automation/ansible/slave-x64.yml
+++ b/automation/ansible/slave-amd64.yml
@@ -1,4 +1,4 @@
-- hosts: slave-x64
+- hosts: slave-amd64
   roles:
     - common
     - cross-compilers
diff --git a/automation/ansible/slave-x32.yml b/automation/ansible/slave-i386.yml
similarity index 88%
rename from automation/ansible/slave-x32.yml
rename to automation/ansible/slave-i386.yml
index 978f762..3fdebc8 100644
--- a/automation/ansible/slave-x32.yml
+++ b/automation/ansible/slave-i386.yml
@@ -1,4 +1,4 @@
-- hosts: slave-x32
+- hosts: slave-i386
   roles:
     - common
     - cross-compilers
-- 
2.34.1