Skip to content

Commit d16b231

Browse files
committed
Fix yaml linting issue
Co-Authored-By: John Fulton <fulton@redhat.com> Signed-off-by: Oliver Walsh <owalsh@redhat.com>
1 parent 5b39b81 commit d16b231

8 files changed

Lines changed: 130 additions & 135 deletions

File tree

scenarios/dcn_nostorage/central/config_download.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,14 @@ parameter_defaults:
9292
ComputeNetworkConfigTemplate: /home/stack/central/network/spine-leaf-nics/compute0.j2
9393
ComputeParameters:
9494
NeutronBridgeMappings:
95-
- leaf0:br-ex
95+
- leaf0:br-ex
9696
ControllerNetworkConfigTemplate: /home/stack/central/network/spine-leaf-nics/controller0.j2
9797
ControllerParameters:
9898
NeutronBridgeMappings:
99-
- leaf0:br-ex
99+
- leaf0:br-ex
100100
DnsServers:
101-
- 10.11.5.19
102-
- 10.5.30.160
101+
- 10.11.5.19
102+
- 10.5.30.160
103103
NeutronEnableDVR: 'false'
104104
NeutronFlatNetworks: leaf0,leaf1,leaf2
105105
NeutronNetworkType: geneve
@@ -108,8 +108,8 @@ parameter_defaults:
108108
NovaComputeAvailabilityZone: az-central
109109
NovaCrossAZAttach: false
110110
NtpServer:
111-
- clock.redhat.com
112-
- clock2.redhat.com
111+
- clock.redhat.com
112+
- clock2.redhat.com
113113
PythonInterpreter: /usr/bin/python3
114114
RootStackName: central
115115
VipSubnetMap:

scenarios/dcn_nostorage/central/roles.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
OVNCMSOptions: "enable-chassis-as-gw"
3232
# Deprecated & backward-compatible values (FIXME: Make parameters consistent)
3333
# Set uses_deprecated_params to True if any deprecated params are used.
34-
uses_deprecated_params: True
34+
uses_deprecated_params: true
3535
deprecated_param_extraconfig: 'controllerExtraConfig'
3636
deprecated_param_flavor: 'OvercloudControlFlavor'
3737
deprecated_param_image: 'controllerImage'
@@ -207,7 +207,7 @@
207207
# Set uses_deprecated_params to True if any deprecated params are used.
208208
# These deprecated_params only need to be used for existing roles and not for
209209
# composable roles.
210-
uses_deprecated_params: True
210+
uses_deprecated_params: true
211211
deprecated_param_image: 'NovaImage'
212212
deprecated_param_extraconfig: 'NovaComputeExtraConfig'
213213
deprecated_param_metadata: 'NovaComputeServerMetadata'
@@ -261,4 +261,4 @@
261261
- OS::TripleO::Services::Tuned
262262
- OS::TripleO::Services::Vpp
263263
- OS::TripleO::Services::OVNController
264-
- OS::TripleO::Services::OVNMetadataAgent
264+
- OS::TripleO::Services::OVNMetadataAgent

scenarios/dcn_nostorage/dcn1/config_download.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ parameter_defaults:
4545
ControllerExtraConfig:
4646
nova::compute::libvirt::services::libvirt_virt_type: qemu
4747
nova::compute::libvirt::virt_type: qemu
48+
nova::availability_zone::default_schedule_zone: az-central
4849
ComputeDcn1ExtraConfig:
4950
nova::compute::libvirt::services::libvirt_virt_type: qemu
5051
nova::compute::libvirt::virt_type: qemu
@@ -101,9 +102,6 @@ parameter_defaults:
101102
name: leaf2
102103
ip_version: 4
103104

