From ff8a684abb229ce0160440291abb0e92604c809e Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 12 Jan 2018 19:45:21 +0100 Subject: [PDF] Fix yamllint issues in installer adapters Although current YAML files in Pharos are all valid according to yamllint, the resulting YAMLs after PDF/IDF + IA interpolations still have a lot of violations, which need to be addressed. PDF changes: - bii/pod1: + fix typo in disks_A reference; IDF changes: - replace empty strings with `~` keyword (will be expanded to 'None'); IA (installer adapter) changes: - apex: + add missing document start; - compass4nfv: + too few spaces before comment; + missing starting space in comment; + replace '\t' with spaces; - daisy: + None; - fuel: + check conf.idf is defined first (fix parse for PODs without IDF); + move document start outside conf.idf condition - joid: + None; This is not an exhaustive change, some yamllint issues are still there but require either refactoring IAs or changing the PDF/IDF files in a way that needs the respective maintainer's input. Change-Id: I26743e265217e892b6a94de96a016c295ea24fb5 Signed-off-by: Alexandru Avadanii --- config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2') diff --git a/config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 b/config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 index dfb4d29d..d81769c4 100644 --- a/config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 +++ b/config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 @@ -9,7 +9,7 @@ --- TYPE: baremetal FLAVOR: cluster -POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool' #expects string ipmitool +POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool' # expects string ipmitool ipmiUser: {{ conf['jumphost']['remote_params']['user'] }} ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }} @@ -19,7 +19,7 @@ odl_l3_agent: "Enable" hosts: - name: {{ conf['nodes'][0]['name'] }} - mac: '{{ conf['nodes'][0]['remote_management']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][0]['remote_management']['mac_address'] }}' # this is the ipmi mac address interfaces: - eth1: '{{ conf['nodes'][0]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][0]['interfaces'][1]['mac_address'] }}' @@ -33,7 +33,7 @@ hosts: - ceph-mon - name: {{ conf['nodes'][1]['name'] }} - mac: '{{ conf['nodes'][1]['remote_management']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][1]['remote_management']['mac_address'] }}' # this is the ipmi mac address interfaces: - eth1: '{{ conf['nodes'][1]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][1]['interfaces'][1]['mac_address'] }}' @@ -46,7 +46,7 @@ hosts: - ceph-mon - name: {{ conf['nodes'][2]['name'] }} - mac: '{{ conf['nodes'][2]['remote_management']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][2]['remote_management']['mac_address'] }}' # this is the ipmi mac address interfaces: - eth1: '{{ conf['nodes'][2]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][2]['interfaces'][1]['mac_address'] }}' @@ -59,7 +59,7 @@ hosts: - ceph-mon - name: {{ conf['nodes'][3]['name'] }} - mac: '{{ conf['nodes'][3]['remote_management']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][3]['remote_management']['mac_address'] }}' # this is the ipmi mac address interfaces: - eth1: '{{ conf['nodes'][3]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][3]['interfaces'][1]['mac_address'] }}' @@ -70,7 +70,7 @@ hosts: - ceph-osd - name: {{ conf['nodes'][4]['name'] }} - mac: '{{ conf['nodes'][4]['remote_management']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][4]['remote_management']['mac_address'] }}' # this is the ipmi mac address interfaces: - eth1: '{{ conf['nodes'][4]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][4]['interfaces'][1]['mac_address'] }}' -- cgit 1.2.3-korg