aboutsummaryrefslogtreecommitdiff
path: root/kolla_ansible/tests
diff options
context:
space:
mode:
authorMark Goddard <mark@stackhpc.com>2021-05-13 12:21:11 +0100
committerMark Goddard <mark@stackhpc.com>2021-06-23 10:38:06 +0100
commitade5bfa302f131cf1111a61ec95c6cddc3827e04 (patch)
tree67ea5065d474f47d8440ae80cef71974795faba4 /kolla_ansible/tests
parent46e4f5a33a1d9a7f2f15c1522eb762a4ef4edd0d (diff)
downloadkolla-ansible-ade5bfa302f131cf1111a61ec95c6cddc3827e04.tar.gz
kolla-ansible-ade5bfa302f131cf1111a61ec95c6cddc3827e04.zip
Use ansible_facts to reference facts
By default, Ansible injects a variable for every fact, prefixed with ansible_. This can result in a large number of variables for each host, which at scale can incur a performance penalty. Ansible provides a configuration option [0] that can be set to False to prevent this injection of facts. In this case, facts should be referenced via ansible_facts.<fact>. This change updates all references to Ansible facts within Kolla Ansible from using individual fact variables to using the items in the ansible_facts dictionary. This allows users to disable fact variable injection in their Ansible configuration, which may provide some performance improvement. This change disables fact variable injection in the ansible configuration used in CI, to catch any attempts to use the injected variables. [0] https://docs.ansible.com/ansible/latest/reference_appendices/config.html#inject-facts-as-vars Change-Id: I7e9d5c9b8b9164d4aee3abb4e37c8f28d98ff5d1 Partially-Implements: blueprint performance-improvements
Diffstat (limited to 'kolla_ansible/tests')
-rw-r--r--kolla_ansible/tests/unit/test_address_filters.py188
1 files changed, 103 insertions, 85 deletions
diff --git a/kolla_ansible/tests/unit/test_address_filters.py b/kolla_ansible/tests/unit/test_address_filters.py
index 43bfc568a..338afb130 100644
--- a/kolla_ansible/tests/unit/test_address_filters.py
+++ b/kolla_ansible/tests/unit/test_address_filters.py
@@ -84,9 +84,11 @@ class TestKollaAddressFilter(unittest.TestCase):
'primary': {
'api_address_family': 'ipv4',
'api_interface': 'fake-interface',
- 'ansible_fake_interface': {
- 'ipv4': {
- 'address': addr,
+ 'ansible_facts': {
+ 'fake_interface': {
+ 'ipv4': {
+ 'address': addr,
+ },
},
},
},
@@ -103,14 +105,16 @@ class TestKollaAddressFilter(unittest.TestCase):
'enable_haproxy': 'yes',
'api_address_family': 'ipv6',
'api_interface': 'fake-interface',
- 'ansible_fake_interface': {
- 'ipv6': [
- {
- 'address': addr,
- 'scope': 'global',
- 'prefix': 64,
- },
- ],
+ 'ansible_facts': {
+ 'fake_interface': {
+ 'ipv6': [
+ {
+ 'address': addr,
+ 'scope': 'global',
+ 'prefix': 64,
+ },
+ ],
+ },
},
},
},
@@ -124,7 +128,9 @@ class TestKollaAddressFilter(unittest.TestCase):
'primary': {
'api_address_family': 'ipv6',
'api_interface': 'fake-interface',
- 'ansible_fake_interface': {
+ 'ansible_facts': {
+ 'fake_interface': {
+ },
},
},
},
@@ -140,24 +146,26 @@ class TestKollaAddressFilter(unittest.TestCase):
'enable_haproxy': 'yes',
'api_address_family': 'ipv6',
'api_interface': 'fake-interface',
- 'ansible_fake_interface': {
- 'ipv6': [
- {
- 'address': addr,
- 'scope': 'global',
- 'prefix': 64,
- },
- {
- 'address': addr + '1',
- 'scope': 'link',
- 'prefix': 64,
- },
- {
- 'address': addr + '2',
- 'scope': 'global',
- 'prefix': 64,
- },
- ],
+ 'ansible_facts': {
+ 'fake_interface': {
+ 'ipv6': [
+ {
+ 'address': addr,
+ 'scope': 'global',
+ 'prefix': 64,
+ },
+ {
+ 'address': addr + '1',
+ 'scope': 'link',
+ 'prefix': 64,
+ },
+ {
+ 'address': addr + '2',
+ 'scope': 'global',
+ 'prefix': 64,
+ },
+ ],
+ },
},
},
},
@@ -172,19 +180,21 @@ class TestKollaAddressFilter(unittest.TestCase):
'primary': {
'api_address_family': 'ipv6',
'api_interface': 'fake-interface',
- 'ansible_fake_interface': {
- 'ipv6': [
- {
- 'address': addr,
- 'scope': 'link',
- 'prefix': 64,
- },
- {
- 'address': addr + '1',
- 'scope': 'link',
- 'prefix': 64,
- },
- ],
+ 'ansible_facts': {
+ 'fake_interface': {
+ 'ipv6': [
+ {
+ 'address': addr,
+ 'scope': 'link',
+ 'prefix': 64,
+ },
+ {
+ 'address': addr + '1',
+ 'scope': 'link',
+ 'prefix': 64,
+ },
+ ],
+ },
},
},
},
@@ -200,14 +210,16 @@ class TestKollaAddressFilter(unittest.TestCase):
'enable_haproxy': 'yes',
'api_address_family': 'ipv6',
'api_interface': 'fake-interface',
- 'ansible_fake_interface': {
- 'ipv6': [
- {
- 'address': addr,
- 'scope': 'global',
- 'prefix': 128,
- },
- ],
+ 'ansible_facts': {
+ 'fake_interface': {
+ 'ipv6': [
+ {
+ 'address': addr,
+ 'scope': 'global',
+ 'prefix': 128,
+ },
+ ],
+ },
},
},
},
@@ -224,19 +236,21 @@ class TestKollaAddressFilter(unittest.TestCase):
'kolla_internal_vip_address': addr + '1',
'api_address_family': 'ipv6',
'api_interface': 'fake-interface',
- 'ansible_fake_interface': {
- 'ipv6': [
- {
- 'address': addr + '1',
- 'scope': 'global',
- 'prefix': 128,
- },
- {
- 'address': addr,
- 'scope': 'global',
- 'prefix': 128,
- },
- ],
+ 'ansible_facts': {
+ 'fake_interface': {
+ 'ipv6': [
+ {
+ 'address': addr + '1',
+ 'scope': 'global',
+ 'prefix': 128,
+ },
+ {
+ 'address': addr,
+ 'scope': 'global',
+ 'prefix': 128,
+ },
+ ],
+ },
},
},
},
@@ -253,19 +267,21 @@ class TestKollaAddressFilter(unittest.TestCase):
'kolla_external_vip_address': addr + '1',
'api_address_family': 'ipv6',
'api_interface': 'fake-interface',
- 'ansible_fake_interface': {
- 'ipv6': [
- {
- 'address': addr + '1',
- 'scope': 'global',
- 'prefix': 128,
- },
- {
- 'address': addr,
- 'scope': 'global',
- 'prefix': 128,
- },
- ],
+ 'ansible_facts': {
+ 'fake_interface': {
+ 'ipv6': [
+ {
+ 'address': addr + '1',
+ 'scope': 'global',
+ 'prefix': 128,
+ },
+ {
+ 'address': addr,
+ 'scope': 'global',
+ 'prefix': 128,
+ },
+ ],
+ },
},
},
},
@@ -283,14 +299,16 @@ class TestKollaAddressFilter(unittest.TestCase):
'kolla_internal_vip_address': addr,
'api_address_family': 'ipv6',
'api_interface': 'fake-interface',
- 'ansible_fake_interface': {
- 'ipv6': [
- {
- 'address': addr,
- 'scope': 'global',
- 'prefix': 128,
- },
- ],
+ 'ansible_facts': {
+ 'fake_interface': {
+ 'ipv6': [
+ {
+ 'address': addr,
+ 'scope': 'global',
+ 'prefix': 128,
+ },
+ ],
+ },
},
},
},