From 2dd192a90e227015955f2036f48655199e31d38d Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 24 Jan 2018 23:44:36 +0100 Subject: [PATCH] [compass4nfv] Use jump remote_management params Stop relying on 'remote_params' optional YAML anchor. Change-Id: I8d967b767cf66b298a651306c9bcc91cc9acb0a6 Signed-off-by: Alexandru Avadanii --- config/installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2 | 8 ++++---- config/installers/compass4nfv/os-nosdn-openo-ha.yml.j2 | 8 ++++---- config/installers/compass4nfv/os-ocl-nofeature-ha.yml.j2 | 8 ++++---- config/installers/compass4nfv/os-odl_l2-moon-ha.yml.j2 | 8 ++++---- config/installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2 | 8 ++++---- config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 | 8 ++++---- config/installers/compass4nfv/os-onos-nofeature-ha.yml.j2 | 8 ++++---- config/installers/compass4nfv/os-onos-sfc-ha.yml.j2 | 8 ++++---- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/config/installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2 b/config/installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2 index bb235fb4..3e536620 100644 --- a/config/installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2 +++ b/config/installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2 @@ -10,11 +10,11 @@ --- TYPE: baremetal FLAVOR: cluster -POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool' # expects string ipmitool +POWER_TOOL: '{{ conf['jumphost']['remote_management']['type'] }}tool' # expects string ipmitool -ipmiUser: {{ conf['jumphost']['remote_params']['user'] }} -ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }} -ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}' +ipmiUser: {{ conf['jumphost']['remote_management']['user'] }} +ipmiPass: {{ conf['jumphost']['remote_management']['pass'] }} +ipmiVer: '{{ conf['jumphost']['remote_management']['versions'][0] }}' hosts: - name: {{ conf['nodes'][0]['name'] }} diff --git a/config/installers/compass4nfv/os-nosdn-openo-ha.yml.j2 b/config/installers/compass4nfv/os-nosdn-openo-ha.yml.j2 index 9e7e01cc..374f42a8 100644 --- a/config/installers/compass4nfv/os-nosdn-openo-ha.yml.j2 +++ b/config/installers/compass4nfv/os-nosdn-openo-ha.yml.j2 @@ -10,11 +10,11 @@ --- TYPE: baremetal FLAVOR: cluster -POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool' # expects string ipmitool +POWER_TOOL: '{{ conf['jumphost']['remote_management']['type'] }}tool' # expects string ipmitool -ipmiUser: {{ conf['jumphost']['remote_params']['user'] }} -ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }} -ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}' +ipmiUser: {{ conf['jumphost']['remote_management']['user'] }} +ipmiPass: {{ conf['jumphost']['remote_management']['pass'] }} +ipmiVer: '{{ conf['jumphost']['remote_management']['versions'][0] }}' deploy_options: orchestrator: diff --git a/config/installers/compass4nfv/os-ocl-nofeature-ha.yml.j2 b/config/installers/compass4nfv/os-ocl-nofeature-ha.yml.j2 index c7272cf3..34063b36 100644 --- a/config/installers/compass4nfv/os-ocl-nofeature-ha.yml.j2 +++ b/config/installers/compass4nfv/os-ocl-nofeature-ha.yml.j2 @@ -10,11 +10,11 @@ --- TYPE: baremetal FLAVOR: cluster -POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool' # expects string ipmitool +POWER_TOOL: '{{ conf['jumphost']['remote_management']['type'] }}tool' # expects string ipmitool -ipmiUser: {{ conf['jumphost']['remote_params']['user'] }} -ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }} -ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}' +ipmiUser: {{ conf['jumphost']['remote_management']['user'] }} +ipmiPass: {{ conf['jumphost']['remote_management']['pass'] }} +ipmiVer: '{{ conf['jumphost']['remote_management']['versions'][0] }}' hosts: - name: {{ conf['nodes'][0]['name'] }} diff --git a/config/installers/compass4nfv/os-odl_l2-moon-ha.yml.j2 b/config/installers/compass4nfv/os-odl_l2-moon-ha.yml.j2 index 72d3f4c7..249c3052 100644 --- a/config/installers/compass4nfv/os-odl_l2-moon-ha.yml.j2 +++ b/config/installers/compass4nfv/os-odl_l2-moon-ha.yml.j2 @@ -9,11 +9,11 @@ --- TYPE: baremetal FLAVOR: cluster -POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool' # expects string ipmitool +POWER_TOOL: '{{ conf['jumphost']['remote_management']['type'] }}tool' # expects string ipmitool -ipmiUser: {{ conf['jumphost']['remote_params']['user'] }} -ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }} -ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}' +ipmiUser: {{ conf['jumphost']['remote_management']['user'] }} +ipmiPass: {{ conf['jumphost']['remote_management']['pass'] }} +ipmiVer: '{{ conf['jumphost']['remote_management']['versions'][0] }}' hosts: - name: {{ conf['nodes'][0]['name'] }} diff --git a/config/installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2 b/config/installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2 index 3a0c222e..884bb23a 100644 --- a/config/installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2 +++ b/config/installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2 @@ -10,11 +10,11 @@ --- TYPE: baremetal FLAVOR: cluster -POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool' # expects string ipmitool +POWER_TOOL: '{{ conf['jumphost']['remote_management']['type'] }}tool' # expects string ipmitool -ipmiUser: {{ conf['jumphost']['remote_params']['user'] }} -ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }} -ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}' +ipmiUser: {{ conf['jumphost']['remote_management']['user'] }} +ipmiPass: {{ conf['jumphost']['remote_management']['pass'] }} +ipmiVer: '{{ conf['jumphost']['remote_management']['versions'][0] }}' hosts: - name: {{ conf['nodes'][0]['name'] }} diff --git a/config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 b/config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 index d019c230..cb36a970 100644 --- a/config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 +++ b/config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 @@ -9,11 +9,11 @@ --- TYPE: baremetal FLAVOR: cluster -POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool' # expects string ipmitool +POWER_TOOL: '{{ conf['jumphost']['remote_management']['type'] }}tool' # expects string ipmitool -ipmiUser: {{ conf['jumphost']['remote_params']['user'] }} -ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }} -ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}' +ipmiUser: {{ conf['jumphost']['remote_management']['user'] }} +ipmiPass: {{ conf['jumphost']['remote_management']['pass'] }} +ipmiVer: '{{ conf['jumphost']['remote_management']['versions'][0] }}' odl_l3_agent: "Enable" diff --git a/config/installers/compass4nfv/os-onos-nofeature-ha.yml.j2 b/config/installers/compass4nfv/os-onos-nofeature-ha.yml.j2 index 2adce440..241cfd32 100644 --- a/config/installers/compass4nfv/os-onos-nofeature-ha.yml.j2 +++ b/config/installers/compass4nfv/os-onos-nofeature-ha.yml.j2 @@ -9,11 +9,11 @@ --- TYPE: baremetal FLAVOR: cluster -POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool' # expects string ipmitool +POWER_TOOL: '{{ conf['jumphost']['remote_management']['type'] }}tool' # expects string ipmitool -ipmiUser: {{ conf['jumphost']['remote_params']['user'] }} -ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }} -ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}' +ipmiUser: {{ conf['jumphost']['remote_management']['user'] }} +ipmiPass: {{ conf['jumphost']['remote_management']['pass'] }} +ipmiVer: '{{ conf['jumphost']['remote_management']['versions'][0] }}' hosts: - name: {{ conf['nodes'][0]['name'] }} diff --git a/config/installers/compass4nfv/os-onos-sfc-ha.yml.j2 b/config/installers/compass4nfv/os-onos-sfc-ha.yml.j2 index 230a601f..dba5fe18 100644 --- a/config/installers/compass4nfv/os-onos-sfc-ha.yml.j2 +++ b/config/installers/compass4nfv/os-onos-sfc-ha.yml.j2 @@ -9,11 +9,11 @@ --- TYPE: baremetal FLAVOR: cluster -POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool' # expects string ipmitool +POWER_TOOL: '{{ conf['jumphost']['remote_management']['type'] }}tool' # expects string ipmitool -ipmiUser: {{ conf['jumphost']['remote_params']['user'] }} -ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }} -ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}' +ipmiUser: {{ conf['jumphost']['remote_management']['user'] }} +ipmiPass: {{ conf['jumphost']['remote_management']['pass'] }} +ipmiVer: '{{ conf['jumphost']['remote_management']['versions'][0] }}' onos_sfc: "Enable" -- 2.16.6