From ec043c5303fb57d78549bd052878edea010c9f38 Mon Sep 17 00:00:00 2001 From: Blaisonneau David Date: Thu, 24 Aug 2017 16:44:06 +0200 Subject: Correct typos to avoid failure in jenkins-ci check Change-Id: I2e8b789cbc10def76a1b7ee673bc1ca6d7f4137f Signed-off-by: Blaisonneau David --- installers/apex/pod_config.yaml.j2 | 50 +++++++++++----------- .../compass4nfv/os-nosdn-nofeature-ha.yml.j2 | 28 ++++++------ installers/compass4nfv/os-nosdn-openo-ha.yml.j2 | 28 ++++++------ installers/compass4nfv/os-ocl-nofeature-ha.yml.j2 | 28 ++++++------ installers/compass4nfv/os-odl_l2-moon-ha.yml.j2 | 28 ++++++------ .../compass4nfv/os-odl_l2-nofeature-ha.yml.j2 | 28 ++++++------ .../compass4nfv/os-odl_l3-nofeature-ha.yml.j2 | 28 ++++++------ installers/compass4nfv/os-onos-nofeature-ha.yml.j2 | 28 ++++++------ installers/compass4nfv/os-onos-sfc-ha.yml.j2 | 28 ++++++------ installers/daisy/pod_config.yaml.j2 | 32 +++++++------- installers/joid/pod_config.yaml.j2 | 38 ++++++++-------- labs/ericsson/pod1.yaml | 14 +++--- labs/ericsson/pod2.yaml | 14 +++--- labs/intel/pod18.yaml | 14 +++--- labs/zte/pod1.yaml | 12 +++--- labs/zte/pod2.yaml | 12 +++--- labs/zte/pod3.yaml | 12 +++--- 17 files changed, 211 insertions(+), 211 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 diff --git a/labs/ericsson/pod1.yaml b/labs/ericsson/pod1.yaml index 972fccc..bf7700b 100644 --- a/labs/ericsson/pod1.yaml +++ b/labs/ericsson/pod1.yaml @@ -26,14 +26,14 @@ jumphost: disk_interface: scsi disk_rotation: 15000 os: ubuntu-16.04 - remote_para: &remoteparas + remote_params: &remoteparas type: ipmi versions: - 1.0 - 2.0 user: opnfv pass: Winter2017 - remote_mangement: + remote_management: <<: *remoteparas address: 172.16.1.21/24 mac_address: "9C:B6:54:8E:C5:76" @@ -80,7 +80,7 @@ nodes: disk_interface: scsi disk_rotation: 15000 os: - remote_mangement: + remote_management: <<: *remoteparas address: 172.16.1.16/24 mac_address: "14:58:D0:5D:AB:6A" @@ -122,7 +122,7 @@ nodes: disk_interface: scsi disk_rotation: 15000 os: - remote_mangement: + remote_management: <<: *remoteparas address: 172.16.1.17/24 mac_address: "14:58:D0:5D:AB:4D" @@ -164,7 +164,7 @@ nodes: disk_interface: scsi disk_rotation: 15000 os: - remote_mangement: + remote_management: <<: *remoteparas address: 172.16.1.18/24 mac_address: "14:58:D0:5D:AB:F2" @@ -206,7 +206,7 @@ nodes: disk_interface: scsi disk_rotation: 15000 os: - remote_mangement: + remote_management: <<: *remoteparas address: 172.16.1.19/24 mac_address: "9C:B6:54:8E:C7:F0" @@ -248,7 +248,7 @@ nodes: disk_interface: scsi disk_rotation: 15000 os: - remote_mangement: + remote_management: <<: *remoteparas address: 172.16.1.20/24 mac_address: "9C:B6:54:8E:C5:74" diff --git a/labs/ericsson/pod2.yaml b/labs/ericsson/pod2.yaml index 66dabb3..fe5fc81 100644 --- a/labs/ericsson/pod2.yaml +++ b/labs/ericsson/pod2.yaml @@ -26,14 +26,14 @@ jumphost: disk_interface: scsi disk_rotation: 15000 os: ubuntu-16.04 - remote_para: &remoteparas + remote_params: &remoteparas type: ipmi versions: - 1.0 - 2.0 user: opnfv pass: Winter2017 - remote_mangement: + remote_management: <<: *remoteparas address: 172.16.2.11/24 mac_address: "58:20:B1:01:8A:F2" @@ -80,7 +80,7 @@ nodes: disk_interface: scsi disk_rotation: 15000 os: - remote_mangement: + remote_management: <<: *remoteparas address: 172.16.2.12/24 mac_address: "58:20:B1:01:8B:F0" @@ -122,7 +122,7 @@ nodes: disk_interface: scsi disk_rotation: 15000 os: - remote_mangement: + remote_management: <<: *remoteparas address: 172.16.2.13/24 mac_address: "58:20:B1:01:8E:FC" @@ -164,7 +164,7 @@ nodes: disk_interface: scsi disk_rotation: 15000 os: - remote_mangement: + remote_management: <<: *remoteparas address: 172.16.2.14/24 mac_address: "58:20:B1:01:8D:32" @@ -206,7 +206,7 @@ nodes: disk_interface: scsi disk_rotation: 15000 os: - remote_mangement: + remote_management: <<: *remoteparas address: 172.16.2.15/24 mac_address: "58:20:B1:01:8B:FC" @@ -248,7 +248,7 @@ nodes: disk_interface: scsi disk_rotation: 15000 os: - remote_mangement: + remote_management: <<: *remoteparas address: 172.16.2.16/24 mac_address: "58:20:B1:01:8F:EA" diff --git a/labs/intel/pod18.yaml b/labs/intel/pod18.yaml index 8d8deb5..27290c0 100644 --- a/labs/intel/pod18.yaml +++ b/labs/intel/pod18.yaml @@ -33,14 +33,14 @@ jumphost: disk_interface: sas disk_rotation: 15000 os: centos-7.2.1611 - remote_para: &remoteparas + remote_params: &remoteparas type: ipmi versions: - 1.0 - 2.0 user: root pass: root - remote_mangement: + remote_management: <<: *remoteparas address: 10.10.180.10 mac_address: "A4:BF:01:16:31:98" @@ -75,7 +75,7 @@ nodes: disk_type: hdd disk_interface: sas disk_rotation: 15000 - remote_mangement: + remote_management: <<: *remoteparas address: 10.10.180.11/24 mac_address: "A4:BF:01:14:40:18" @@ -119,7 +119,7 @@ nodes: - name: pod18-node2 node: *nodeparas disks: *disks - remote_mangement: + remote_management: <<: *remoteparas address: 10.10.180.12/24 mac_address: "A4:BF:01:16:31:1G" @@ -163,7 +163,7 @@ nodes: - name: pod18-node3 node: *nodeparas disks: *disks - remote_mangement: + remote_management: <<: *remoteparas address: 10.10.180.13/24 mac_address: "A4:BF:01:16:30:F8" @@ -207,7 +207,7 @@ nodes: - name: pod18-node4 node: *nodeparas disks: *disks - remote_mangement: + remote_management: <<: *remoteparas address: 10.10.180.14/24 mac_address: "A4:BF:01:14:72:0F" @@ -251,7 +251,7 @@ nodes: - name: pod18-node5 node: *nodeparas disks: *disks - remote_mangement: + remote_management: <<: *remoteparas address: 10.10.180.15/24 mac_address: "A4:BF:01:14:71:70" diff --git a/labs/zte/pod1.yaml b/labs/zte/pod1.yaml index cfd406c..bc91404 100644 --- a/labs/zte/pod1.yaml +++ b/labs/zte/pod1.yaml @@ -37,7 +37,7 @@ jumphost: disk_interface: sas disk_rotation: 10000 os: CentOS-7 - remote_para: &remoteparas + remote_params: &remoteparas type: ipmi versions: - 2.0 @@ -72,7 +72,7 @@ nodes: disk_type: hdd disk_interface: sas disk_rotation: 10000 - remote_mangement: + remote_management: <<: *remoteparas address: 192.168.1.101 mac_address: "74:4a:a4:00:cf:d9" @@ -106,7 +106,7 @@ nodes: - name: pod1-node2 node: *nodeparas disks: *disks - remote_mangement: + remote_management: <<: *remoteparas address: 192.168.1.102 mac_address: "74:4a:a4:00:ce:cb" @@ -140,7 +140,7 @@ nodes: - name: pod1-node3 node: *nodeparas disks: *disks - remote_mangement: + remote_management: <<: *remoteparas address: 192.168.1.103 mac_address: "74:4a:a4:00:cf:55" @@ -174,7 +174,7 @@ nodes: - name: pod1-node4 node: *nodeparas disks: *disks - remote_mangement: + remote_management: <<: *remoteparas address: 192.168.1.104 mac_address: "74:4a:a4:00:49:81" @@ -208,7 +208,7 @@ nodes: - name: pod1-node5 node: *nodeparas disks: *disks - remote_mangement: + remote_management: <<: *remoteparas address: 192.168.1.105 mac_address: "74:4a:a4:00:ce:bf" diff --git a/labs/zte/pod2.yaml b/labs/zte/pod2.yaml index 4945f99..cf29afc 100644 --- a/labs/zte/pod2.yaml +++ b/labs/zte/pod2.yaml @@ -33,7 +33,7 @@ jumphost: disk_rotation: 15000 os: CentOS-7 - remote_para: &remoteparas + remote_params: &remoteparas type: ipmi versions: - 2.0 @@ -68,7 +68,7 @@ nodes: disk_type: hdd disk_interface: sas disk_rotation: 10000 - remote_mangement: + remote_management: <<: *remoteparas address: 192.168.1.106 mac_address: "74:4a:a4:00:cd:6f" @@ -102,7 +102,7 @@ nodes: - name: pod2-node2 node: *nodeparas disks: *disks - remote_mangement: + remote_management: <<: *remoteparas address: 192.168.1.107 mac_address: "74:4a:a4:00:ca:c9" @@ -136,7 +136,7 @@ nodes: - name: pod2-node3 node: *nodeparas disks: *disks - remote_mangement: + remote_management: <<: *remoteparas address: 192.168.1.108 mac_address: "74:4a:a4:00:cd:0f" @@ -170,7 +170,7 @@ nodes: - name: pod2-node4 node: *nodeparas disks: *disks - remote_mangement: + remote_management: <<: *remoteparas address: 192.168.1.109 mac_address: "74:4a:a4:00:cf:3d" @@ -204,7 +204,7 @@ nodes: - name: pod2-node5 node: *nodeparas disks: *disks - remote_mangement: + remote_management: <<: *remoteparas address: 192.168.1.110 mac_address: "74:4a:a4:00:ce:d1" diff --git a/labs/zte/pod3.yaml b/labs/zte/pod3.yaml index a17afaf..1b54b4c 100644 --- a/labs/zte/pod3.yaml +++ b/labs/zte/pod3.yaml @@ -37,7 +37,7 @@ jumphost: disk_interface: iscsi disk_rotation: 10000 os: CentOS-7 - remote_para: &remoteparas + remote_params: &remoteparas type: ipmi versions: - 2.0 @@ -72,7 +72,7 @@ nodes: disk_type: hdd disk_interface: sas disk_rotation: 10000 - remote_mangement: + remote_management: <<: *remoteparas address: 192.168.1.32 mac_address: "0c:12:62:e4:bf:de" @@ -101,7 +101,7 @@ nodes: - name: pod3-node2 node: *nodeparas disks: *disks - remote_mangement: + remote_management: <<: *remoteparas address: 192.168.1.33 mac_address: "00:12:62:e4:c0:33" @@ -130,7 +130,7 @@ nodes: - name: pod3-node3 node: *nodeparas disks: *disks - remote_mangement: + remote_management: <<: *remoteparas address: 192.168.1.34 mac_address: "74:4a:a4:00:30:93" @@ -159,7 +159,7 @@ nodes: - name: pod3-node4 node: *nodeparas disks: *disks - remote_mangement: + remote_management: <<: *remoteparas address: 192.168.1.35 mac_address: "00:12:62:e4:c0:42" @@ -188,7 +188,7 @@ nodes: - name: pod3-node5 node: *nodeparas disks: *disks - remote_mangement: + remote_management: <<: *remoteparas address: 192.168.1.36 mac_address: "74:4a:a4:00:30:43" -- cgit 1.2.3-korg