diff options
author | Blaisonneau David <david.blaisonneau@orange.com> | 2017-08-24 16:44:06 +0200 |
---|---|---|
committer | Blaisonneau David <david.blaisonneau@orange.com> | 2017-08-24 16:44:06 +0200 |
commit | ec043c5303fb57d78549bd052878edea010c9f38 (patch) | |
tree | 8934b34174ec6630b8600d50a872328d81531488 /installers | |
parent | 4d1f8c3724c6dd380f057796480a1949a11bccc8 (diff) |
Correct typos to avoid failure in jenkins-ci check
Change-Id: I2e8b789cbc10def76a1b7ee673bc1ca6d7f4137f
Signed-off-by: Blaisonneau David <david.blaisonneau@orange.com>
Diffstat (limited to 'installers')
-rw-r--r-- | installers/apex/pod_config.yaml.j2 | 50 | ||||
-rw-r--r-- | installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2 | 28 | ||||
-rw-r--r-- | installers/compass4nfv/os-nosdn-openo-ha.yml.j2 | 28 | ||||
-rw-r--r-- | installers/compass4nfv/os-ocl-nofeature-ha.yml.j2 | 28 | ||||
-rw-r--r-- | installers/compass4nfv/os-odl_l2-moon-ha.yml.j2 | 28 | ||||
-rw-r--r-- | installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2 | 28 | ||||
-rw-r--r-- | installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 | 28 | ||||
-rw-r--r-- | installers/compass4nfv/os-onos-nofeature-ha.yml.j2 | 28 | ||||
-rw-r--r-- | installers/compass4nfv/os-onos-sfc-ha.yml.j2 | 28 | ||||
-rw-r--r-- | installers/daisy/pod_config.yaml.j2 | 32 | ||||
-rw-r--r-- | installers/joid/pod_config.yaml.j2 | 38 |
11 files changed, 172 insertions, 172 deletions
diff --git a/installers/apex/pod_config.yaml.j2 b/installers/apex/pod_config.yaml.j2 index 2554b47..abb3ddb 100644 --- a/installers/apex/pod_config.yaml.j2 +++ b/installers/apex/pod_config.yaml.j2 @@ -1,10 +1,10 @@ nodes: node1: - mac_address: "{{ conf['nodes'][0]['remote_mangement']['mac_address'] }}" - ipmi_ip: {{ conf['nodes'][0]['remote_mangement']['address'] }} - ipmi_user: {{ conf['jumphost']['remote_para']['user'] }} - ipmi_pass: {{ conf['jumphost']['remote_para']['pass'] }} - pm_type: "pxe_{{ conf['jumphost']['remote_para']['type'] }}tool" + mac_address: "{{ conf['nodes'][0]['remote_management']['mac_address'] }}" + ipmi_ip: {{ conf['nodes'][0]['remote_management']['address'] }} + ipmi_user: {{ conf['jumphost']['remote_params']['user'] }} + ipmi_pass: {{ conf['jumphost']['remote_params']['pass'] }} + pm_type: "pxe_{{ conf['jumphost']['remote_params']['type'] }}tool" cpus: {{ conf['nodes'][0]['node']['cpus'] }} memory: {{ conf['nodes'][0]['node']['memory'] }} disk: 40 @@ -12,11 +12,11 @@ nodes: arch: "{{ conf['nodes'][0]['node']['arch'] }}" capabilities: "profile:control" node2: - mac_address: "{{ conf['nodes'][1]['remote_mangement']['mac_address'] }}" - ipmi_ip: {{ conf['nodes'][1]['remote_mangement']['address'] }} - ipmi_user: {{ conf['jumphost']['remote_para']['user'] }} - ipmi_pass: {{ conf['jumphost']['remote_para']['pass'] }} - pm_type: "pxe_{{ conf['jumphost']['remote_para']['type'] }}tool" + mac_address: "{{ conf['nodes'][1]['remote_management']['mac_address'] }}" + ipmi_ip: {{ conf['nodes'][1]['remote_management']['address'] }} + ipmi_user: {{ conf['jumphost']['remote_params']['user'] }} + ipmi_pass: {{ conf['jumphost']['remote_params']['pass'] }} + pm_type: "pxe_{{ conf['jumphost']['remote_params']['type'] }}tool" cpus: {{ conf['nodes'][1]['node']['cpus'] }} memory: {{ conf['nodes'][1]['node']['memory'] }} disk: 40 @@ -24,11 +24,11 @@ nodes: arch: "{{ conf['nodes'][1]['node']['arch'] }}" capabilities: "profile:control" node3: - mac_address: "{{ conf['nodes'][2]['remote_mangement']['mac_address'] }}" - ipmi_ip: {{ conf['nodes'][2]['remote_mangement']['address'] }} - ipmi_user: {{ conf['jumphost']['remote_para']['user'] }} - ipmi_pass: {{ conf['jumphost']['remote_para']['pass'] }} - pm_type: "pxe_{{ conf['jumphost']['remote_para']['type'] }}tool" + mac_address: "{{ conf['nodes'][2]['remote_management']['mac_address'] }}" + ipmi_ip: {{ conf['nodes'][2]['remote_management']['address'] }} + ipmi_user: {{ conf['jumphost']['remote_params']['user'] }} + ipmi_pass: {{ conf['jumphost']['remote_params']['pass'] }} + pm_type: "pxe_{{ conf['jumphost']['remote_params']['type'] }}tool" cpus: {{ conf['nodes'][2]['node']['cpus'] }} memory: {{ conf['nodes'][2]['node']['memory'] }} disk: 40 @@ -36,11 +36,11 @@ nodes: arch: "{{ conf['nodes'][2]['node']['arch'] }}" capabilities: "profile:control" node4: - mac_address: "{{ conf['nodes'][3]['remote_mangement']['mac_address'] }}" - ipmi_ip: {{ conf['nodes'][3]['remote_mangement']['address'] }} - ipmi_user: {{ conf['jumphost']['remote_para']['user'] }} - ipmi_pass: {{ conf['jumphost']['remote_para']['pass'] }} - pm_type: "pxe_{{ conf['jumphost']['remote_para']['type'] }}tool" + mac_address: "{{ conf['nodes'][3]['remote_management']['mac_address'] }}" + ipmi_ip: {{ conf['nodes'][3]['remote_management']['address'] }} + ipmi_user: {{ conf['jumphost']['remote_params']['user'] }} + ipmi_pass: {{ conf['jumphost']['remote_params']['pass'] }} + pm_type: "pxe_{{ conf['jumphost']['remote_params']['type'] }}tool" cpus: {{ conf['nodes'][3]['node']['cpus'] }} memory: {{ conf['nodes'][3]['node']['memory'] }} disk: 40 @@ -48,11 +48,11 @@ nodes: arch: "{{ conf['nodes'][3]['node']['arch'] }}" capabilities: "profile:compute" node5: - mac_address: "{{ conf['nodes'][4]['remote_mangement']['mac_address'] }}" - ipmi_ip: {{ conf['nodes'][4]['remote_mangement']['address'] }} - ipmi_user: {{ conf['jumphost']['remote_para']['user'] }} - ipmi_pass: {{ conf['jumphost']['remote_para']['pass'] }} - pm_type: "pxe_{{ conf['jumphost']['remote_para']['type'] }}tool" + mac_address: "{{ conf['nodes'][4]['remote_management']['mac_address'] }}" + ipmi_ip: {{ conf['nodes'][4]['remote_management']['address'] }} + ipmi_user: {{ conf['jumphost']['remote_params']['user'] }} + ipmi_pass: {{ conf['jumphost']['remote_params']['pass'] }} + pm_type: "pxe_{{ conf['jumphost']['remote_params']['type'] }}tool" cpus: {{ conf['nodes'][4]['node']['cpus'] }} memory: {{ conf['nodes'][4]['node']['memory'] }} disk: 40 diff --git a/installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2 b/installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2 index 22692a4..38b7e26 100644 --- a/installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2 +++ b/installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2 @@ -10,20 +10,20 @@ --- TYPE: baremetal FLAVOR: cluster -POWER_TOOL: '{{ conf['jumphost']['remote_para']['type'] }}tool' #expects string ipmitool +POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool' #expects string ipmitool -ipmiUser: {{ conf['jumphost']['remote_para']['user'] }} -ipmiPass: {{ conf['jumphost']['remote_para']['pass'] }} -ipmiVer: '{{ conf['jumphost']['remote_para']['versions'][0] }}' +ipmiUser: {{ conf['jumphost']['remote_params']['user'] }} +ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }} +ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}' hosts: - name: {{ conf['nodes'][0]['name'] }} - mac: '{{ conf['nodes'][0]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][0]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][0]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][0]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][0]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][0]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][0]['remote_management']['address'] }} roles: - controller - ha @@ -31,47 +31,47 @@ hosts: - ceph-mon - name: {{ conf['nodes'][1]['name'] }} - mac: '{{ conf['nodes'][1]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][1]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][1]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][1]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][1]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][0]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][0]['remote_management']['address'] }} roles: - controller - ha - ceph-mon - name: {{ conf['nodes'][2]['name'] }} - mac: '{{ conf['nodes'][2]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][2]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][2]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][2]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][2]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][2]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][2]['remote_management']['address'] }} roles: - controller - ha - ceph-mon - name: {{ conf['nodes'][3]['name'] }} - mac: '{{ conf['nodes'][3]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][3]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][3]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][3]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][3]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][3]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][3]['remote_management']['address'] }} roles: - compute - ceph-osd - name: {{ conf['nodes'][4]['name'] }} - mac: '{{ conf['nodes'][4]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][4]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][4]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][4]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][4]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][4]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][4]['remote_management']['address'] }} roles: - compute - ceph-osd diff --git a/installers/compass4nfv/os-nosdn-openo-ha.yml.j2 b/installers/compass4nfv/os-nosdn-openo-ha.yml.j2 index e8d3967..88823b7 100644 --- a/installers/compass4nfv/os-nosdn-openo-ha.yml.j2 +++ b/installers/compass4nfv/os-nosdn-openo-ha.yml.j2 @@ -10,11 +10,11 @@ --- TYPE: baremetal FLAVOR: cluster -POWER_TOOL: '{{ conf['jumphost']['remote_para']['type'] }}tool' #expects string ipmitool +POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool' #expects string ipmitool -ipmiUser: {{ conf['jumphost']['remote_para']['user'] }} -ipmiPass: {{ conf['jumphost']['remote_para']['pass'] }} -ipmiVer: '{{ conf['jumphost']['remote_para']['versions'][0] }}' +ipmiUser: {{ conf['jumphost']['remote_params']['user'] }} +ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }} +ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}' deploy_options: orchestrator: @@ -26,12 +26,12 @@ deploy_options: hosts: - name: {{ conf['nodes'][0]['name'] }} - mac: '{{ conf['nodes'][0]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][0]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][0]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][0]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][0]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][0]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][0]['remote_management']['address'] }} roles: - controller - ha @@ -39,47 +39,47 @@ hosts: - ceph-mon - name: {{ conf['nodes'][1]['name'] }} - mac: '{{ conf['nodes'][1]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][1]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][1]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][1]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][1]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][1]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][1]['remote_management']['address'] }} roles: - controller - ha - ceph-mon - name: {{ conf['nodes'][2]['name'] }} - mac: '{{ conf['nodes'][2]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][2]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][2]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][2]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][2]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][2]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][2]['remote_management']['address'] }} roles: - controller - ha - ceph-mon - name: {{ conf['nodes'][3]['name'] }} - mac: '{{ conf['nodes'][3]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][3]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][3]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][3]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][3]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][3]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][3]['remote_management']['address'] }} roles: - compute - ceph-osd - name: {{ conf['nodes'][4]['name'] }} - mac: '{{ conf['nodes'][4]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][4]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][4]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][4]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][4]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][4]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][4]['remote_management']['address'] }} roles: - compute - ceph-osd diff --git a/installers/compass4nfv/os-ocl-nofeature-ha.yml.j2 b/installers/compass4nfv/os-ocl-nofeature-ha.yml.j2 index 5f1fb2f..57c6ad8 100644 --- a/installers/compass4nfv/os-ocl-nofeature-ha.yml.j2 +++ b/installers/compass4nfv/os-ocl-nofeature-ha.yml.j2 @@ -10,20 +10,20 @@ --- TYPE: baremetal FLAVOR: cluster -POWER_TOOL: '{{ conf['jumphost']['remote_para']['type'] }}tool' #expects string ipmitool +POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool' #expects string ipmitool -ipmiUser: {{ conf['jumphost']['remote_para']['user'] }} -ipmiPass: {{ conf['jumphost']['remote_para']['pass'] }} -ipmiVer: '{{ conf['jumphost']['remote_para']['versions'][0] }}' +ipmiUser: {{ conf['jumphost']['remote_params']['user'] }} +ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }} +ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}' hosts: - name: {{ conf['nodes'][0]['name'] }} - mac: '{{ conf['nodes'][0]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][0]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][0]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][0]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][0]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][0]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][0]['remote_management']['address'] }} roles: - controller - ha @@ -32,45 +32,45 @@ hosts: - ceph-mon - name: {{ conf['nodes'][1]['name'] }} - mac: '{{ conf['nodes'][1]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][1]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][1]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][1]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][1]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][1]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][1]['remote_management']['address'] }} roles: - compute - ceph-osd - name: {{ conf['nodes'][2]['name'] }} - mac: '{{ conf['nodes'][2]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][2]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][2]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][2]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][2]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][2]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][2]['remote_management']['address'] }} roles: - compute - ceph-osd - name: {{ conf['nodes'][3]['name'] }} - mac: '{{ conf['nodes'][3]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][3]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][3]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][3]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][3]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][3]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][3]['remote_management']['address'] }} roles: - compute - ceph-osd - name: {{ conf['nodes'][4]['name'] }} - mac: '{{ conf['nodes'][4]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][4]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][4]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][4]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][4]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][4]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][4]['remote_management']['address'] }} roles: - compute - ceph-osd diff --git a/installers/compass4nfv/os-odl_l2-moon-ha.yml.j2 b/installers/compass4nfv/os-odl_l2-moon-ha.yml.j2 index d323341..7b34802 100644 --- a/installers/compass4nfv/os-odl_l2-moon-ha.yml.j2 +++ b/installers/compass4nfv/os-odl_l2-moon-ha.yml.j2 @@ -9,20 +9,20 @@ --- TYPE: baremetal FLAVOR: cluster -POWER_TOOL: '{{ conf['jumphost']['remote_para']['type'] }}tool' #expects string ipmitool +POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool' #expects string ipmitool -ipmiUser: {{ conf['jumphost']['remote_para']['user'] }} -ipmiPass: {{ conf['jumphost']['remote_para']['pass'] }} -ipmiVer: '{{ conf['jumphost']['remote_para']['versions'][0] }}' +ipmiUser: {{ conf['jumphost']['remote_params']['user'] }} +ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }} +ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}' hosts: - name: {{ conf['nodes'][0]['name'] }} - mac: '{{ conf['nodes'][0]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][0]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][0]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][0]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][0]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][0]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][0]['remote_management']['address'] }} roles: - controller - ha @@ -31,12 +31,12 @@ hosts: - ceph-mon - name: {{ conf['nodes'][1]['name'] }} - mac: '{{ conf['nodes'][1]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][1]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][1]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][1]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][1]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][1]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][1]['remote_management']['address'] }} roles: - controller - ha @@ -44,12 +44,12 @@ hosts: - ceph-mon - name: {{ conf['nodes'][2]['name'] }} - mac: '{{ conf['nodes'][2]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][2]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][2]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][2]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][2]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][2]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][2]['remote_management']['address'] }} roles: - controller - ha @@ -57,23 +57,23 @@ hosts: - ceph-mon - name: {{ conf['nodes'][3]['name'] }} - mac: '{{ conf['nodes'][3]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][3]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][3]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][3]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][3]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][3]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][3]['remote_management']['address'] }} roles: - compute - ceph-osd - name: {{ conf['nodes'][4]['name'] }} - mac: '{{ conf['nodes'][4]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][4]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][4]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][4]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][4]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][4]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][4]['remote_management']['address'] }} roles: - compute - ceph-osd diff --git a/installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2 b/installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2 index 5962e29..9690b1f 100644 --- a/installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2 +++ b/installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2 @@ -10,20 +10,20 @@ --- TYPE: baremetal FLAVOR: cluster -POWER_TOOL: '{{ conf['jumphost']['remote_para']['type'] }}tool' #expects string ipmitool +POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool' #expects string ipmitool -ipmiUser: {{ conf['jumphost']['remote_para']['user'] }} -ipmiPass: {{ conf['jumphost']['remote_para']['pass'] }} -ipmiVer: '{{ conf['jumphost']['remote_para']['versions'][0] }}' +ipmiUser: {{ conf['jumphost']['remote_params']['user'] }} +ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }} +ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}' hosts: - name: {{ conf['nodes'][0]['name'] }} - mac: '{{ conf['nodes'][0]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][0]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][0]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][0]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][0]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][0]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][0]['remote_management']['address'] }} roles: - controller - ha @@ -32,12 +32,12 @@ hosts: - ceph-mon - name: {{ conf['nodes'][1]['name'] }} - mac: '{{ conf['nodes'][1]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][1]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][1]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][1]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][1]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][1]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][1]['remote_management']['address'] }} roles: - controller - ha @@ -45,12 +45,12 @@ hosts: - ceph-mon - name: {{ conf['nodes'][2]['name'] }} - mac: '{{ conf['nodes'][2]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][2]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][2]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][2]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][2]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][2]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][2]['remote_management']['address'] }} roles: - controller - ha @@ -58,23 +58,23 @@ hosts: - ceph-mon - name: {{ conf['nodes'][3]['name'] }} - mac: '{{ conf['nodes'][3]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][3]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][3]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][3]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][3]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][3]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][3]['remote_management']['address'] }} roles: - compute - ceph-osd - name: {{ conf['nodes'][4]['name'] }} - mac: '{{ conf['nodes'][4]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][4]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][4]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][4]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][4]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][4]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][4]['remote_management']['address'] }} roles: - compute - ceph-osd diff --git a/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 b/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 index 2b7e3ac..dfb4d29 100644 --- a/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 +++ b/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 @@ -9,22 +9,22 @@ --- TYPE: baremetal FLAVOR: cluster -POWER_TOOL: '{{ conf['jumphost']['remote_para']['type'] }}tool' #expects string ipmitool +POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool' #expects string ipmitool -ipmiUser: {{ conf['jumphost']['remote_para']['user'] }} -ipmiPass: {{ conf['jumphost']['remote_para']['pass'] }} -ipmiVer: '{{ conf['jumphost']['remote_para']['versions'][0] }}' +ipmiUser: {{ conf['jumphost']['remote_params']['user'] }} +ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }} +ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}' odl_l3_agent: "Enable" hosts: - name: {{ conf['nodes'][0]['name'] }} - mac: '{{ conf['nodes'][0]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][0]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][0]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][0]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][0]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][0]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][0]['remote_management']['address'] }} roles: - controller - ha @@ -33,12 +33,12 @@ hosts: - ceph-mon - name: {{ conf['nodes'][1]['name'] }} - mac: '{{ conf['nodes'][1]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][1]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][1]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][1]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][1]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][1]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][1]['remote_management']['address'] }} roles: - controller - ha @@ -46,12 +46,12 @@ hosts: - ceph-mon - name: {{ conf['nodes'][2]['name'] }} - mac: '{{ conf['nodes'][2]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][2]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][2]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][2]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][2]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][2]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][2]['remote_management']['address'] }} roles: - controller - ha @@ -59,23 +59,23 @@ hosts: - ceph-mon - name: {{ conf['nodes'][3]['name'] }} - mac: '{{ conf['nodes'][3]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][3]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][3]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][3]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][3]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][3]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][3]['remote_management']['address'] }} roles: - compute - ceph-osd - name: {{ conf['nodes'][4]['name'] }} - mac: '{{ conf['nodes'][4]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][4]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][4]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][4]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][4]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][4]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][4]['remote_management']['address'] }} roles: - compute - ceph-osd diff --git a/installers/compass4nfv/os-onos-nofeature-ha.yml.j2 b/installers/compass4nfv/os-onos-nofeature-ha.yml.j2 index 5d2e7d0..042bb2f 100644 --- a/installers/compass4nfv/os-onos-nofeature-ha.yml.j2 +++ b/installers/compass4nfv/os-onos-nofeature-ha.yml.j2 @@ -9,20 +9,20 @@ --- TYPE: baremetal FLAVOR: cluster -POWER_TOOL: '{{ conf['jumphost']['remote_para']['type'] }}tool' #expects string ipmitool +POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool' #expects string ipmitool -ipmiUser: {{ conf['jumphost']['remote_para']['user'] }} -ipmiPass: {{ conf['jumphost']['remote_para']['pass'] }} -ipmiVer: '{{ conf['jumphost']['remote_para']['versions'][0] }}' +ipmiUser: {{ conf['jumphost']['remote_params']['user'] }} +ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }} +ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}' hosts: - name: {{ conf['nodes'][0]['name'] }} - mac: '{{ conf['nodes'][0]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][0]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][0]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][0]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][0]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][0]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][0]['remote_management']['address'] }} roles: - controller - ha @@ -31,12 +31,12 @@ hosts: - ceph-mon - name: {{ conf['nodes'][1]['name'] }} - mac: '{{ conf['nodes'][1]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][1]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][1]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][1]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][1]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][1]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][1]['remote_management']['address'] }} roles: - controller - ha @@ -44,12 +44,12 @@ hosts: - ceph-mon - name: {{ conf['nodes'][2]['name'] }} - mac: '{{ conf['nodes'][2]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][2]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][2]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][2]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][2]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][2]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][2]['remote_management']['address'] }} roles: - controller - ha @@ -57,23 +57,23 @@ hosts: - ceph-mon - name: {{ conf['nodes'][3]['name'] }} - mac: '{{ conf['nodes'][3]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][3]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][3]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][3]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][3]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][3]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][3]['remote_management']['address'] }} roles: - compute - ceph-osd - name: {{ conf['nodes'][4]['name'] }} - mac: '{{ conf['nodes'][4]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][4]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][4]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][4]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][4]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][4]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][4]['remote_management']['address'] }} roles: - compute - ceph-osd diff --git a/installers/compass4nfv/os-onos-sfc-ha.yml.j2 b/installers/compass4nfv/os-onos-sfc-ha.yml.j2 index ffc0287..746ca36 100644 --- a/installers/compass4nfv/os-onos-sfc-ha.yml.j2 +++ b/installers/compass4nfv/os-onos-sfc-ha.yml.j2 @@ -9,22 +9,22 @@ --- TYPE: baremetal FLAVOR: cluster -POWER_TOOL: '{{ conf['jumphost']['remote_para']['type'] }}tool' #expects string ipmitool +POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool' #expects string ipmitool -ipmiUser: {{ conf['jumphost']['remote_para']['user'] }} -ipmiPass: {{ conf['jumphost']['remote_para']['pass'] }} -ipmiVer: '{{ conf['jumphost']['remote_para']['versions'][0] }}' +ipmiUser: {{ conf['jumphost']['remote_params']['user'] }} +ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }} +ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}' onos_sfc: "Enable" hosts: - name: {{ conf['nodes'][0]['name'] }} - mac: '{{ conf['nodes'][0]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][0]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][0]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][0]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][0]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][0]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][0]['remote_management']['address'] }} roles: - controller - ha @@ -33,12 +33,12 @@ hosts: - ceph-mon - name: {{ conf['nodes'][1]['name'] }} - mac: '{{ conf['nodes'][1]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][1]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][1]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][1]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][1]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][1]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][1]['remote_management']['address'] }} roles: - controller - ha @@ -46,12 +46,12 @@ hosts: - ceph-mon - name: {{ conf['nodes'][2]['name'] }} - mac: '{{ conf['nodes'][2]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][2]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][2]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][2]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][2]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][2]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][2]['remote_management']['address'] }} roles: - controller - ha @@ -59,23 +59,23 @@ hosts: - ceph-mon - name: {{ conf['nodes'][3]['name'] }} - mac: '{{ conf['nodes'][3]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][3]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][3]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][3]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][3]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][3]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][3]['remote_management']['address'] }} roles: - compute - ceph-osd - name: {{ conf['nodes'][4]['name'] }} - mac: '{{ conf['nodes'][4]['remote_mangement']['mac_address'] }}' #is this the ipmi mac address? + mac: '{{ conf['nodes'][4]['remote_management']['mac_address'] }}' #is this the ipmi mac address? interfaces: - eth1: '{{ conf['nodes'][4]['interfaces'][0]['mac_address'] }}' - eth2: '{{ conf['nodes'][4]['interfaces'][1]['mac_address'] }}' - eth3: '{{ conf['nodes'][4]['interfaces'][2]['mac_address'] }}' - ipmiIp: {{ conf['nodes'][4]['remote_mangement']['address'] }} + ipmiIp: {{ conf['nodes'][4]['remote_management']['address'] }} roles: - compute - ceph-osd diff --git a/installers/daisy/pod_config.yaml.j2 b/installers/daisy/pod_config.yaml.j2 index 5df66ee..39be297 100644 --- a/installers/daisy/pod_config.yaml.j2 +++ b/installers/daisy/pod_config.yaml.j2 @@ -1,43 +1,43 @@ -adapter: {{ conf['jumphost']['remote_para']['type'] }} +adapter: {{ conf['jumphost']['remote_params']['type'] }} hosts: - name: 'controller01' roles: - 'CONTROLLER_LB' - ipmi_ip: {{ conf['nodes'][0]['remote_mangement']['address'] }} - ipmi_user: {{ conf['nodes'][0]['remote_mangement']['user'] }} - ipmi_pass: {{ conf['nodes'][0]['remote_mangement']['pass'] }} + ipmi_ip: {{ conf['nodes'][0]['remote_management']['address'] }} + ipmi_user: {{ conf['nodes'][0]['remote_management']['user'] }} + ipmi_pass: {{ conf['nodes'][0]['remote_management']['pass'] }} mac_addresses:{% for nic in conf['nodes'][0]['interfaces'] %} - {{ nic['mac_address'] }}{% endfor %} - name: 'controller02' roles: - 'CONTROLLER_LB' - ipmi_ip: {{ conf['nodes'][1]['remote_mangement']['address'] }} - ipmi_user: {{ conf['nodes'][1]['remote_mangement']['user'] }} - ipmi_pass: {{ conf['nodes'][1]['remote_mangement']['pass'] }} + ipmi_ip: {{ conf['nodes'][1]['remote_management']['address'] }} + ipmi_user: {{ conf['nodes'][1]['remote_management']['user'] }} + ipmi_pass: {{ conf['nodes'][1]['remote_management']['pass'] }} mac_addresses:{% for nic in conf['nodes'][1]['interfaces'] %} - {{ nic['mac_address'] }}{% endfor %} - name: 'controller03' roles: - 'CONTROLLER_LB' - ipmi_ip: {{ conf['nodes'][2]['remote_mangement']['address'] }} - ipmi_user: {{ conf['nodes'][2]['remote_mangement']['user'] }} - ipmi_pass: {{ conf['nodes'][2]['remote_mangement']['pass'] }} + ipmi_ip: {{ conf['nodes'][2]['remote_management']['address'] }} + ipmi_user: {{ conf['nodes'][2]['remote_management']['user'] }} + ipmi_pass: {{ conf['nodes'][2]['remote_management']['pass'] }} mac_addresses:{% for nic in conf['nodes'][2]['interfaces'] %} - {{ nic['mac_address'] }}{% endfor %} - name: 'computer01' roles: - 'COMPUTER' - ipmi_ip: {{ conf['nodes'][3]['remote_mangement']['address'] }} - ipmi_user: {{ conf['nodes'][3]['remote_mangement']['user'] }} - ipmi_pass: {{ conf['nodes'][3]['remote_mangement']['pass'] }} + ipmi_ip: {{ conf['nodes'][3]['remote_management']['address'] }} + ipmi_user: {{ conf['nodes'][3]['remote_management']['user'] }} + ipmi_pass: {{ conf['nodes'][3]['remote_management']['pass'] }} mac_addresses:{% for nic in conf['nodes'][3]['interfaces'] %} - {{ nic['mac_address'] }}{% endfor %} - name: 'computer02' roles: - 'COMPUTER' - ipmi_ip: {{ conf['nodes'][4]['remote_mangement']['address'] }} - ipmi_user: {{ conf['nodes'][4]['remote_mangement']['user'] }} - ipmi_pass: {{ conf['nodes'][4]['remote_mangement']['pass'] }} + ipmi_ip: {{ conf['nodes'][4]['remote_management']['address'] }} + ipmi_user: {{ conf['nodes'][4]['remote_management']['user'] }} + ipmi_pass: {{ conf['nodes'][4]['remote_management']['pass'] }} mac_addresses:{% for nic in conf['nodes'][4]['interfaces'] %} - {{ nic['mac_address'] }}{% endfor %} disks: diff --git a/installers/joid/pod_config.yaml.j2 b/installers/joid/pod_config.yaml.j2 index 8e47664..4bb49d5 100644 --- a/installers/joid/pod_config.yaml.j2 +++ b/installers/joid/pod_config.yaml.j2 @@ -24,10 +24,10 @@ lab: spaces: [admin] mac: ["{{ conf['nodes'][0]['interfaces'][2]['mac_address'] }}"] power: - type: {{ conf['jumphost']['remote_para']['type'] }} - address: {{ conf['nodes'][0]['remote_mangement']['address'] }} - user: {{ conf['jumphost']['remote_para']['user'] }} - pass: {{ conf['jumphost']['remote_para']['pass'] }} + type: {{ conf['jumphost']['remote_params']['type'] }} + address: {{ conf['nodes'][0]['remote_management']['address'] }} + user: {{ conf['jumphost']['remote_params']['user'] }} + pass: {{ conf['jumphost']['remote_params']['pass'] }} - name: {{ conf['nodes'][1]['name'] }} architecture: {{ conf['nodes'][1]['node']['arch'] }} roles: [compute, control, storage] @@ -48,10 +48,10 @@ lab: spaces: [admin] mac: ["{{ conf['nodes'][1]['interfaces'][2]['mac_address'] }}"] power: - type: {{ conf['jumphost']['remote_para']['type'] }} - address: {{ conf['nodes'][1]['remote_mangement']['address'] }} - user: {{ conf['jumphost']['remote_para']['user'] }} - pass: {{ conf['jumphost']['remote_para']['pass'] }} + type: {{ conf['jumphost']['remote_params']['type'] }} + address: {{ conf['nodes'][1]['remote_management']['address'] }} + user: {{ conf['jumphost']['remote_params']['user'] }} + pass: {{ conf['jumphost']['remote_params']['pass'] }} - name: {{ conf['nodes'][2]['name'] }} architecture: {{ conf['nodes'][2]['node']['arch'] }} roles: [compute, control, storage] @@ -70,10 +70,10 @@ lab: mac: ["{{ conf['nodes'][2]['interfaces'][1]['mac_address'] }}"] - ifname: {{ conf['nodes'][2]['interfaces'][2]['name'] }} power: - type: {{ conf['jumphost']['remote_para']['type'] }} - address: {{ conf['nodes'][2]['remote_mangement']['address'] }} - user: {{ conf['jumphost']['remote_para']['user'] }} - pass: {{ conf['jumphost']['remote_para']['pass'] }} + type: {{ conf['jumphost']['remote_params']['type'] }} + address: {{ conf['nodes'][2]['remote_management']['address'] }} + user: {{ conf['jumphost']['remote_params']['user'] }} + pass: {{ conf['jumphost']['remote_params']['pass'] }} - name: {{ conf['nodes'][3]['name'] }} architecture: {{ conf['nodes'][3]['node']['arch'] }} roles: [compute, storage] @@ -93,9 +93,9 @@ lab: - ifname: {{ conf['nodes'][3]['interfaces'][2]['name'] }} power: type: ipmi - address: {{ conf['nodes'][3]['remote_mangement']['address'] }} - user: {{ conf['jumphost']['remote_para']['user'] }} - pass: {{ conf['jumphost']['remote_para']['pass'] }} + address: {{ conf['nodes'][3]['remote_management']['address'] }} + user: {{ conf['jumphost']['remote_params']['user'] }} + pass: {{ conf['jumphost']['remote_params']['pass'] }} - name: {{ conf['nodes'][4]['name'] }} architecture: {{ conf['nodes'][4]['node']['arch'] }} roles: [compute, storage] @@ -114,10 +114,10 @@ lab: mac: ["{{ conf['nodes'][4]['interfaces'][1]['mac_address'] }}"] - ifname: {{ conf['nodes'][1]['interfaces'][2]['name'] }} power: - type: {{ conf['jumphost']['remote_para']['type'] }} - address: {{ conf['nodes'][4]['remote_mangement']['address'] }} - user: {{ conf['jumphost']['remote_para']['user'] }} - pass: {{ conf['jumphost']['remote_para']['pass'] }} + type: {{ conf['jumphost']['remote_params']['type'] }} + address: {{ conf['nodes'][4]['remote_management']['address'] }} + user: {{ conf['jumphost']['remote_params']['user'] }} + pass: {{ conf['jumphost']['remote_params']['pass'] }} floating-ip-range: 10.5.15.6,10.5.15.250,10.5.15.1,10.5.15.0/24 ext-port: "ens785f0.505" dns: 8.8.8.8 |