104-
BondInterfaceOvsOptions: bond_mode=active-backup
105-
ControllerExtraConfig:
106-
nova::availability_zone::default_schedule_zone: az-central
107105
VipSubnetMap:
108106
ctlplane: leaf1
109107
NeutronFlatNetworks: leaf0,leaf1,leaf2
@@ -113,12 +111,12 @@ parameter_defaults:
113111
NeutronBridgeMappings: ["leaf1:br-ex"]
114112
PythonInterpreter: /usr/bin/python3
115113
DnsServers: ['10.11.5.19', '10.5.30.160']
116-
NtpServer: ["clock.redhat.com","clock2.redhat.com"]
114+
NtpServer: ["clock.redhat.com", "clock2.redhat.com"]
117115
NovaComputeAvailabilityZone: az-dcn1
118-
NovaCrossAZAttach: False
116+
NovaCrossAZAttach: false
119117
RootStackName: dcn1
120118
AuthCloudName: 'central'
121-
ManageNetworks: False
119+
ManageNetworks: false
122120

123121
NeutronNetworkType: geneve
124122
NeutronTunnelTypes: geneve

scenarios/dcn_nostorage/dcn1/roles.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# Set uses_deprecated_params to True if any deprecated params are used.
2626
# These deprecated_params only need to be used for existing roles and not for
2727
# composable roles.
28-
uses_deprecated_params: True
28+
uses_deprecated_params: true
2929
deprecated_param_image: 'NovaImage'
3030
deprecated_param_extraconfig: 'NovaComputeExtraConfig'
3131
deprecated_param_metadata: 'NovaComputeServerMetadata'
@@ -79,4 +79,4 @@
7979
- OS::TripleO::Services::Tuned
8080
- OS::TripleO::Services::Vpp
8181
- OS::TripleO::Services::OVNController
82-
- OS::TripleO::Services::OVNMetadataAgent
82+
- OS::TripleO::Services::OVNMetadataAgent

scenarios/dcn_nostorage/dcn1/vips_data.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
subnet: storage_leaf1
1414
- network: storage_mgmt
1515
dns_name: overcloud
16-
subnet: storage_mgmt_leaf1
16+
subnet: storage_mgmt_leaf1

scenarios/dcn_nostorage/dcn2/config_download.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ parameter_defaults:
4545
ControllerExtraConfig:
4646
nova::compute::libvirt::services::libvirt_virt_type: qemu
4747
nova::compute::libvirt::virt_type: qemu
48+
nova::availability_zone::default_schedule_zone: az-central
4849
ComputeDcn2ExtraConfig:
4950
nova::compute::libvirt::services::libvirt_virt_type: qemu
5051
nova::compute::libvirt::virt_type: qemu
@@ -101,9 +102,6 @@ parameter_defaults:
101102
name: leaf2
102103
ip_version: 4
103104

104-
BondInterfaceOvsOptions: bond_mode=active-backup
105-
ControllerExtraConfig:
106-
nova::availability_zone::default_schedule_zone: az-central
107105
VipSubnetMap:
108106
ctlplane: leaf2
109107
NeutronFlatNetworks: leaf0,leaf1,leaf2
@@ -113,12 +111,12 @@ parameter_defaults:
113111
NeutronBridgeMappings: ["leaf2:br-ex"]
114112
PythonInterpreter: /usr/bin/python3
115113
DnsServers: ['10.11.5.19', '10.5.30.160']
116-
NtpServer: ["clock.redhat.com","clock2.redhat.com"]
114+
NtpServer: ["clock.redhat.com", "clock2.redhat.com"]
117115
NovaComputeAvailabilityZone: az-dcn2
118-
NovaCrossAZAttach: False
116+
NovaCrossAZAttach: false
119117
RootStackName: dcn2
120118
AuthCloudName: 'central'
121-
ManageNetworks: False
119+
ManageNetworks: false
122120

123121
NeutronNetworkType: geneve
124122
NeutronTunnelTypes: geneve

scenarios/dcn_nostorage/dcn2/roles.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# Set uses_deprecated_params to True if any deprecated params are used.
2626
# These deprecated_params only need to be used for existing roles and not for
2727
# composable roles.
28-
uses_deprecated_params: True
28+
uses_deprecated_params: true
2929
deprecated_param_image: 'NovaImage'
3030
deprecated_param_extraconfig: 'NovaComputeExtraConfig'
3131
deprecated_param_metadata: 'NovaComputeServerMetadata'

0 commit comments

Comments
 (0)