Commit Graph

268 Commits (ab5c66df45c7675d403bbc2b22ae5b04e43a942e)

Author SHA1 Message Date
Ben Nemec ab5c66df45 Revert "Switch to oslo.log"
This isn't quite right and broke on stable/liberty.  Pushing
a revert in case I3c22d77dece399d21ab94783b74990789a1e1481
doesn't actually fix the problem.  We should probably merge
whichever passes first.

This reverts commit 69653318f4.

Change-Id: I9304429f25d28ca756e50b1788e149c5bb46b1d6
2016-03-21 20:50:25 +00:00
Ben Nemec 69653318f4 Switch to oslo.log
The old oslo-incubator log module isn't maintained (and doesn't even
exist anymore), so we don't really want to be using it.  It appears
this was the only incubator module we were actually using, so this
allows us to remove all of the unmaintained incubator code.

Change-Id: Ib4ad3b231360987a1ef4f95b5b5a8b656232efc4
2016-03-17 14:40:46 +00:00
Jenkins b04605e132 Merge "Replace assertEqual(None, *) with assertIsNone in tests" 2016-03-01 22:27:59 +00:00
Andreas Jaeger 54a60ddfdd Remove argparse from requirements
argparse was external in python 2.6 but not anymore, remove it from

This should help with pip 8.0 that gets confused in this situation.
Installation of the external argparse is not needed.

Change-Id: Ib7e74912b36c1b5ccb514e31fac35efeff57378d
2016-01-20 19:18:30 +01:00
Swapnil Kulkarni (coolsvap) 8b28ced627 Replace assertEqual(None, *) with assertIsNone in tests
Replace assertEqual(None, *) with assertIsNone in tests to have
more clear messages in case of failure.

Change-Id: I2cc0d913d83ea56c323475daddb66a0047564b42
2016-01-04 19:41:10 +05:30
OpenStack Proposal Bot ba1a17a1f2 Updated from global requirements
Change-Id: I98ef86f800c2c5872e08db6fa6030ecd7085e463
2015-12-15 18:16:00 +00:00
Dan Prince b63188eb25 shorter sleeps if metadata changes are detected
This patch updates os-collect-config so that the sleep interval
time is shortened if changes are detected. This should decrease
deployment time when using Heat templates which use depends_on
to step through a sequence of software deployment resources.

The new default sleep is set to 1 and increases
by sleep_time *= 2 until it reaches the default
sleep interval again.

Change-Id: I5cbd0956db2abebec876b15bee72b70ec64d5aef
2015-10-21 16:56:21 -04:00
Jenkins b10b844fec Merge "Change ignore-errors to ignore_errors" 2015-09-25 20:49:55 +00:00
Monty Taylor 0e0eca3687 Change ignore-errors to ignore_errors
Needed for coverage 4.0

Change-Id: Ic64cbb3d42ebc605248e97bd525b9ce90e500321
2015-09-21 14:41:46 +00:00
OpenStack Proposal Bot a86bafe438 Updated from global requirements
Change-Id: Ib69d0b27507247ebee3459084fa385ff7b2fe05c
2015-09-17 12:15:44 +00:00
Thomas Herve b13122918c Add support for zaqar transport
This adds a new zaqar collector able to read configuration from a
specific zaqar queue.

blueprint software-config-zaqar
Change-Id: Ie38af7b59e7a1aa370ac7760bb7819e37c2165c3
2015-08-26 11:33:10 +02:00
Jenkins ca089dfcc2 Merge "Merge deployments data for collectors heat, request" 2015-07-02 16:37:30 +00:00
Jenkins 7f2cced83f Merge "Refactor merging out of cfn collector" 2015-07-02 16:25:53 +00:00
Steve Baker acafb1b94a Merge deployments data for collectors heat, request
This is required so that a swift-enabled TripleO undercloud can switch
to polling for metadata from a TempURL rather than heat.

Change-Id: I73ac9e01f85e0c72ce7411e2c61c545322f3dccc
Closes-Bug: #1424913
2015-06-15 09:14:33 +12:00
Steve Baker 4b68dfd53d Refactor merging out of cfn collector
This is a pure refactoring change which moves the os-apply-config
deployment data merging into its own module. This will allow
other collectors (request, heat) to do the same merging.

