Merge "Nokia public lab Pod Descriptor File"

[pharos.git] / 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 dfb4d29..d019c23 100644 (file)
--- a/config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2
+++ b/config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others.
+# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
@@ -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'] }}'