27 Commits

Author SHA1 Message Date
Ghe Rivero
6cd2e5eccd Missing ADMIN_USER in sample_data.sh
When moving from keystone to openstack client, the initialization of
the ADMIN_USER variable was removed, making the script to fail.

Change-Id: Iee2d5b1cbed6c93e335a4b4dbad3034a2f8e29ed
2015-08-01 05:16:28 +02:00
Ghe Rivero
e614b29940 Update exported variables for openstack client
When using openstack client to populate an initial keystone
deployment, instead of the former keystone client, the env.
variables needed are OS_TOKEN and OS_URL instead of the
previous OS_SERVICE_TOKEN and OS_SERVICE_ENDPOINT

Change-Id: I79dcd56896945267cf1c8ff4378ffff63048e155
2015-08-01 05:11:07 +02:00
Eric Brown
82449dd550 Replace reference of ksc with osc
The leading comment in sample_data.sh still references the old
python-keystoneclient when its python-openstackclient that is
used to populate sample data.

This patch also makes a minor fix of the Swift service description.

TrivialFix

Change-Id: Ie4f5729dcc0b3a6164470d11ba91ddaaec0bb022
2015-07-12 22:47:27 -07:00
phil-hopkins-a
fa43b6f6d1 updates sample_data script to use the new openstack commands
Cleans up the sample_data script to replace the keystoneclient commands
with the new openstackclient commands

Change-Id: Id68ff2b466e582a0c2f4418d173f7d63c14f5f37
Closes-Bug: #1459816
2015-06-01 11:33:58 -05:00
Guang Yee
cdda91986b make sample_data.sh account for the default options in keystone.conf
Closes-Bug: 1394816

Change-Id: Ifb19d09a1ed8e82aebcaea82783480176daa3536
2014-11-20 16:50:55 -08:00
Morgan Fainberg
f18911ea14 Do not use keystone's config for nova's port
Keystone's configuration should have no bearing on the catalog
for nova's port. Nova's port is "static" data from the templated
catalog perspective.

The 'compute_port' option has been marked as deprecated and
slated for removal in the L release. The default/sample
templated catalog files do not rely on this option any
longer.

Change-Id: I51b0ec951449360f002c2e7c900ded0f40e16044
Closes-Bug: #1335278
2014-07-01 11:03:59 -07:00
Jenkins
58ff2bc511 Merge "Change deprecated CLI arguments" 2013-11-11 01:51:51 +00:00
Tom Fifield
994be740d4 Change deprecated CLI arguments
According to keystoneclient/shell.py, --token and --endpoint (with
their accompanying ENV vars SERVICE_TOKEN and SERVICE_ENDPOINT)
were retained only for Essex compatibility and should have been
removed during Grizzly, replaced with --os-token (OS_SERVICE_TOKEN)
and  --os-endpoint (OS_SERVICE_ENDPOINT).

This patch updates a couple of doc references to the old options,
and the sample_data tool.

Change-Id: I87060764f40b1612e3a440c3406d094536af4c9c
2013-11-10 18:04:07 -06:00
Kun Huang
380894fa4a remove 8888 port in sample_data.sh
Swift now doesn't use 8888 port as any default service. And the origin
sample_data.sh always let new users to fail and modify swift bind port.
So switching 8888 port here to 8080 could generate sample data without
any change for building swift + keystone environment.

Closes-Bug: #1244304
Change-Id: If58f9f025f57565733aa25efc2fdf06865781391
2013-10-25 00:28:14 +08:00
annegentle
056876182a Changes v1.1 to v2 for Compute endpoint in sample_data.sh
Pointed out in a comment in the docs.

Change-Id: Iceaf9d5a8098e6be8768e2bdb9bf6198ee7082f3
Closes-bug: 1230270
2013-09-25 08:37:10 -05:00
Sean Winn
0331f8a58a Changed header from LLC to Foundation based on trademark policies
Fixes: Bug 1214176

Change-Id: Ie937081a53d377671b8b88f422642c8131002f88
2013-09-05 15:03:32 -05:00
Robert H. Hyerle
76ee689d09 Accept env variables to override default passwords
Preserves the default passwords corresponding to the OpenStack Install
and Deploy Manual while allowing environment variables to specify user
provided passwords. As well, a single common password for all the service
users can be specified using the SERVICE_PASSWORD environment variable.

This fix restores compatibility with the version of this script released
in Folsom where the environment variables could override default passwords.
It also preserves compatibility with the fix for bug 1073291 that brought
the script into line with the docs (but unfortunately broke backwards
compatibility).

There is no warning emited if the user does not override the default
passwords as was present in Folsom, but not in Grizzly. This makes the
fix output compatible with Grizzly only. Note that the logic for warnings
pre-Grizzly was unclear. The script is, however, clearly named "sample"
and warnings are present in the comments.

