28 Commits

Author SHA1 Message Date
ricolin
05ea6dfa54 Replace SCREEN_LOGDIR with LOGDIR
SCREEN_LOGDIR already been deprecated. This patch move to use
LOGDIR instead.

Change-Id: Ie2323412708efd523d934690b5516d635b008fb2
2017-09-25 16:04:02 +08:00
ricolin
bb9d34c33f use stderr for error echo message
Some echo message contain error or warning message which better be contain in
stderr. And futher more some error message already contain in stderr, but for
error message reader, the following information for that echo should be
contained as well.

Change-Id: I2aac631df19829218d446150c91cf6d50aa5e7e7
2016-01-17 05:20:40 +00:00
Ethan Lynn
267a4f076b Deprecate heat-keystone-setup
Keystone shell is deprecated in this release, use openstack client
in heat-keystone-setup. And add a deprecation warning to this
script.

Change-Id: I11334f0c8b035723a11f42bcfea054fc358a3e9f
Closes-Bug: #1460884
2015-11-13 10:28:42 +08:00
JUNJIE NAN
a055c1b6a9 Remove die_if_not_set check for var user_roles
Since the later logic will add role if the user role is not
found. "die_if_not_set" check will exit the main script.

Closes-Bug: #1389714

Change-Id: I995cf357d09267fee55e44575e3e301bcffebca3
2014-11-05 15:09:39 +01:00
aivanitskiy
9ed313a8be Fix typos in comments and help strings
Change-Id: I68446dd652186191d19551032a634aee03f9e637
2014-08-13 13:54:24 +04:00
Shane Wang
8a688c0aaa Fix misspellings in heat
Fix misspellings detected by:
* pip install misspellings
* git ls-files | grep -v locale | misspellings -f -

Change-Id: I554143f00fe82154472e7eb6391291730dd3ddd4
Closes-Bug: #1257295
Closes-Bug: #1277515
2014-02-11 08:29:37 +08:00
Jenkins
8e7a86dd7e Merge "Fix heat-keystone-setup error when try to create heat user" 2014-01-15 18:48:25 +00:00
Jenkins
4b5140bfe7 Merge "Fix get_column_num problem in heat-keystone-setup" 2014-01-11 18:51:19 +00:00
Jenkins
6cfa424002 Merge "log warning, when $SERVICE_HOST is localhost" 2014-01-10 20:21:48 +00:00
jufeng
02f3d70235 Fix heat-keystone-setup error when try to create heat user
Unset OS_SERVICE_TOKEN and OS_SERVICE_ENDPOINT temporarily to make
sure this command can run even if the OS_SERVICE_TOKEN and
OS_SERVICE_ENDPOIN exist in shell environment.
Remove die_if_not_set in get_data function, because there maybe no
data in get_data function, for example, if the heat user does not
exist, the die_if_not_set will be in error.
Remove die_if_not_set after keystone user-list for the same reason.

Change-Id: I132f975ac2da21e6ad7431ae326ad9bd538e4696
Closes-Bug: #1266670
2014-01-09 16:01:02 +08:00
DennyZhang
19948b1561 Fix get_column_num problem in heat-keystone-setup
get_column_num function searches the second line of command output,
to get the field number for a specific field.

But output of 'keystone user-list' may have an extra line: 'WARNING:
Bypassing authentication using a token & endpoint ...'

This messes up the functionality of get_column_num function

Closes-bug: #1260556
Change-Id: I8c6e7f939466154c5e31e6f019e20fb855e15878
2014-01-02 18:51:55 -06:00
DennyZhang
6cb6d30bc0 log warning, when $SERVICE_HOST is localhost
Warn users, if heat-keystone-setup can only use localhost as $SERVICE_HOST.
And remove an extra whitespace.

Change-Id: I1b2a1b93212b6ab0ca092bb6c834255ee75176ca
2014-01-02 10:59:04 -06:00
DennyZhang
88b8e20f1c add assertion to heat-keystone-setup script
Defensive check for various critical steps in the script

Change-Id: I9df01011940d80532787c3acaf0cc8ec10e97cc8
closes-bug: #1260561
2013-12-19 11:06:53 -06:00
Stephen Sugden
3f2c04a8ee Use hostname from env in heat-keystone-setup
Prints a warning if the endpoints are going to be registered as localhost URIs.

Change-Id: I32efcf826f400ca2763cb5758dce02ffdbdb9ae1
2013-05-13 14:25:16 -07:00
sdake
b9ed62c6b4 Escape awk + sign so heat-keystone-setup works on Ubuntu 12.04
plus sign needs escaping

Change-Id: Ia03f1eb213c806d13e88a435023ede8511ddfa4f
Fixes: bug #126723
2013-02-15 16:25:34 -07:00
Jeff Peeler
0a37f56972 Change install scripts to use cinder
Fixes bug #1073164

