From c00a559b1a7fea33464b8b4ef90045b232c7a289 Mon Sep 17 00:00:00 2001 From: Saravanan KR Date: Wed, 25 Jul 2018 12:14:48 +0530 Subject: [PATCH] Remove HostnameFormatDefault from NFV roles Value of HostnameFormatDefault defined in role/*.yaml files is redundant as the default value in the templates sets the same value as the role name in the lowercase. With the patch Ifa60eae1ad09b2ceac207114c40c714a6fc67cbc merged, it is possible to generate multiple roles out of the defined roles. The default value of the {{role.name}}HostnameFormat in overcloud.j2.yaml will apply the same format with role name in lower case, having this default will override all generated roles with same format. Removing the default from roles will ensure that the default value is set as per the role name. As NFV roles are mostly hardware associated, it is important change for these roles, though the same can be extended to all role definitions. Change-Id: I701bc86034a3b75ca05ae08214dcbb2d9c6c7483 --- roles/ComputeOvsDpdk.yaml | 1 - roles/ComputeOvsDpdkRT.yaml | 1 - roles/ComputeSriov.yaml | 1 - roles/ComputeSriovRT.yaml | 1 - 4 files changed, 4 deletions(-) diff --git a/roles/ComputeOvsDpdk.yaml b/roles/ComputeOvsDpdk.yaml index ead32080bf..a851cbfaf7 100644 --- a/roles/ComputeOvsDpdk.yaml +++ b/roles/ComputeOvsDpdk.yaml @@ -9,7 +9,6 @@ - InternalApi - Tenant - Storage - HostnameFormatDefault: '%stackname%-computeovsdpdk-%index%' deprecated_nic_config_name: 'compute-dpdk.yaml' RoleParametersDefault: TunedProfileName: "cpu-partitioning" diff --git a/roles/ComputeOvsDpdkRT.yaml b/roles/ComputeOvsDpdkRT.yaml index 78367357d7..bef9fd9171 100644 --- a/roles/ComputeOvsDpdkRT.yaml +++ b/roles/ComputeOvsDpdkRT.yaml @@ -9,7 +9,6 @@ - InternalApi - Tenant - Storage - HostnameFormatDefault: '%stackname%-computeovsdpdkrt-%index%' ImageDefault: overcloud-realtime-compute RoleParametersDefault: VhostuserSocketGroup: "hugetlbfs" diff --git a/roles/ComputeSriov.yaml b/roles/ComputeSriov.yaml index 9d10ea5bc3..d7f61be808 100644 --- a/roles/ComputeSriov.yaml +++ b/roles/ComputeSriov.yaml @@ -9,7 +9,6 @@ - InternalApi - Tenant - Storage - HostnameFormatDefault: '%stackname%-computesriov-%index%' RoleParametersDefault: TunedProfileName: "cpu-partitioning" ServicesDefault: diff --git a/roles/ComputeSriovRT.yaml b/roles/ComputeSriovRT.yaml index bd3ccb5cb5..4baa0b0ffa 100644 --- a/roles/ComputeSriovRT.yaml +++ b/roles/ComputeSriovRT.yaml @@ -9,7 +9,6 @@ - InternalApi - Tenant - Storage - HostnameFormatDefault: '%stackname%-computesriovrt-%index%' ImageDefault: overcloud-realtime-compute RoleParametersDefault: TunedProfileName: "realtime-virtual-host"