Commit Graph

121 Commits

Author SHA1 Message Date
Jenkins
693755ee25 Merge "Remove all traces of oslo incubator" 2015-08-25 07:32:45 +00:00
David Stanek
55e9514cbd Remove all traces of oslo incubator
- removes run_tests.sh since it's rarely used and an alternative exists
- removes all the remaining incubator files since nothing uses them

The real value of run_tests.sh over tox is that run_tests.sh enables
running tests against against any virtualenv or Python installation. tox
is just a tool that runs testr commands in a specific virtualenv. testr
can be used directly as a run_tests.sh replacement for running tests in
an arbitrary virtualenv or against any Python installation.

blueprint remove-oslo-incubator
Change-Id: I9d4ef8bf935eb565af1c8d53d1ed71be9a94a975
2015-08-20 20:16:42 +00:00
Qiaowei Ren
feb98a83b9 Add necessary executable permission
tools/pretty_tox.sh should be marked as executable, this patch
just 'chmod +x' to it.

Closes-Bug: 1486313
Change-Id: Ia5fa921e83da1e094970b1e44c9709272c7e32d3
2015-08-19 10:57:34 +08:00
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
Steve Martinelli
fb5bdac8e5 Remove convert_to_sqlite.sh
The file has not been modified in 3 years, and seems like a
utility a deployer should maintain for debugging.

Change-Id: Ib4d55052c27facf7d96655c75784b657d1b01975
2015-07-08 03:25:41 +00: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
Brant Knudson
8c76fbe02d Use subunit-trace from tempest-lib
This makes the test output look like nova's, for consistency.

Change-Id: I24887521d5a3c7d768d77e07e40ab4468e77c9b9
2015-02-13 07:45:31 -06:00
Dolph Mathews
083d1cd522 switch from sample_config.sh to oslo-config-generator
This switches keystone to use oslo-config-generator, where the contents
of our sample configuration file are configured using a configuration
file in config-generators/, because the only way to have tox create
files is to have configuration files for your configuration files
(seriously, it chokes when redirects are included in the command for a
test environment).

This also takes advantage of oslo-config-generator's ability to set the
line wrap width, which is done at 79 chars here to match the rest of our
code.

Also update the actual sample file under etc/

Change-Id: I9f9a157c7802c56a2c7484f6f4adec4aeb4071b8
Closes-Bug: 1324610
2015-01-02 15:04:20 -06: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
Steve Martinelli
ac87550a55 Use oslo_debug_helper and remove our own version
With the latest version of oslotest, we can now take advantage
of a common oslo_debug_helper script.
We can now remove our own homebrewed version, minor changes to
tox.ini were needed.

Change-Id: Ide72fb3531f0498dfe289d028049cd432aa08887
2014-09-05 16:27:39 -04:00
Jenkins
bbfd58a6c1 Merge "Do not use keystone's config for nova's port" 2014-07-11 23:36:17 +00:00
Brant Knudson
ef2040dae8 Sync with oslo-incubator e9bb0b59
This syncs Keystone with oslo-incubator commit hash
e9bb0b596650540f336afb070a1f8c7de099721f .

In keystone:

 $ rm -r keystone/openstack/common

In oslo-incubator:

 $ git checkout e9bb0b596650540f336afb070a1f8c7de099721f
 $ python update.py ../keystone

Commits
-------
bc48099 Log the function name of looping call
109e325 Use oslo.messaging to publish log errors
de4adbc pep8: fixed multiple violations
9651085 generator: remove unused param, small clean up
eac71f5 Fix common.log.ContextFormatter for Python 3
238e601 Make policy debug logging less verbose
250cd88 Fixed a new pep8 error and a small typo
5e3d3a5 Mask passwords included without quotes at the ends of commands
e7c8a45 Improve error handling for conf sample generation
9e88af1 fixed typos found by RETF rules
5f12bba Implement stop method in ProcessLauncher
0d7296f Add kwargs to jsonutils.load(s) functions
9c88dc3 file_open: fixed docstring to refer to open() instead of file()
d78b633 Fixes a simple spelling mistake
621d831 always log a traceback in the sys.excepthook

Change-Id: I4ef56ce08e1f3bbc0ddb82a495da153e09a14c50
2014-07-06 11:10:11 -05: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
db0519dfa0 Merge "Make gen_pki.sh & debug_helper.sh bash8 compliant" 2014-06-23 18:39:44 +00:00
Lance Bragstad
491b29bed8 Make gen_pki.sh & debug_helper.sh bash8 compliant
Now that bash8 is available on PyPI we can use it to clean up the bash
scripts in Keystone. This also uses bash8 in tox. For now we can add
files to the tox check manually as we make them compliant.

Change-Id: I87a7478949114163f0614b1a6d8b249e14afe0df
2014-06-23 15:41:58 +00:00
Ilya Pekelny
8db9ba7906 oslo.db implementation
Use oslo.db library instead of common.db code.

