From ba0ad3a65c88589c566e27fe0ce72ed9c294123e Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Fri, 13 Sep 2019 08:58:35 -0500 Subject: [PATCH] Add IPv6 condition to set to the local_address This change re-adds the local_address IPv6 condition to the kernel template. This will ensure that the local address is always set using our expected conditions. Depends-On: I20e69315bacdded4bc2d5b47e18609f130f8abc5 Change-Id: I01d0f20f6f78d235f99f51f75bcefe675dc0dee5 Signed-off-by: Kevin Carter --- deployment/kernel/kernel-baremetal-ansible.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/deployment/kernel/kernel-baremetal-ansible.yaml b/deployment/kernel/kernel-baremetal-ansible.yaml index 48d9f7ff9b..3b981d2f07 100644 --- a/deployment/kernel/kernel-baremetal-ansible.yaml +++ b/deployment/kernel/kernel-baremetal-ansible.yaml @@ -91,6 +91,9 @@ parameters: tags: - role_specific +conditions: + ipv6_disabled: {equals: [{get_param: KernelDisableIPv6}, 1]} + resources: # Merging role-specific parameters (RoleParameters) with the default parameters. # RoleParameters will have the precedence over the default parameters. @@ -119,6 +122,11 @@ outputs: - include_role: name: tripleo-kernel ansible_group_vars: + hieradata_localhost_address: + if: + - ipv6_disabled + - '127.0.0.1' + - 'localhost' tripleo_kernel_extra_modules: {get_attr: [RoleParametersValue, value, extra_kernel_modules]} tripleo_kernel_extra_packages: {get_attr: [RoleParametersValue, value, extra_kernel_packages]} tripleo_kernel_sysctl_extra_settings: