openstack
/
bifrost
Code Issues Proposed changes

Force local connection for localhost 

Starting with Ansible 2.9.10, the "Collecting node facts" task in
bifrost-configdrives-dynamic can fail because it tries to SSH to
localhost, which may not be possible in some environments, such as
Bifrost deployed as a container by Kolla.

Change-Id: I1ed19e325db9396ff6b250e14c967ce90c785201
Story: 2008260
Task: 41118
This commit is contained in:
Pierre Riteau 2020-10-19 22:52:27 +02:00
parent a04b285434
commit a6c56c6647
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bifrost/inventory.py
View File

@ -164,7 +164,7 @@ def _parse_config():
def _prepare_inventory():
hostvars = {}
hostvars = {"127.0.0.1": {"ansible_connection": "local"}}
groups = {}
groups.update({'baremetal': {'hosts': []}})
groups.update({'localhost': {'hosts': ["127.0.0.1"]}})

2
bifrost/tests/functional/test_inventory_functional.py
View File

@ -53,6 +53,7 @@ class TestBifrostInventoryFunctional(base.TestCase):
"host_groups": ["baremetal", "nova"]}}""".replace('\n', '')
(groups, hostvars) = utils.bifrost_data_conversion(
yaml.safe_dump(json.loads(str(expected_hostvars))))
del hostvars['127.0.0.1']
self.assertDictEqual(json.loads(str(expected_hostvars)), hostvars)
def test_minimal_json(self):
@ -66,4 +67,5 @@ ipmi_password":"ADMIN"}},"driver":"ipmi"}}""".replace('\n', '')
ipmi_password":"ADMIN"}},"driver":"ipmi","addressing_mode":
"dhcp","host_groups": ["baremetal"]}}""".replace('\n', '')
(groups, hostvars) = utils.bifrost_data_conversion(input_json)
del hostvars['127.0.0.1']
self.assertDictEqual(json.loads(str(expected_json)), hostvars)

3
bifrost/tests/unit/test_inventory.py
View File

@ -33,7 +33,8 @@ class TestBifrostInventoryUnit(base.TestCase):
(groups, hostvars) = inventory._prepare_inventory()
self.assertIn("baremetal", groups)
self.assertIn("localhost", groups)
self.assertDictEqual(hostvars, {})
self.assertDictEqual(
hostvars, {'127.0.0.1': {'ansible_connection': 'local'}})
localhost_value = dict(hosts=["127.0.0.1"])
self.assertDictEqual(localhost_value, groups['localhost'])