Browse Source

Make RoleParameters and key_name descriptions consistent

The key_name default is ignored because the parameter is used in
some mutually exclusive environments where the default doesn't
need to be the same.

Change-Id: I77c1a1159fae38d03b0e59b80ae6bee491d734d7
Partial-Bug: 1700664
changes/39/483539/7
Ben Nemec 5 years ago
parent
commit
4502b7cba6
  1. 2
      common/services.yaml
  2. 1
      deployed-server/deployed-server.yaml
  3. 2
      extraconfig/pre_network/contrail/compute_pre_network.yaml
  4. 2
      extraconfig/pre_network/contrail/contrail_dpdk_pre_network.yaml
  5. 2
      extraconfig/pre_network/host_config_and_reboot.yaml
  6. 2
      puppet/blockstorage-role.yaml
  7. 2
      puppet/cephstorage-role.yaml
  8. 2
      puppet/compute-role.yaml
  9. 2
      puppet/controller-role.yaml
  10. 2
      puppet/objectstorage-role.yaml
  11. 2
      puppet/role.role.j2.yaml
  12. 3
      tools/yaml-validate.py

2
common/services.yaml

@ -35,7 +35,7 @@ parameters:
description: Role name on which the service is applied
type: string
RoleParameters:
description: Role Specific parameters to be provided to service
description: Parameters specific to the role
default: {}
type: json

1
deployed-server/deployed-server.yaml

@ -9,6 +9,7 @@ parameters:
key_name:
type: string
default: unused
description: Name of keypair to assign to servers
security_groups:
type: json
default: []

2
extraconfig/pre_network/contrail/compute_pre_network.yaml

@ -34,7 +34,7 @@ parameters:
type: string
RoleParameters:
type: json
description: Role Specific parameters
description: Parameters specific to the role
default: {}
ServiceNames:
type: comma_delimited_list

2
extraconfig/pre_network/contrail/contrail_dpdk_pre_network.yaml

@ -38,7 +38,7 @@ parameters:
type: string
RoleParameters:
type: json
description: Role Specific parameters
description: Parameters specific to the role
default: {}
ServiceNames:
type: comma_delimited_list

2
extraconfig/pre_network/host_config_and_reboot.yaml

@ -9,7 +9,7 @@ parameters:
type: string
RoleParameters:
type: json
description: Role Specific parameters
description: Parameters specific to the role
default: {}
ServiceNames:
type: comma_delimited_list

2
puppet/blockstorage-role.yaml

@ -141,7 +141,7 @@ parameters:
parameter is generated from the parent template.
RoleParameters:
type: json
description: Role Specific Parameters
description: Parameters specific to the role
default: {}
DeploymentSwiftDataMap:
type: json

2
puppet/cephstorage-role.yaml

@ -147,7 +147,7 @@ parameters:
parameter is generated from the parent template.
RoleParameters:
type: json
description: Role Specific Parameters
description: Parameters specific to the role
default: {}
DeploymentSwiftDataMap:
type: json

2
puppet/compute-role.yaml

@ -159,7 +159,7 @@ parameters:
parameter is generated from the parent template.
RoleParameters:
type: json
description: Role Specific Parameters
description: Parameters specific to the role
default: {}
DeploymentSwiftDataMap:
type: json

2
puppet/controller-role.yaml

@ -173,7 +173,7 @@ parameters:
parameter is generated from the parent template.
RoleParameters:
type: json
description: Role Specific Parameters
description: Parameters specific to the role
default: {}
DeploymentSwiftDataMap:
type: json

2
puppet/objectstorage-role.yaml

@ -141,7 +141,7 @@ parameters:
parameter is generated from the parent template.
RoleParameters:
type: json
description: Role Specific Parameters
description: Parameters specific to the role
default: {}
DeploymentSwiftDataMap:
type: json

2
puppet/role.role.j2.yaml

@ -180,7 +180,7 @@ parameters:
parameter is generated from the parent template.
RoleParameters:
type: json
description: Role Specific Parameters
description: Parameters specific to the role
default: {}
DeploymentSwiftDataMap:
type: json

3
tools/yaml-validate.py

@ -58,6 +58,7 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
'TenantAllocationPools': ['default'],
'InternalApiNetCidr': ['default'],
'UpdateIdentifier': ['description'],
'key_name': ['default'],
# TODO(bnemec): Address these existing
# inconsistencies.
'NeutronMetadataProxySharedSecret': [
@ -111,7 +112,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
'StorageNetName': ['description'],
'ManagementNetName': ['description'],
'NeutronPublicInterface': ['description'],
'RoleParameters': ['description'],
'ManagementInterfaceDefaultRoute':
['default'],
'image': ['description', 'default'],
@ -126,7 +126,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
'replacement_policy': ['default'],
'StorageMgmtIpSubnet': ['description'],
'CloudDomain': ['description', 'default'],
'key_name': ['default', 'description'],
'EnableLoadBalancer': ['description'],
'ControllerExtraConfig': ['description'],
'NovaComputeExtraConfig': ['description'],

Loading…
Cancel
Save