Change-Id: Id483b028d19dbbc30984299120b87fd020f19903
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
2013-02-04 14:33:36 -05:00
Steven Hardy
e0bb98d4f5 heat-keystone-setup : fix error on folsom first-install
When running heat-keystone-setup for the first time after (re)installing
openstack folsom, it fails, because the user-role-list is running *as* the
heat user, not reading the roles assigned to the heat user, which fails
because on a new install the heat user does not have the admin role.
Using the credentials from the environment means we run the command as
admin, but --user_id selects the roles for the heat user.

Change-Id: Ib2733e63f664d75be1e2e3bd43038bbd1dbebde8
Signed-off-by: Steven Hardy <shardy@redhat.com>
2012-10-31 16:28:19 +00:00
Steven Hardy
70b609567d heat-keystone-setup : change role to heat_stack_user
Change heat_instance role name to heat_stack_user after discussions

Change-Id: I14e95df0e02d82566f4758510ae38f6b26ccb532
Signed-off-by: Steven Hardy <shardy@redhat.com>
2012-10-25 14:04:49 +01:00
Steven Hardy
4743749b80 heat-keystone-setup add instance role
Add "heat_instance" role which we will assign all "instance users"
to in the engine when we create them

Ref #279

Change-Id: If7cc07c605f7696c1e9f617dbfca1b81d5b04196
Signed-off-by: Steven Hardy <shardy@redhat.com>
2012-10-25 10:16:29 +01:00
Steven Hardy
f5099e02d5 heat-keystone-setup workaround keystone arg syntax
Keystone user-role-add syntax is not the same on essex
and folsom, so try both formats so we can work with either
Removes potentially unreliable approach to detecting keystone
version, and also avoids error on folsom when the user already
has the specified role

Fixes #272

Change-Id: Iece52223a29069a1fd517018cc49613be6fac318
Signed-off-by: Steven Hardy <shardy@redhat.com>
2012-10-25 10:01:19 +01:00
Steven Hardy
b3b56ff59d heat-keystone-setup workaround keystone output reordering
Folsom version of keystoneclient orders the columns for
keystone user-list differently, so we need to detect the
new format to extract the correct field

Fixes #273

Change-Id: I46f653dd3a8f7b5a68648fbd72671f95b386a547
Signed-off-by: Steven Hardy <shardy@redhat.com>
2012-10-25 10:01:19 +01:00
Zane Bitter
7036a387f4 ReST API: Add a keystone endpoint
Change-Id: I2770279ec50822c106d3ae23ce2f736a49139443
Signed-off-by: Zane Bitter <zbitter@redhat.com>
2012-10-22 14:06:40 +02:00
Zane Bitter
567128f594 Handle %(tenant_id)s in endpoints when updating
Change-Id: I61112f02b60b6bb63f33d5459edec1f44a49bdd5
Signed-off-by: Zane Bitter <zbitter@redhat.com>
2012-10-22 14:06:23 +02:00
Zane Bitter
0c81d9dbef Handle upgrades in heat-keystone-setup
Handle upgrades of Heat by removing any outdated endpoints that exist in
keystone and adding any existing "heat" service user to an admin role in
the service tenant.

Change-Id: If6393417b5404a56b4723f42fb1a1b394d01cc6a
Signed-off-by: Zane Bitter <zbitter@redhat.com>
2012-10-17 14:39:49 +02:00
Zane Bitter
bae47db460 Rename CloudFormation service to heat-cfn
This is consistent with what is implemented in devstack.

Change-Id: If47c28ddbef1d6c61e2d741f359d850e4ecffaa9
Signed-off-by: Zane Bitter <zbitter@redhat.com>
2012-10-17 10:35:53 +02:00
Steve Baker
a34b9ef5ab Change endpoint service type from orchestration to cloudformation.
This is required so that the REST API can take over the orchestration service type.

This will break exiting setups until heat-keystone-setup is re-run.

There will be a corresponding update to devstack, which may be out of sync to this one.
2012-10-10 13:21:47 +13:00
Jeff Peeler
4651be7838 Remove unnecessary keystone scripts
Make remaining keystone script check installed version of Nova and use
proper arguments to keystone.

closes #252

Change-Id: Ie4709891c7ca89d73390a3474e3d10beab449395
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
2012-10-09 16:51:56 +01:00
Steven Dake
5208008db0 Add a Folsom specific heat-keystone-setup binary to bin
Fixes issue #253

Change-Id: Ie223c43c15ac806da393e3d532ef410526ac16ce
Signed-off-by: Steven Dake <sdake@redhat.com>
2012-09-26 10:11:07 -07:00