[openstack-tuskar-ui] Fixing some patch munging from git
Jordan O'Mara
jomara at fedoraproject.org
Thu May 1 20:44:01 UTC 2014
commit 8a913c6283d3d845d2b1d3080f9b66df5f3f75c4
Author: Jordan OMara <jomara at redhat.com>
Date: Thu May 1 16:43:32 2014 -0400
Fixing some patch munging from git
0003-Init-code-for-Instack-Undercloud.patch | 196 +++++++++++++++------------
0004-Adding-missing-setup-for-instack.patch | 12 +-
openstack-tuskar-ui.spec | 5 +-
3 files changed, 119 insertions(+), 94 deletions(-)
---
diff --git a/0003-Init-code-for-Instack-Undercloud.patch b/0003-Init-code-for-Instack-Undercloud.patch
index 39486d1..bc4bcc5 100644
--- a/0003-Init-code-for-Instack-Undercloud.patch
+++ b/0003-Init-code-for-Instack-Undercloud.patch
@@ -1,7 +1,7 @@
-From 15b374ae21f3c11382193fd04aa14537e3f1be57 Mon Sep 17 00:00:00 2001
+From 055b850ae9b9640004997b6de0444fee065f2e21 Mon Sep 17 00:00:00 2001
From: Ladislav Smola <lsmola at redhat.com>
Date: Wed, 16 Apr 2014 14:21:32 +0200
-Subject: [PATCH 2/3] Init code for Instack Undercloud
+Subject: [PATCH 1/2] Init code for Instack Undercloud
-When Undercloud was installed using Instack, the init
code will be a little different. So for Icehouse we are
@@ -15,93 +15,115 @@ Change-Id: Ib2c9b74d41a912f187d2cf3c02a2e4d77682d418
3 files changed, 75 insertions(+), 15 deletions(-)
diff --git a/tuskar_ui/infrastructure/overcloud/templates/overcloud/_detail_overview.html b/tuskar_ui/infrastructure/overcloud/templates/overcloud/_detail_overview.html
-index b9f247f..e87f5c6 100644
+index bcb85fb..7957972 100644
--- a/tuskar_ui/infrastructure/overcloud/templates/overcloud/_detail_overview.html
+++ b/tuskar_ui/infrastructure/overcloud/templates/overcloud/_detail_overview.html
-51,52c51,62
-< <p>Your OpenStack Deployment has been successfully deployed. It needs to be initialized before you will be able to use it.
-< <p/>
----
-> {% blocktrans %}
-> Your cloud is now deployed; however, it needs to be initialized.
-> {% endblocktrans %}
-> <ul>
-> <li>
-> {% blocktrans %}
-> For <strong>Devtest</strong> users you can <a data-toggle="collapse" data-target="#devtest">see instructions here</a>.
-> {% endblocktrans %}
-> <div id="devtest" class="collapse">
-> <pre>
-> # You need to run the following commands from a machine where you have a checkout of the tripleo source code
-> # and direct access via SSH to your Overcloud control node ({{overcloud.keystone_ip}}).
-54,61d63
-< <button type="button" class="btn btn-primary" data-toggle="collapse" data-target="#demo">
-< Initialize
-< </button>
-< <div id="demo" class="collapse">
-< <p>You need to run the below commands on the machine where you have tripleo source code and
-< direct access through ssh to control node ({{overcloud.keystone_ip}}).
-< </p>
-< <pre>
-72d73
-< export OVERCLOUD_CEILOMETER_PASSWORD={{overcloud.attributes.CeilometerPassword}}
-99,100c100,148
-< </pre>
-< </div>
----
-> </pre>
-> </div>
-> </li>
-> <li>
-> {% blocktrans %}
-> For <strong>Instack</strong> users you can <a data-toggle="collapse" data-target="#instack">see instructions here</a>.
-> {% endblocktrans %}
-> <div id="instack" class="collapse">
-> <pre>
-> # 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}}).
->
-> # Usually stack user has access to Overcloud control node, so switch to stack user
-> su stack
->
-> export OVERCLOUD_IP={{overcloud.keystone_ip}}
->
-> export OVERCLOUD_ADMIN_TOKEN={{overcloud.attributes.AdminToken}}
-> export OVERCLOUD_ADMIN_PASSWORD={{overcloud.attributes.AdminPassword}}
-> export OVERCLOUD_CINDER_PASSWORD={{overcloud.attributes.CinderPassword}}
-> export OVERCLOUD_GLANCE_PASSWORD={{overcloud.attributes.GlancePassword}}
-> export OVERCLOUD_HEAT_PASSWORD={{overcloud.attributes.HeatPassword}}
-> export OVERCLOUD_NEUTRON_PASSWORD={{overcloud.attributes.NeutronPassword}}
-> export OVERCLOUD_NOVA_PASSWORD={{overcloud.attributes.NovaPassword}}
-> export OVERCLOUD_SWIFT_PASSWORD={{overcloud.attributes.SwiftPassword}}
-> export OVERCLOUD_SWIFT_HASH={{overcloud.attributes.SwiftHashSuffix}}
->
-> source /etc/tripleo/overcloudrc
->
-> tripleo init-keystone -p $OVERCLOUD_ADMIN_PASSWORD $OVERCLOUD_ADMIN_TOKEN \
-> $OVERCLOUD_IP admin at example.com heat-admin@$OVERCLOUD_IP
-> tripleo setup-endpoints $OVERCLOUD_IP --cinder-password $OVERCLOUD_CINDER_PASSWORD \
-> --glance-password $OVERCLOUD_GLANCE_PASSWORD \
-> --heat-password $OVERCLOUD_HEAT_PASSWORD \
-> --neutron-password $OVERCLOUD_NEUTRON_PASSWORD \
-> --nova-password $OVERCLOUD_NOVA_PASSWORD \
-> --swift-password $OVERCLOUD_SWIFT_PASSWORD \
-> --enable-horizon
-> keystone role-create --name heat_stack_user
-> </pre>
-> </div>
-> </li>
-> </ul>
-> <p class="muted">
-> {% blocktrans %}
-> For more information, see our <a href="https://wiki.openstack.org/wiki/Tuskar/UsageGuide#Post-Deployment">documentation</a>
-> . We are working on improving your experience here.
-> {% endblocktrans %}
-> </p>
-182c230
-< You need to initialize your OpenStack Deployment first.
----
-> {% trans "You need to initialize your OpenStack Deployment first." %}
+@@ -48,17 +48,19 @@
+ {% if not dashboard_urls and not overcloud.is_deploying and not overcloud.is_failed %}
+ <div class="row-fluid">
+ <div class="span8">
+- <p>Your OpenStack Deployment has been successfully deployed. It needs to be initialized before you will be able to use it.
+- <p/>
+-
+- <button type="button" class="btn btn-primary" data-toggle="collapse" data-target="#demo">
+- Initialize
+- </button>
+- <div id="demo" class="collapse">
+- <p>You need to run the below commands on the machine where you have tripleo source code and
+- direct access through ssh to control node ({{overcloud.keystone_ip}}).
+- </p>
+- <pre>
++ {% blocktrans %}
++ Your cloud is now deployed; however, it needs to be initialized.
++ {% endblocktrans %}
++ <ul>
++ <li>
++ {% blocktrans %}
++ For <strong>Devtest</strong> users you can <a data-toggle="collapse" data-target="#devtest">see instructions here</a>.
++ {% endblocktrans %}
++ <div id="devtest" class="collapse">
++ <pre>
++ # You need to run the following commands from a machine where you have a checkout of the tripleo source code
++ # and direct access via SSH to your Overcloud control node ({{overcloud.keystone_ip}}).
++
+ export TRIPLEO_ROOT=~/tripleo
+ cd $TRIPLEO_ROOT
+
+@@ -69,7 +71,6 @@
+
+ export OVERCLOUD_ADMIN_TOKEN={{overcloud.attributes.AdminToken}}
+ export OVERCLOUD_ADMIN_PASSWORD={{overcloud.attributes.AdminPassword}}
+- export OVERCLOUD_CEILOMETER_PASSWORD={{overcloud.attributes.CeilometerPassword}}
+ export OVERCLOUD_CINDER_PASSWORD={{overcloud.attributes.CinderPassword}}
+ export OVERCLOUD_GLANCE_PASSWORD={{overcloud.attributes.GlancePassword}}
+ export OVERCLOUD_HEAT_PASSWORD={{overcloud.attributes.HeatPassword}}
+@@ -96,8 +97,55 @@
+ --enable-horizon \
+ ${SSLBASE:+--ssl $PUBLIC_API_URL}
+ keystone role-create --name heat_stack_user
+- </pre>
+- </div>
++ </pre>
++ </div>
++ </li>
++ <li>
++ {% blocktrans %}
++ For <strong>Instack</strong> users you can <a data-toggle="collapse" data-target="#instack">see instructions here</a>.
++ {% endblocktrans %}
++ <div id="instack" class="collapse">
++ <pre>
++ # 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}}).
++
++ # Usually stack user has access to Overcloud control node, so switch to stack user
++ su stack
++
++ export OVERCLOUD_IP={{overcloud.keystone_ip}}
++
++ export OVERCLOUD_ADMIN_TOKEN={{overcloud.attributes.AdminToken}}
++ export OVERCLOUD_ADMIN_PASSWORD={{overcloud.attributes.AdminPassword}}
++ export OVERCLOUD_CINDER_PASSWORD={{overcloud.attributes.CinderPassword}}
++ export OVERCLOUD_GLANCE_PASSWORD={{overcloud.attributes.GlancePassword}}
++ export OVERCLOUD_HEAT_PASSWORD={{overcloud.attributes.HeatPassword}}
++ export OVERCLOUD_NEUTRON_PASSWORD={{overcloud.attributes.NeutronPassword}}
++ export OVERCLOUD_NOVA_PASSWORD={{overcloud.attributes.NovaPassword}}
++ export OVERCLOUD_SWIFT_PASSWORD={{overcloud.attributes.SwiftPassword}}
++ export OVERCLOUD_SWIFT_HASH={{overcloud.attributes.SwiftHashSuffix}}
++
++ source /etc/tripleo/overcloudrc
++
++ tripleo init-keystone -p $OVERCLOUD_ADMIN_PASSWORD $OVERCLOUD_ADMIN_TOKEN \
++ $OVERCLOUD_IP admin at example.com heat-admin@$OVERCLOUD_IP
++ tripleo setup-endpoints $OVERCLOUD_IP --cinder-password $OVERCLOUD_CINDER_PASSWORD \
++ --glance-password $OVERCLOUD_GLANCE_PASSWORD \
++ --heat-password $OVERCLOUD_HEAT_PASSWORD \
++ --neutron-password $OVERCLOUD_NEUTRON_PASSWORD \
++ --nova-password $OVERCLOUD_NOVA_PASSWORD \
++ --swift-password $OVERCLOUD_SWIFT_PASSWORD \
++ --enable-horizon
++ keystone role-create --name heat_stack_user
++ </pre>
++ </div>
++ </li>
++ </ul>
++ <p class="muted">
++ {% blocktrans %}
++ For more information, see our <a href="https://wiki.openstack.org/wiki/Tuskar/UsageGuide#Post-Deployment">documentation</a>
++ . We are working on improving your experience here.
++ {% endblocktrans %}
++ </p>
+ </div>
+ </div>
+ {% endif %}
+@@ -179,7 +227,7 @@
+ </p>
+ {% endfor %}
+ {% else %}
+- You need to initialize your OpenStack Deployment first.
++ {% trans "You need to initialize your OpenStack Deployment first." %}
+ {% endif %}
+ </div>
+ </div>
diff --git a/tuskar_ui/infrastructure/static/infrastructure/less/horizon_upgrades.less b/tuskar_ui/infrastructure/static/infrastructure/less/horizon_upgrades.less
index 11c3513..19f9a44 100644
--- a/tuskar_ui/infrastructure/static/infrastructure/less/horizon_upgrades.less
diff --git a/0004-Adding-missing-setup-for-instack.patch b/0004-Adding-missing-setup-for-instack.patch
index 6073fc7..34ac9e7 100644
--- a/0004-Adding-missing-setup-for-instack.patch
+++ b/0004-Adding-missing-setup-for-instack.patch
@@ -1,7 +1,7 @@
-From a758de119652839b37aaf70ff92c7e1b1a9591b3 Mon Sep 17 00:00:00 2001
+From 6770789ee90d50211ab8dda7f39902e4b87beaf8 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 3/3] Adding missing setup for instack
+Subject: [PATCH 2/2] Adding missing setup for instack
-adding setup of neutron and workaround for flavors
@@ -11,10 +11,10 @@ Change-Id: I59fc22b60938ad9f548cab2990ca9f1f45d8a1f7
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/tuskar_ui/infrastructure/overcloud/templates/overcloud/_detail_overview.html b/tuskar_ui/infrastructure/overcloud/templates/overcloud/_detail_overview.html
-index e87f5c6..990fa6e 100644
+index 7957972..90151e2 100644
--- a/tuskar_ui/infrastructure/overcloud/templates/overcloud/_detail_overview.html
+++ b/tuskar_ui/infrastructure/overcloud/templates/overcloud/_detail_overview.html
-@@ -118,11 +118,17 @@
+@@ -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}}).
@@ -34,7 +34,7 @@ index e87f5c6..990fa6e 100644
export OVERCLOUD_ADMIN_TOKEN={{overcloud.attributes.AdminToken}}
export OVERCLOUD_ADMIN_PASSWORD={{overcloud.attributes.AdminPassword}}
export OVERCLOUD_CINDER_PASSWORD={{overcloud.attributes.CinderPassword}}
-@@ -132,6 +138,18 @@
+@@ -123,6 +129,18 @@
export OVERCLOUD_NOVA_PASSWORD={{overcloud.attributes.NovaPassword}}
export OVERCLOUD_SWIFT_PASSWORD={{overcloud.attributes.SwiftPassword}}
export OVERCLOUD_SWIFT_HASH={{overcloud.attributes.SwiftHashSuffix}}
@@ -53,7 +53,7 @@ index e87f5c6..990fa6e 100644
source /etc/tripleo/overcloudrc
-@@ -145,6 +163,13 @@
+@@ -136,6 +154,13 @@
--swift-password $OVERCLOUD_SWIFT_PASSWORD \
--enable-horizon
keystone role-create --name heat_stack_user
diff --git a/openstack-tuskar-ui.spec b/openstack-tuskar-ui.spec
index a2582ce..58dd167 100644
--- a/openstack-tuskar-ui.spec
+++ b/openstack-tuskar-ui.spec
@@ -1,6 +1,6 @@
Name: openstack-tuskar-ui
Version: 0.1.0
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: The UI component for Tuskar
Group: Applications/System
@@ -125,6 +125,9 @@ export PYTHONPATH=$PYTHONPATH:%{_datadir}/openstack-dashboard
%endif
%changelog
+* Thu May 01 2014 Jordan OMara <jomara at redhat.com> - 0.1.0-13
+- less confused patches from upstream (jomara at redhat.com)
+
* Thu May 01 2014 Jordan OMara <jomara at redhat.com> - 0.1.0-12
- Glance logfile & keystone api import fix (jomara at redhat.com)
More information about the scm-commits
mailing list