diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2018-01-15 21:37:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-01-15 21:37:12 +0000 |
| commit | b1a499e5eaed826d3149298b7638aa90521159a3 (patch) | |
| tree | 00db556772d59c8d9abaadef120aac04886d066e /config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 | |
| parent | 668b3ab90304112143b35ebf5c82b565d3d0d846 (diff) | |
| parent | 497efef7c97a01332b197dd68a278269a4b64b67 (diff) | |
Merge changes from topic 'yamllint-fix'
* changes:
[PDF] check-jinja: Replace encrypted str w/ dummy
[PDF] Fix yamllint issues in installer adapters
[PDF] check-jinja: Disable check against template
[PDF] generate_config: eyaml only encrypted PDFs
Diffstat (limited to 'config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2')
| -rw-r--r-- | config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 | 12 |
1 files changed, 6 insertions, 6 deletions
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'] }}' |