Partial-Bug: #1424913
Change-Id: Ic78a60e3efebadbb06ebfd262ceb275ca519a3f2
2015-06-15 09:14:29 +12:00
OpenStack Proposal Bot 004869ab5e Updated from global requirements
Change-Id: I9d0e98344c52adcfc73ecbc5afc0d1a6d6ac7e79
2015-06-04 20:04:14 +00:00
Jenkins e80616d15a Merge "Log with info instead of warn when collector not configured" 2015-06-04 17:15:33 +00:00
Jenkins 163030c081 Merge "Drop use of 'oslo' namespace package" 2015-05-29 09:40:47 +00:00
Steve Baker d2c5bd1b0e Log with info instead of warn when collector not configured
Users who are debugging unrelated issues are frequently interpreting
logged warnings as an indication that os-collect-config is misconfigured
when the warning is actually harmless.

This change uses info instead of warn for this logging.

Change-Id: I28e0fb37b603364eea72cdc5299a29259489b820
Closes-Bug: #1437952
2015-05-15 11:54:23 +12:00
Doug Hellmann 4a41f0b3e5 Drop use of 'oslo' namespace package
The Oslo libraries have moved all of their code out of the 'oslo'
namespace package into per-library packages. The namespace package was
retained during kilo for backwards compatibility, but will be removed by
the liberty-2 milestone. This change removes the use of the namespace
package, replacing it with the new package names.

The patches in the libraries will be put on hold until application
patches have landed, or L2, whichever comes first. At that point, new
versions of the libraries without namespace packages will be released as
a major version update.

Please merge this patch, or an equivalent, before L2 to avoid problems
with those library releases.

Blueprint: remove-namespace-packages

Change-Id: If51059c31c82d5235e2ae21143911b5561783ca6
2015-05-06 18:45:17 +00:00
Jenkins eefebd7682 Merge "Use non-versioned auth_url for keystone" 2015-05-06 14:27:25 +00:00
OpenStack Proposal Bot 11d69d9d3d Updated from global requirements
Change-Id: I780644b67e532cd82476a1c6ad072c99173eebfa
2015-04-24 13:03:37 +00:00
Yanyan Hu f6ca7618c4 Use non-versioned auth_url for keystone
keystoneclient discover can't get v3 auth_url using v2 auth_url. It
accepts an url without version number. This patch fixes this issue.

Change-Id: I45b4c016bd91afc39d39620920951043bb71df05
Closes-Bug: #1398254
2015-04-24 13:52:24 +02:00
OpenStack Proposal Bot 599fe89cc9 Updated from global requirements
Change-Id: I79d43903aff8d818ff1b583be2f5b46263d3b129
2015-03-21 00:16:39 +00:00
OpenStack Proposal Bot 450188d52e Updated from global requirements
Change-Id: I13c5693efba1114c8b8eaba31af10ab75985ed76
2015-03-05 04:57:02 +00:00
OpenStack Proposal Bot ed95ad3d04 Updated from global requirements
Change-Id: I5a542669fbe25cb83cfaba1f0403035dc051cde5
2015-01-08 18:50:19 +00:00
Endre Karlson c917665af9 Add ca_certificate option for SSL'd api
Change-Id: I12eb9dbbb8bee24e50ae342ffbc7356d4583a973
2014-12-05 13:59:55 +01:00
Jenkins de6d420f40 Merge "Add unit test for heat_local" 2014-11-25 17:53:11 +00:00
OpenStack Proposal Bot 8e603ed3c8 Updated from global requirements
Change-Id: I7503a6a56367f0d01a896441723df4fc3f3a7567
2014-11-20 14:11:12 +00:00
OpenStack Proposal Bot 61cb285d23 Updated from global requirements
Change-Id: I3d2eab22bfd5b35bb6d799b8b924dca147483ed1
2014-11-18 11:36:00 +00:00
Dougal Matthews 4bc37fd50e Bump hacking to 0.9.x series
Change-Id: I474266c647f31f0ad92ec9878fc03eb5a5c97f43
2014-11-13 13:11:00 +00:00
OpenStack Proposal Bot dc26874ab5 Updated from global requirements
Change-Id: I7ac9a3db15d6fff36e626d74fedfb35a5ecd0532
2014-11-10 23:28:59 +00:00
Gregory Haynes 46e950ddd1 Enable local collector by default
This is a useful collector and it seems odd to not have it on by

Change-Id: Ibc3be6ff27c6290ce32bc01d0e62acf3253545c3
2014-10-30 01:26:09 -07:00
Jenkins 72bd2854f6 Merge "Handle missing local collector directory" 2014-10-29 16:13:22 +00:00
Gregory Haynes d05f57b092 Handle missing local collector directory
We currently explode if local collector is enabled with the data
directory missing. Changing this to a warning allows us to have this
turned on by default without greatly inconveniencing users.