Change-Id: I3019e35bf961b50cbd3d9737ba7c08b3f20536a0
2014-06-20 11:08:21 +03:00
David Stanek
f4275c508a Cleanup openstack-common.conf and sync from olso
An upcoming change[1] in oslo's update.py adds new warnings for
style issues in the config. To compensate this commit:

 - orders the modules alphabetically
 - uses the script directive for scripts

Sync with oslo-incubator caed79d

This syncs Keystone with oslo-incubator commit hash
caed79d8239679cb74476bb0d9e5011b4fcc39da.

In keystone:

$ rm -r keystone/openstack/common

In oslo-incubator:

$ python update.py ../keystone

Commits
-------

1173e46 Remove ValueError when accessing sys.modules
17c4e21 Fix docstring indentation in systemd
90ae24b Remove redundant default=None for config options
6c7407b fileutils: port to Python 3
18f2bc1 Enforce unicode json output for jsonutils.load[s]()
af36c2a Fix logging setup for Python 3.4
5ae792b Document config generator variables
ea9ead8 Allow file exclusion in config generator
cdcc19c Mask passwords that are included in commands
9e5a393 jsonutils.load() accepts file pointer, not string
a6b2aec On Python <= 2.6, use simplejson if available
fe3389e Improve help strings
8a0f567 Remove str() from LOG.* and exceptions
f3f14c9 Fixed several typos
0f495ee Emit a log statement when releasing internal lock
9912e5d Add API for creating translation functions

1. https://review.openstack.org/76901

Change-Id: I89de9ae9e3c574095967a2a67e842a90b5527ffa
2014-05-28 16:24:44 +00:00
Brant Knudson
ea7018fe5f Sync with oslo-incubator 2fd457b
This syncs Keystone with oslo-incubator commit hash
2fd457bf2ccbeb2b84ffb204778b6417cd5405ba .

In keystone:

 $ rm -r keystone/openstack/common

In oslo-incubator:

 $ python update.py ../keystone

The newer lockutils requires posix_ipc. It's already in
global-requirements.

Keystone uses gettextutils and versionutils from oslo-incubator
so those should be in openstack-common.conf. They were pulled in
as dependencies of other oslo-incubator modules but Keystone
shouldn't rely on that.

Keystone doesn't use log_handler directly so that module was
removed from openstack-common.conf. log_handler is available in
the oslo.messaging library.

Change-Id: I6082f4e0995ca35372f9b061d8f76890aa93250c
2014-04-15 15:14:25 -05:00
Morgan Fainberg
23a4fe9ec7 Update config options with helpstrings and generate sample
Restructure the common config to include many help strings to
support using the oslo.config auto-generated sample config file.

Closes-Bug: #1229941
Change-Id: If352b3b816b1e7dc8b5fc3b9c1cb2adab187ffda
2014-02-20 19:18:49 -08:00
Morgan Fainberg
10f9c1f1c3 Setup code for auto-config sample generation
Sync in the oslo code for auto-config sample generation and
make the appropriate changes to setup to allow for automatic
option discovery.

`test-requirements.txt` now includes stevedore to
ensure the oslo libraries can all be loaded as expected.

Change-Id: Ieca0aea4d3c67b930c12467317d2f4d83763b601
2014-02-16 20:41:00 +00:00
Eric Guo
263b27f2cd Remove vim header
We don't need vim modelines in each source file, it can be set in
user's vimrc.

Change-Id: Ie51ad62946afdf39eadcd59edaf8134ec10265c6
Closes-Bug: #1229324
2014-02-08 23:54:04 +08:00
Brant Knudson
c8302509e6 Debug env for tox
Running a test with pdb was difficult because testr captures
output and causes pdb prompt to quit.

Tips for how to run with debug are provided here:
 https://wiki.openstack.org/wiki/Testr#Debugging_.28pdb.29_Tests

This change puts these commands into a debug env in tox.ini so
you can do a command like

 tox -e debug test_v3_trust_token_get_token_fails

or, for more granularity:
 tox -e debug keystone.tests.test_sql_migrate_extensions.EndpointFilterExtension
 tox -e debug keystone.tests.test_sql_migrate_extensions.EndpointFilterExtension.test_downgrade

and when it hits your breakpoint you'll get the debug prompt.

Change-Id: I2b5dc81f4652dc89ecbcc7c785245a81cf77a1ca
2013-12-10 16:37:16 -08:00
Jamie Lennox
9473106429 Sync From OSLO
blueprint: key-distribution-server
Change-Id: I424dbd6e8a535279498589444b976ea332e09c64
2013-12-04 04:41:17 +10:00
Mark McLoughlin
398100e0d7 Remove obsolete redhat-eventlet.patch
See I62ce43a330d7ae94eda4c7498782a655e63747fa for the gory details on
why this exists.

As of this fix:

  https://github.com/eventlet/eventlet/pull/34

which was released in eventlet 0.13, we no longer need the patch.

This has now been removed from oslo-incubator, so this is really just
syncing that removal.

