[openstack-tripleo/f21] Revert "Updated patches from master-patches"

[slagle]

commit 8eab23a997e52e57af0e9756fdc22c3a79082680
Author: James Slagle <jslagle at redhat.com>
Date:   Fri Oct 3 08:05:37 2014 -0400

    Revert "Updated patches from master-patches"
    
    This reverts commit 925295f33b62fbcf457aa12c4d0a38c09649de1b.

 0001-Use-packaged-template-directory-path.patch   |    2 +-
 0002-Switch-back-to-oslo-sphinx.patch             |    2 +-
 0003-Support-passing-x86_64-to-create-nodes.patch |   60 +++++++++++++++++++++
 openstack-tripleo.spec                            |    2 +
 4 files changed, 64 insertions(+), 2 deletions(-)
---
diff --git a/0001-Use-packaged-template-directory-path.patch b/0001-Use-packaged-template-directory-path.patch
index 49abcf6..d258467 100644
--- a/0001-Use-packaged-template-directory-path.patch
+++ b/0001-Use-packaged-template-directory-path.patch
@@ -1,4 +1,4 @@
-From c8305e0fa028451eee3f6976eef5e9f6976b2c3e Mon Sep 17 00:00:00 2001
+From bf35c5a7c23c7c1843f220be56fb5675d76af54f Mon Sep 17 00:00:00 2001
 From: James Slagle <jslagle at redhat.com>
 Date: Wed, 3 Sep 2014 17:13:40 -0400
 Subject: [PATCH] Use packaged template directory path
diff --git a/0002-Switch-back-to-oslo-sphinx.patch b/0002-Switch-back-to-oslo-sphinx.patch
index b0c9b38..da74028 100644
--- a/0002-Switch-back-to-oslo-sphinx.patch
+++ b/0002-Switch-back-to-oslo-sphinx.patch
@@ -1,4 +1,4 @@
-From a48d61c4f31b349890e07d9fbdf6f3deb297ce7d Mon Sep 17 00:00:00 2001
+From 3075504f77848d3dd024028454ac1ca7a3d85b66 Mon Sep 17 00:00:00 2001
 From: James Slagle <jslagle at redhat.com>
 Date: Wed, 3 Sep 2014 17:13:27 -0400
 Subject: [PATCH] Switch back to oslo sphinx
diff --git a/0003-Support-passing-x86_64-to-create-nodes.patch b/0003-Support-passing-x86_64-to-create-nodes.patch
new file mode 100644
index 0000000..9e7ae9d
--- /dev/null
+++ b/0003-Support-passing-x86_64-to-create-nodes.patch
@@ -0,0 +1,60 @@
+From 41b99513a6f3993b161e312e7d6307c3e9caae81 Mon Sep 17 00:00:00 2001
+From: James Slagle <jslagle at redhat.com>
+Date: Wed, 24 Sep 2014 13:58:58 -0400
+Subject: [PATCH] Support passing x86_64 to create-nodes
+
+x86_64 is the canonicalized arch for amd64 in Nova[1]. I think it makes
+sense to make our scripts (and thus our UI) a bit friendlier by making
+it as an accepted arch value. This will allow for the baremetal flavor
+to be created with x86_64 set as cpu_arch in the extra_specs so that if
+folks happened to register nodes with x86_64 instead of amd64 in Ironic,
+the flavor matching will work.
+
+[1] http://git.openstack.org/cgit/openstack/nova/tree/nova/compute/arch.py#n156
+
+Change-Id: I0f207a5b190bc2df86bc58fc62abc5ac6a93d73f
+---
+ scripts/boot-seed-vm  | 2 +-
+ scripts/create-nodes  | 2 +-
+ scripts/setup-seed-vm | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/boot-seed-vm b/scripts/boot-seed-vm
+index 4cc7092..e8a1ad3 100755
+--- a/scripts/boot-seed-vm
++++ b/scripts/boot-seed-vm
+@@ -107,7 +107,7 @@ SEED_ARCH=
+ 
+ case $ARCH in
+     i386) SEED_ARCH='i686'; ;;
+-    amd64) SEED_ARCH='x86_64'; ;;
++    amd64|x86_64) SEED_ARCH='x86_64'; ;;
+     *) echo "Unsupported arch $ARCH!" ; exit 1 ;;
+ esac
+ 
+diff --git a/scripts/create-nodes b/scripts/create-nodes
+index 5970c69..f6cf35c 100755
+--- a/scripts/create-nodes
++++ b/scripts/create-nodes
+@@ -12,7 +12,7 @@ NODE_DISK=$(( $DISK + 1))
+ 
+ case $4 in
+     i386) ARCH='i686' ;;
+-    amd64) ARCH='x86_64' ;;
++    amd64|x86_64) ARCH='x86_64' ;;
+     *) echo "Unsupported arch $4!" ; exit 1 ;;
+ esac
+ 
+diff --git a/scripts/setup-seed-vm b/scripts/setup-seed-vm
+index 9c3f676..4735878 100755
+--- a/scripts/setup-seed-vm
++++ b/scripts/setup-seed-vm
+@@ -96,7 +96,7 @@ SEED_ARCH=
+ 
+ case $ARCH in
+     i386) SEED_ARCH='i686'; ;;
+-    amd64) SEED_ARCH='x86_64'; ;;
++    amd64|x86_64) SEED_ARCH='x86_64'; ;;
+     *) echo "Unsupported arch $ARCH!" ; exit 1 ;;
+ esac
+ 
diff --git a/openstack-tripleo.spec b/openstack-tripleo.spec
index 4dc4239..306071a 100644
--- a/openstack-tripleo.spec
+++ b/openstack-tripleo.spec
@@ -26,6 +26,7 @@ Requires:		jq
 #
 Patch0001: 0001-Use-packaged-template-directory-path.patch
 Patch0002: 0002-Switch-back-to-oslo-sphinx.patch
+Patch0003: 0003-Support-passing-x86_64-to-create-nodes.patch
 
 %description
 TripleO is a program aimed at installing, upgrading and operating OpenStack
@@ -54,6 +55,7 @@ This package contains documentation files for TripleO.
 
 %patch0001 -p1
 %patch0002 -p1
+%patch0003 -p1
 
 %install
 # scripts