Change-Id: I36364ba1a0706a5a2c820eadd526f2ba424ac665
2014-10-28 13:34:48 -07:00
Steve Baker ad475ee927 Collector which does a simple HTTP GET
This change implements a collector which does an HTTP GET via
python requests to fetch the metadata.

It should work with any GET-able URL, however it is designed to
work with Swift TempURLs.

Swift objects are not consistent, so the Last-Modified header is
checked for each poll and metadata is not fetched if the last
modified is not newer than the previous successful poll.

This collector will be enabled for OS::Nova::Server
software_config_transport: POLL_TEMP_URL which is available
in the Juno release of Heat. Using POLL_TEMP_URL will result
in no metadata polling load on heat, which has historically been
an issue with tripleo scalability.

Change-Id: I22155c22bdcc3c81a5e945ca5436a8f29f196528
2014-10-17 09:40:23 +13:00
Jenkins fa3d4e34e8 Merge "Modify gitignore to ignore cover" 2014-10-16 12:48:51 +00:00
OpenStack Proposal Bot a10fed7ef2 Updated from global requirements
Change-Id: I7fd4a2770a2b9b3b6dc7d3e61a4500013d8c3195
2014-10-13 18:50:10 +00:00
OpenStack Proposal Bot c49d2dcb14 Updated from global requirements
Change-Id: I1c2823c416cebfdd5662b4c1a309c24bea237ba6
2014-10-11 22:37:04 +00:00
Gregory Haynes 6d32511dd0 Exit with error status on failed command
When we detect a failed command we log ERROR but we do not return an
error status. This makes it difficult for programs which may run
os-collect-config to detect whether a run was sucessful.

This only applies to runs which are performed with --one-time argument
as this is a straightforward case.

Change-Id: I168862e8c75c15d1ea405a417908d1284feb7b32
2014-10-09 00:20:03 -07:00
Gregory Haynes 7e913145a3 Fix py3k popen and locale test fails
A popen call is made in the Python 3 platform module which causes our
assertions for our mock'd popen to fail. Also fixing a locale issue to
use defaultlocale() rather than LC_ALL.

Co-Authored-By: Steve Kowalik <>
Change-Id: I45cdf7d921fbca5f09e5f65bd69fcee83fb7c8e4
2014-10-09 00:17:43 -07:00
Motohiro OTSUKA 3822b55d21 Add unit test for heat_local
For improving test coverage, this patch adds unit test for heat_local.

Change-Id: I000a73d8c54b5bb9c506d8674fbd963fed72e8f3
2014-09-16 10:30:00 +09:00
Motohiro OTSUKA 18afc37de6 Modify gitignore to ignore cover
Prevent generated coverage report files from being imported.

Change-Id: Id0ded3cab56c5b924f82c421fa1b6f7994b1f472
2014-09-12 15:53:50 +09:00
Jenkins 0f83ecbc2f Merge "Using keystone discover to find V3 auth_url" 2014-09-03 16:54:24 +00:00
OpenStack Proposal Bot 1a59009168 Updated from global requirements
Change-Id: Iab28cdc166c480e7892c448a8e3a62a9d4d362eb
2014-09-03 07:40:53 +00:00
Yanyan Hu 47bb4bddb2 Using keystone discover to find V3 auth_url
This patch uses keystone client discover to find correct V3
auth_url which is expected by heat collector.

Change-Id: I2b8b5a768bdeb1cd1d20fab3b4234306c1429d6d
Closes-Bug: #1341936
2014-09-03 01:46:35 -05:00
Jenkins 7d61ca940c Merge "Add support for Python 3" 2014-09-02 10:17:38 +00:00
Jenkins 5af061bc79 Merge "Sync log from oslo" 2014-09-02 09:09:08 +00:00
Steve Kowalik a3c1159ed4 Add support for Python 3
Make changes pretty much all over the code base with respect to
encoding strings and fixing imports to support Python 3.

Change-Id: Id1920129001b8e223474c1b2faf8bd9d527fe7e7
2014-09-02 16:56:18 +10:00
Steve Kowalik a776aeace9 Sync log from oslo
Update the copy of oslo's log to oslo-incubator

This is the first step towards supporting Python 3 in

Change-Id: If282091d7f0cbd4e2ce90d70c066bb11cbf56d38
2014-09-02 15:22:22 +10:00