openstack/os-collect-config
Code Issues Proposed changes

Revert "Treat ec2 collector data as immutable"

Browse Source 
All CI jobs are timing out currently during NetworkDeployment
because 99-refresh-completed is not signaling to Heat due to
instance-id being detected as null by os-apply-config.

I suspect this patch is causing the issue.

This reverts commit 8717436db99a84588532e792f8c9ea909f3e3628.

Change-Id: Id0d122d7e855cd828a0742dabc5f7089fb6a913c
Closes-Bug: 1623754
This commit is contained in:
James Slagle 2016-09-14 16:02:00 +00:00
parent 8717436db9
commit 9ee07c96c2
5 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os_collect_config/collect.py
View File

@ -170,10 +170,6 @@ def collect_all(collectors, store=False, collector_kwargs_map=None):
except exc.SourceNotConfigured: except exc.SourceNotConfigured:
logger.debug('Source [%s] Not configured.' % collector) logger.debug('Source [%s] Not configured.' % collector)
continue continue
except exc.SourceAlreadyCollected:
logger.debug('Source [%s] Already collected and cached.'
% collector)
continue
if store: if store:
for output_key, output_content in content: for output_key, output_content in content:

6
os_collect_config/ec2.py
View File

@ -13,12 +13,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import os
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log from oslo_log import log
from os_collect_config import cache
from os_collect_config import common from os_collect_config import common
from os_collect_config import exc from os_collect_config import exc
@ -63,8 +60,5 @@ class Collector(object):
return content return content
def collect(self): def collect(self):
cache_path = cache.get_path('ec2')
if os.path.exists(cache_path):
raise exc.Ec2MetadataAlreadyCollected()
root_url = '%s/' % (CONF.ec2.metadata_url) root_url = '%s/' % (CONF.ec2.metadata_url)
return [('ec2', self._fetch_metadata(root_url, CONF.ec2.timeout))] return [('ec2', self._fetch_metadata(root_url, CONF.ec2.timeout))]

8
os_collect_config/exc.py
View File

@ -22,18 +22,10 @@ class SourceNotConfigured(RuntimeError):
"""The requested data source is not configured.""" """The requested data source is not configured."""
class SourceAlreadyCollected(RuntimeError):
"""The requested data source is immutable and already cached."""
class Ec2MetadataNotAvailable(SourceNotAvailable): class Ec2MetadataNotAvailable(SourceNotAvailable):
"""The EC2 metadata service is not available.""" """The EC2 metadata service is not available."""
class Ec2MetadataAlreadyCollected(SourceAlreadyCollected):
"""The EC2 metadata has already been fetched and cached."""
class CfnMetadataNotAvailable(SourceNotAvailable): class CfnMetadataNotAvailable(SourceNotAvailable):
"""The cfn metadata service is not available.""" """The cfn metadata service is not available."""

8
os_collect_config/tests/test_collect.py
View File

@ -447,10 +447,6 @@ class TestCollectAll(testtools.TestCase):
cache.commit(changed) cache.commit(changed)
(changed_keys, paths2) = self._call_collect_all(store=True) (changed_keys, paths2) = self._call_collect_all(store=True)
self.assertEqual(set(), changed_keys) self.assertEqual(set(), changed_keys)
# check the second collect skips ec2, it has already been cached.
ec2_path = os.path.join(self.cache_dir.path, 'ec2.json')
paths.remove(ec2_path)
self.assertEqual(paths, paths2) self.assertEqual(paths, paths2)
def test_collect_all_no_change_softwareconfig(self): def test_collect_all_no_change_softwareconfig(self):
@ -481,10 +477,6 @@ class TestCollectAll(testtools.TestCase):
(changed_keys, paths2) = self._call_collect_all( (changed_keys, paths2) = self._call_collect_all(
store=True, collector_kwargs_map=soft_config_map) store=True, collector_kwargs_map=soft_config_map)
self.assertEqual(set(), changed_keys) self.assertEqual(set(), changed_keys)
# check the second collect skips ec2, it has already been cached.
ec2_path = os.path.join(self.cache_dir.path, 'ec2.json')
paths.remove(ec2_path)
self.assertEqual(paths, paths2) self.assertEqual(paths, paths2)
def test_collect_all_nostore(self): def test_collect_all_nostore(self):

15
os_collect_config/tests/test_ec2.py
View File

@ -13,12 +13,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import json
import os
import uuid import uuid
import fixtures import fixtures
from oslo_config import cfg
import requests import requests
import six.moves.urllib.parse as urlparse import six.moves.urllib.parse as urlparse
import testtools import testtools
@ -117,15 +114,3 @@ class TestEc2(testtools.TestCase):
collect_ec2 = ec2.Collector(requests_impl=FakeFailRequests) collect_ec2 = ec2.Collector(requests_impl=FakeFailRequests)
self.assertRaises(exc.Ec2MetadataNotAvailable, collect_ec2.collect) self.assertRaises(exc.Ec2MetadataNotAvailable, collect_ec2.collect)
self.assertIn('Forbidden', self.log.output) self.assertIn('Forbidden', self.log.output)
def test_collect_ec2_collected(self):
collect.setup_conf()
cache_dir = self.useFixture(fixtures.TempDir())
self.addCleanup(cfg.CONF.reset)
cfg.CONF.set_override('cachedir', cache_dir.path)
ec2_path = os.path.join(cache_dir.path, 'ec2.json')
with open(ec2_path, 'w') as f:
json.dump(META_DATA, f)
collect_ec2 = ec2.Collector(requests_impl=FakeFailRequests)
self.assertRaises(exc.Ec2MetadataAlreadyCollected, collect_ec2.collect)