Change-Id: I84267f3c6726cb2e750f615e107c48b12c6ed353
2013-11-14 17:49:54 -06: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
David Stanek
59adb86b26 Changes to testr as the test runner
run_tests.sh has also been deprecated.

Fixes-Bug: #1177924
Change-Id: I15c1707eb6a62c74a0021a48b89ae15f03fcfea8
2013-10-15 12:28:38 +00:00
Jenkins
9d3b96b444 Merge "Changes v1.1 to v2 for Compute endpoint in sample_data.sh" 2013-10-08 00:49:58 +00: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
ZhiQiang Fan
27d0463e93 Enclose command args in with_venv.sh
Sync tools/with_venv.sh from oslo, it will support argument with
blanks.

Closes-Bug: #1220937
Change-Id: Id10528efcdd1abad3009c13f2c5bde6dcf172520
2013-09-20 05:46:45 +08: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
Monty Taylor
0098a1e241 Sync install_venv_common from oslo
Change-Id: I9ecacefeb772af7efe0345c3b2162295c4999cdd
2013-07-05 22:22:44 -04:00
Jamie Lennox
7da3a69865 Import eventlet patch from oslo.
This was abandoned once before: https://review.openstack.org/#/c/25781/

However this is not to do with packaging. This is required if we use
eventlet subprocess module (like we should be) in jenkins tests for
python2.6.

Also imports patch_tox_venv.py. This is a cutdown version of what would
happen in run_tests.sh but for tox environments which is how jenkins
runs tests now.

Change-Id: I369c3e464dfbe3a754f90db58785e97ac87b36c0
2013-06-05 10:02:26 +10:00
Carlos D. Garza
2bc22ef6f7 Rename requires files to standard names.
Rename tools/pip-requires to requirements.txt and tools/test-requires
    to test-requirements.txt. These are standard files, and tools in the
    general world are growing intelligence about them.

Fixes: bug #1179008
Change-Id: I1a19f0c73ab48987e2ff0dade1a57a68b65f0a22
2013-05-24 17:55:05 -05:00
Monty Taylor
444af9db83 Migrate to pbr.
Closes bug 1179007

Change-Id: I9d2a0190bb8dc31ea481909a4e0af3008aa976bf
2013-05-23 16:59:08 +02:00
Jenkins
7b99bd63e1 Merge "Accept env variables to override default passwords" 2013-05-17 17:44:51 +00: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
Monty Taylor
a4fb55e80c Migrate to flake8.
Closes bug 1172444

Change-Id: I4831946d01f05c2a10264745a07b53fa48be44c8
2013-05-13 10:08:01 -04:00
Russell Bryant
7390880e68 Sync with oslo-incubator.
Up to date as of 575e74d352d685773513218a286979bb58920246.

Change-Id: I302bd832fdd4ee6a325b600aceba525b109bb4e1
2013-03-25 10:53:08 -04:00
Mark McLoughlin
4ceaa5750b Switch to final 1.1.0 oslo.config release
Fixes bug #1128256

oslo.config has now been released to PyPI in time for Grizzly RC1 so
we can switch to using it directly.

Change-Id: I655f831718ae5f4e25e941ee206fe195214a9a91
2013-03-12 16:41:10 +00:00
Jenkins
1f7c863a9c Merge "keystone : Use Ec2Signer utility class from keystoneclient" 2013-03-06 09:42:06 +00:00
Mark McLoughlin
7f20feed09 Unpin pam dependency version
Fixes bug #1133240

keystone has always pinned the pam dependency to 0.1.4

  pam>=0.1.4

this version was released in November 2009 and there hasn't been a
release since. I can't even find a version control repo for the
project.

There's no particular reason to expect a future version would break us
and, indeed, we want to find out about it if it happens.

Change-Id: I2becf47c9d2566e2c3496ae15ca886b737006a92
2013-02-26 11:19:23 +00:00
Steven Hardy
39f12606a2 keystone : Use Ec2Signer utility class from keystoneclient
The Ec2Signer class has been moved to python-keystoneclient,
so we can remove the internal implementation and import the
keystoneclient version

blueprint ec2signer-to-keystoneclient

Change-Id: I19d8575ab8b972467ce280a6197ae762da1ce790
2013-02-26 10:08:33 +00:00
Russell Bryant
5653e8f169 Update oslo-config version.
Update the version of oslo-config in pip-requires.  This update includes
a fix for a bug that breaks oslo.config imports.

Change-Id: I2e31d3980c495b1fd16db5488c7d3c982ce069ac
2013-02-20 15:46:13 -05:00
Joe Heck
f8a32f1e71 merging in fix from oslo upstream
Change-Id: I61ae24b305df086a5c48a6d033046d84296023b2
2013-02-20 00:10:47 +00:00
Jenkins
e50a957b44 Merge "Use oslo-config-2013.1b3" 2013-02-19 18:34:50 +00:00
Jenkins
777c2d12ee Merge "Update sample_data.sh to match docs" 2013-02-19 18:33:48 +00:00