From 0af95d2fc3163dd1bf691de580f9fa75c3b341ec Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Tue, 12 Sep 2017 08:10:53 -0400 Subject: Cleaning up yamllint warnings yamllint output: build/baremetal-environment.yaml 1:1 warning missing document start "---" (document-start) build/opnfv-environment.yaml 6:3 warning comment not indented like content (comments-indentation) 14:4 warning missing starting space in comment (comments) 123:1 warning comment not indented like content (comments-indentation) 128:1 warning comment not indented like content (comments-indentation) 156:1 warning comment not indented like content (comments-indentation) config/deploy/os-odl-fdio-dvr-ha.yaml 1:1 warning missing document start "---" (document-start) config/deploy/os-odl-fdio-dvr-noha.yaml 1:1 warning missing document start "---" (document-start) config/network/network_settings_v6.yaml 225:6 warning missing starting space in comment (comments) Change-Id: I3985ce0b6740ce4694b5d75b477cb03c3dc49c28 Signed-off-by: Dan Radez --- build/baremetal-environment.yaml | 1 + build/opnfv-environment.yaml | 12 ++++++------ config/deploy/os-odl-fdio-dvr-ha.yaml | 1 + config/deploy/os-odl-fdio-dvr-noha.yaml | 1 + config/network/network_settings_v6.yaml | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/build/baremetal-environment.yaml b/build/baremetal-environment.yaml index 677b313a..c849655e 100644 --- a/build/baremetal-environment.yaml +++ b/build/baremetal-environment.yaml @@ -1,3 +1,4 @@ +--- parameter_defaults: HeatWorkers: 12 CeilometerWorkers: 12 diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml index 0f3dd701..5b5d4500 100644 --- a/build/opnfv-environment.yaml +++ b/build/opnfv-environment.yaml @@ -3,7 +3,7 @@ # types parameters: - # # value updated via lib/overcloud-deploy-functions.sh + # value updated via lib/overcloud-deploy-functions.sh # CloudDomain: parameter_defaults: @@ -11,7 +11,7 @@ parameter_defaults: NeutronEnableForceMetadata: true NeutronEnableDHCPMetadata: true NeutronEnableIsolatedMetadata: true - #NeutronDhcpAgentsPerNetwork: 3 + # NeutronDhcpAgentsPerNetwork: 3 NeutronPluginExtensions: 'qos,port_security,data_plane_status' # TODO: VLAN Ranges should be configurable from network settings NeutronNetworkVLANRanges: 'datacentre:500:525' @@ -120,12 +120,12 @@ parameter_defaults: - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::OpenDaylightApi - OS::TripleO::Services::OpenDaylightOvs -# - OS::TripleO::Services::ONOSApi -# - OS::TripleO::Services::ONOSOvs + # - OS::TripleO::Services::ONOSApi + # - OS::TripleO::Services::ONOSOvs - OS::TripleO::Services::SensuClient - OS::TripleO::Services::FluentdClient - OS::TripleO::Services::Etcd -# - OS::TripleO::Services::Gluon + # - OS::TripleO::Services::Gluon - OS::TripleO::Services::Tacker - OS::TripleO::Services::NeutronHoneycombAgent - OS::TripleO::Services::Congress @@ -153,7 +153,7 @@ parameter_defaults: - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::NeutronSriovAgent - OS::TripleO::Services::OpenDaylightOvs -# - OS::TripleO::Services::ONOSOvs + # - OS::TripleO::Services::ONOSOvs - OS::TripleO::Services::SensuClient - OS::TripleO::Services::FluentdClient - OS::TripleO::Services::NeutronHoneycombAgent diff --git a/config/deploy/os-odl-fdio-dvr-ha.yaml b/config/deploy/os-odl-fdio-dvr-ha.yaml index 564cf0b6..6fcbec65 100644 --- a/config/deploy/os-odl-fdio-dvr-ha.yaml +++ b/config/deploy/os-odl-fdio-dvr-ha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: true diff --git a/config/deploy/os-odl-fdio-dvr-noha.yaml b/config/deploy/os-odl-fdio-dvr-noha.yaml index 24c433bd..e8788d71 100644 --- a/config/deploy/os-odl-fdio-dvr-noha.yaml +++ b/config/deploy/os-odl-fdio-dvr-noha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: false diff --git a/config/network/network_settings_v6.yaml b/config/network/network_settings_v6.yaml index 25aaee89..7dddf343 100644 --- a/config/network/network_settings_v6.yaml +++ b/config/network/network_settings_v6.yaml @@ -222,7 +222,7 @@ networks: # Subnet in CIDR format cidr: fd00:fd00:fd00:4000::/64 # VLAN tag to use for Overcloud hosts on this network - #vlan: 13 + # vlan: 13 # Api network MTU mtu: 1500 # Mapping of network configuration for Overcloud Nodes -- cgit 1.2.3-korg