Change-Id: I927fcddf04dcb87e5c9252f0874939b17f3c4809
Fixes: bug #1166182
2013-05-16 16:56:52 +02:00
David Höppner
d6f7cbc484 Update sample_data.sh to match docs
Confirm more with the "OpenStack Install and Deploy Manual."

Change-Id: I46ab7e8e5ccdf389cbc60fee84c063f289155781
Fixes: bug #1073291
2013-02-18 21:34:31 +01:00
Jaroslav Henner
90ebf9fb69 Make the controller addresses configurable.
The addresses in sample_data were hard-coded to localhost. This is
a problem when deploying not-so-all-in-one deployment -- one controller
and couple of compute nodes. It was also complicating access from
outside.

Change-Id: Iee53c3f4376c3628e1543afb6dc7e964a3a14ab2
2012-11-16 07:09:55 +01:00
Alan Pevec
b446a770a6 Fix default port for identity.internalURL
This should be the public_port and not the admin one.

Sync with default_catalog.templates change
commit 773f0f84af282cd3e53650ccbb99284c37677b6a

Change-Id: Ibb81a06607d94648993768c8b2e7161bf57195a1
2012-11-08 22:58:54 +01:00
Dolph Mathews
c585193788 Replaced underscores with dashes
Change-Id: I8e59891c6a532b9aaeffd2b69608ae4c7a4d2ab7
2012-10-04 13:48:12 +00:00
Alan Pevec
7b0a26446f add Swift endpoint in sample data
Change-Id: Idb1274adbcc28ccddc737d900062f5b8a5f81791
2012-09-17 20:51:49 +02:00
Alan Pevec
5d541057d7 add Quantum endpoint in sample data
Change-Id: Icd8166efec04e4adc18ecf7c96d43fbc4962cbeb
2012-09-13 14:37:06 +02:00
Everett Toews
2ee73cca01 Changed arguments in keystone CLI for consistency.
Changed --user to --user_id and --role to --role_id in the keystone client for
consistency. Need to update keystone calls here.

This change should be applied after [bug/994744 b7fe11c] in
python-keystoneclient.

Fixes bug 994744.

Change-Id: I234c1d46c0d92a6a00ebb25c5dfbba69cd46be52
2012-05-16 15:55:23 +00:00
Alan Pevec
f8cbd611cf sample_data.sh: check file paths for packaged installations
v4: try to use system-wide configuration first
    then fallback to assuming git checkout

Change-Id: I6916f554cb9848fcb2d090e142b8915ad19a7486
2012-03-13 17:34:43 +01:00
Jenkins
9d245f8b68 Merge "create service endpoints in sample data" 2012-03-11 01:54:48 +00:00
Dolph Mathews
5720730c2e Added license header (bug 929663)
Change-Id: Ia36a22f2d6bba411e4fad81ea2d6fa1f0465a733
2012-03-09 18:49:45 +00:00
Alan Pevec
2f4fb46159 create service endpoints in sample data
Enable creation of endpoints by setting ENABLE_ENDPOINTS environment
variable. Works with Catalog SQL backend.

Change-Id: I9ba0ea1b3cf35720fb338e91f48fcbddc326971b
2012-03-09 08:21:18 +01:00
Alan Pevec
71aa1db60f fix Nova Volume Service in sample data
Change-Id: Ic6bb8ddea1ab894076d1580f5dbbe535aa668a8a
2012-03-07 23:59:21 +01:00
Hengqing Hu
460c3f3891 Remove trailing whitespaces in regular file
Change-Id: I8d05fbb7a372bf9a813da9165cd40af71a1ae4c2
2012-03-03 13:11:08 +08:00
Dean Troyer
fc63c5ddb5 Add service accounts to sample_data.sh
Updated sample_data.sh to create the service accounts now required
for services (Nova/Swift/etc) to use Keystone.  Swift and Quantum
are now enabled by setting ENABLE_SWIFT and/or ENABLE_QUANTUM.

This corresponds to the auth_token middleware rewrite in
https://review.openstack.org/4675

Change-Id: I327c593a53f3ac06e2ed0c1543d2974728e70e03
2012-03-01 15:33:38 -06:00
Dean Troyer
09a64dd862 Create tools/sample_data.sh
Based on devstack's files/keystone_data.sh, sample_data.sh creates
the same set of tenants/users/roles/etc.  It can eventually be used
by devstack as the bootstrap script.

Fixes bug 934331

Change-Id: Ib3b514b6e4fc5c9e980e4e0c59bc44cda1b8d2b6
2012-02-23 23:28:08 -06:00