[openstack-tuskar-ui] New instack patch w/ escaped >> <<

[Jordan O'Mara]

commit 52efe4174c98fd20238d92426ea862214480e862
Author: Jordan OMara <jomara at redhat.com>
Date:   Tue May 6 11:12:07 2014 -0400

    New instack patch w/ escaped >> <<

 0004-Adding-missing-setup-for-instack.patch |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/0004-Adding-missing-setup-for-instack.patch b/0004-Adding-missing-setup-for-instack.patch
index 34ac9e7..cb21e70 100644
--- a/0004-Adding-missing-setup-for-instack.patch
+++ b/0004-Adding-missing-setup-for-instack.patch
@@ -1,19 +1,28 @@
-From 6770789ee90d50211ab8dda7f39902e4b87beaf8 Mon Sep 17 00:00:00 2001
+From ee57c569b66f4c7329ccbfca7403173e658d4bdf Mon Sep 17 00:00:00 2001
 From: Ladislav Smola <lsmola at redhat.com>
 Date: Tue, 29 Apr 2014 17:27:11 +0200
-Subject: [PATCH 2/2] Adding missing setup for instack
+Subject: [PATCH] Adding missing setup for instack
 
 -adding setup of neutron and workaround for flavors
 
 Change-Id: I59fc22b60938ad9f548cab2990ca9f1f45d8a1f7
 ---
- .../templates/overcloud/_detail_overview.html      | 29 ++++++++++++++++++++--
- 1 file changed, 27 insertions(+), 2 deletions(-)
+ .../templates/overcloud/_detail_overview.html      | 31 +++++++++++++++++++---
+ 1 file changed, 28 insertions(+), 3 deletions(-)
 
 diff --git a/tuskar_ui/infrastructure/overcloud/templates/overcloud/_detail_overview.html b/tuskar_ui/infrastructure/overcloud/templates/overcloud/_detail_overview.html
-index 7957972..90151e2 100644
+index 7957972..771f8e3 100644
 --- a/tuskar_ui/infrastructure/overcloud/templates/overcloud/_detail_overview.html
 +++ b/tuskar_ui/infrastructure/overcloud/templates/overcloud/_detail_overview.html
+@@ -81,7 +81,7 @@
+ 
+   OVERCLOUD_ENDPOINT="http://$OVERCLOUD_IP:5000/v2.0"
+   NEW_JSON=$(jq '.overcloud.password="'${OVERCLOUD_ADMIN_PASSWORD}'" | .overcloud.endpoint="'${OVERCLOUD_ENDPOINT}'" | .overcloud.endpointhost="'${OVERCLOUD_IP}'"' $TE_DATAFILE)
+-  echo $NEW_JSON > $TE_DATAFILE
++  echo $NEW_JSON &gt; $TE_DATAFILE
+ 
+   source ./tripleo-incubator/overcloudrc
+ 
 @@ -109,11 +109,17 @@
    # You need to run the following commands from a Undercloud node where you have
    # direct access via SSH to your Overcloud control node ({{overcloud.keystone_ip}}).
@@ -30,7 +39,7 @@ index 7957972..90151e2 100644
  
    export OVERCLOUD_IP={{overcloud.keystone_ip}}
  
-+  cat > tripleo-overcloud-passwords <<EOF
++  cat &gt; tripleo-overcloud-passwords &lt;&lt;EOF
    export OVERCLOUD_ADMIN_TOKEN={{overcloud.attributes.AdminToken}}
    export OVERCLOUD_ADMIN_PASSWORD={{overcloud.attributes.AdminPassword}}
    export OVERCLOUD_CINDER_PASSWORD={{overcloud.attributes.CinderPassword}}
@@ -44,11 +53,11 @@ index 7957972..90151e2 100644
 +
 +  JSONFILE=nodes.json
 +  if [ ! -f $JSONFILE ]; then
-+    echo '{}' > $JSONFILE
++    echo '{}' &gt; $JSONFILE
 +  fi
 +  OVERCLOUD_ENDPOINT="http://{{overcloud.keystone_ip}}:5000/v2.0"
 +  NEW_JSON=$(jq '.overcloud.password="'{{overcloud.attributes.AdminPassword}}'" | .overcloud.endpoint="'${OVERCLOUD_ENDPOINT}'" | .overcloud.endpointhost="'{{overcloud.keystone_ip}}'"' $JSONFILE)
-+  echo $NEW_JSON > $JSONFILE
++  echo $NEW_JSON &gt; $JSONFILE
 +  export TE_DATAFILE=$JSONFILE
  
    source /etc/tripleo/overcloudrc