From: Robert Eby Date: Tue, 1 Oct 2019 17:54:33 +0000 (-0400) Subject: Fixed yamllint problems in two YAML files X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=rec.git;a=commitdiff_plain;h=60a3d0bb8aae8f9afb610b0cfa8b79631cdf98ff Fixed yamllint problems in two YAML files Signed-off-by: Robert Eby Change-Id: If455749a25e5b98e295a8c789232d43a4da215c2 --- diff --git a/REC_blueprint.yaml b/REC_blueprint.yaml index 46251ad..e4f6a86 100644 --- a/REC_blueprint.yaml +++ b/REC_blueprint.yaml @@ -1,25 +1,46 @@ +# +# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# This file defines version 1.0.0 of the REC (Radio Edge Cloud) blueprint, +# for use by the regional controller). It should be loaded into the RC +# (using the "rc_cli blueprint create" command) before a POD is created. +# +--- blueprint: 1.0.0 name: Radio Edge Cloud version: 1.0.0 -description: This Blueprint defines an instance of the Radio Edge Cloud (from the - Telco Appliance family of blueprints). +description: This Blueprint defines an instance of the Radio Edge Cloud + (from the Telco Appliance family of blueprints). yaml: # Required hardware profiles (can match on either UUID or name) # Note: UUIDs would likely require a global registry of HW profiles. hardware_profile: or: - - { uuid: 8a17384a-71d4-11e9-9e4c-0017f20fe1b8 } - - { uuid: 9897a008-71d4-11e9-8bda-0017f20dbff8 } - - { uuid: a4b4a570-71d4-11e9-adc2-0017f208759e } + - {uuid: 8a17384a-71d4-11e9-9e4c-0017f20fe1b8} + - {uuid: 9897a008-71d4-11e9-8bda-0017f20dbff8} + - {uuid: a4b4a570-71d4-11e9-adc2-0017f208759e} workflow: # Workflow that is invoked when the POD is created create: url: 'http://www.example.org/blueprints/REC/REC_create.py' components: - # This script is used to generate self-signed certs for the remote-installer + # This script is used by the REC_create.py workflow to generate + # self-signed certs for the remote-installer - 'http://www.example.org/blueprints/REC/gencerts.sh' input_schema: - iso_primary: { type: string } - iso_secondary: { type: string } - input_yaml: { type: string } - rc_host: { type: string } + iso_primary: {type: string} + iso_secondary: {type: string} + input_yaml: {type: string} + rc_host: {type: string} diff --git a/objects.yaml b/objects.yaml index 1c82ee6..682df84 100644 --- a/objects.yaml +++ b/objects.yaml @@ -13,16 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# This file maps out the MT REC CD laboratory hardware, in terms of hardware profiles, -# regions, edgesites, and nodes. This can all be loaded into the RC via the -# ``rc_loaddata.sh'' tool. +# This file maps out the laboratory hardware for an example laboratory, in +# terms of hardware profiles, regions, edgesites, and nodes. This can all +# be loaded into the RC via the ``rc_loaddata.sh'' tool. # -# Changes should be made to this file, which will be run against the RC before every CD job. -# -# Source: -# https://tspace.web.att.com/files/app/file/e654e429-dd1e-4775-8449-3ccd4496a13f -# https://wiki.web.att.com/display/CloudArch/Row+4+Rack+6 +# Changes should be made to this file, which will be run against the RC before +# every CD job. # +--- hardware: Nokia_OE19: uuid: 8a17384a-71d4-11e9-9e4c-0017f20fe1b8 @@ -53,8 +51,8 @@ hardware: edgesites: REC_Edgesite: description: The first REC cluster - nodes: [ node1, node2, node3, node4, node5 ] - regions: [ 00000000-0000-0000-0000-000000000000 ] + nodes: [node1, node2, node3, node4, node5] + regions: [00000000-0000-0000-0000-000000000000] nodes: node1: