summaryrefslogtreecommitdiffstats
path: root/tests/lib/installers
diff options
context:
space:
mode:
authorRyota MIBU <r-mibu@cq.jp.nec.com>2017-02-02 15:03:01 +0000
committerRyota MIBU <r-mibu@cq.jp.nec.com>2017-02-02 16:22:03 +0000
commit1d5c5fae6b040a19404a1cfd9afd28237d93f6a7 (patch)
tree48375398109dc1d5b62cb954958048f4e31a6c67 /tests/lib/installers
parent06406611160b83a2ec90400db3b9e6b08d60ff95 (diff)
refactor lib/installer
- make sure expected parameters and functions are set - remove all installer dependent codes from run.sh except non-used function which will be removed later on Change-Id: I4628173ef0891d893146976c7553ed6a95329957 Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
Diffstat (limited to 'tests/lib/installers')
-rw-r--r--tests/lib/installers/apex41
-rw-r--r--tests/lib/installers/fuel46
-rw-r--r--tests/lib/installers/local25
3 files changed, 83 insertions, 29 deletions
diff --git a/tests/lib/installers/apex b/tests/lib/installers/apex
index 45a5dcdc..e353d251 100644
--- a/tests/lib/installers/apex
+++ b/tests/lib/installers/apex
@@ -1,24 +1,47 @@
#!/bin/bash
+COMPUTE_USER=${COMPUTE_USER:-heat-admin}
+ssh_opts_cpu="$ssh_opts -i instack_key"
+
function get_installer_ip {
- local instack_mac=$(sudo virsh domiflist instack | awk '/default/{print $5}')
- INSTALLER_IP=$(/usr/sbin/arp -e | grep ${instack_mac} | awk '{print $1}')
- die_if_not_set $LINENO INSTALLER_IP "No installer IP"
+ is_set INSTALLER_IP && return
+ INSTALLER_IP=$(get_first_vnic_ip instack)
}
function installer_get_ssh_keys {
- sudo scp $ssh_opts root@"$INSTALLER_IP":/home/stack/.ssh/id_rsa instack_key
+ sudo scp $ssh_opts "root@$INSTALLER_IP:/home/stack/.ssh/id_rsa" instack_key
sudo chown $(whoami):$(whoami) instack_key
chmod 400 instack_key
- ssh_opts_cpu+=" -i instack_key"
}
-function installer_apply_patches {
- # Noop
- return
+function get_controller_ips {
+ is_set CONTROLLER_IPS && return
+ get_installer_ip
+ CONTROLLER_IPS=$(sudo ssh $ssh_opts $INSTALLER_IP \
+ "source stackrc
+ nova list | grep ' overcloud-controller-[0-9] ' | \
+ sed -e 's/^.*ctlplane=//' -e 's/ *|\$//'")
+ die_if_not_set $LINENO CONTROLLER_IPS "No controller IPs"
+}
+
+function setup_installer {
+ get_installer_ip
+ installer_get_ssh_keys
+ get_controller_ips
+}
+
+function get_compute_ip_from_hostname {
+ local compute_host=$1
+
+ compute_host_in_undercloud=${compute_host%%.*}
+ COMPUTE_IP=$(sudo ssh $ssh_opts $INSTALLER_IP \
+ "source stackrc;
+ nova show $compute_host_in_undercloud | \
+ awk '/ ctlplane network /{print \$5}'")
+ die_if_not_set $LINENO COMPUTE_IP "Could get IP address of $compute_host."
}
-function cleanup_installer_apex {
+function cleanup_installer {
# Noop
return
}
diff --git a/tests/lib/installers/fuel b/tests/lib/installers/fuel
index 9ff9e724..da0de34b 100644
--- a/tests/lib/installers/fuel
+++ b/tests/lib/installers/fuel
@@ -4,18 +4,16 @@ if [[ "congress " == "$INSPECTOR_TYPE" ]]; then
die $LINENO "fuel does not support congress yet..."
fi
+COMPUTE_USER=${COMPUTE_USER:-root}
+ssh_opts_cpu="$ssh_opts -i instack_key"
+
function get_installer_ip {
- ssh_opts_cpu="$ssh_opts -i instack_key"
is_set INSTALLER_IP && return
- local instack_mac
- instack_mac=$(sudo virsh domiflist fuel-master | awk '/fuel1/{print $5}')
- INSTALLER_IP=$(/usr/sbin/arp -e | grep ${instack_mac} | awk '{print $1}')
- die_if_not_set $LINENO INSTALLER_IP "No installer IP"
+ INSTALLER_IP=$(get_first_vnic_ip fuel-master)
}
function get_controller_ips {
is_set CONTROLLER_IPS && return
- get_installer_ip
CONTROLLER_IPS=$(ssh $ssh_opts_cpu root@$INSTALLER_IP \
"fuel node | grep controller | cut -d '|' -f 5|xargs")
die_if_not_set $LINENO CONTROLLER_IPS "No controller IPs"
@@ -33,13 +31,7 @@ function installer_get_ssh_keys {
}
function installer_apply_patches {
- if ! openstack flavor show $VM_FLAVOR ; then
- openstack flavor create --ram 512 --disk 1 $VM_FLAVOR \
- && touch created_doctor_flavor
- fi
-
# TODO(r-mibu): fix the followings in upstream (fuel)
- get_controller_ips
for node in $CONTROLLER_IPS;do
echo "check controller configuration for doctor ($node)"
ssh $ssh_opts_cpu "root@$node" '
@@ -86,11 +78,28 @@ function installer_apply_patches {
done
}
-function cleanup_installer_fuel {
- if [[ -e created_doctor_flavor ]] && openstack flavor show $VM_FLAVOR ; then
- openstack flavor delete $VM_FLAVOR && rm -f created_doctor_flavor
+function setup_installer {
+ get_installer_ip
+ installer_get_ssh_keys
+ get_controller_ips
+ installer_apply_patches
+ if ! openstack flavor show $VM_FLAVOR ; then
+ openstack flavor create --ram 512 --disk 1 $VM_FLAVOR \
+ && touch created_doctor_flavor
fi
+}
+
+function get_compute_ip_from_hostname {
+ local compute_host=$1
+
+ compute_host_in_undercloud=${compute_host%%.*}
+ node_id=$(echo $compute_host_in_undercloud | cut -d "-" -f 2)
+ COMPUTE_IP=$(sshpass -p r00tme ssh 2>/dev/null $ssh_opts root@${INSTALLER_IP} \
+ "fuel node|awk -F '|' -v id=$node_id '{if (\$1 == id) print \$5}' |xargs")
+ die_if_not_set $LINENO COMPUTE_IP "Could get IP address of $compute_host."
+}
+function installer_revert_patches {
# TODO(r-mibu): fix the followings in upstream (fuel)
get_controller_ips
for node in $CONTROLLER_IPS;do
@@ -132,3 +141,10 @@ function cleanup_installer_fuel {
' >> installer_apply_patches_$node.log 2>&1
done
}
+
+function cleanup_installer {
+ if [[ -e created_doctor_flavor ]] && openstack flavor show $VM_FLAVOR ; then
+ openstack flavor delete $VM_FLAVOR && rm -f created_doctor_flavor
+ fi
+ installer_revert_patches
+}
diff --git a/tests/lib/installers/local b/tests/lib/installers/local
index e7aed14f..50c3686f 100644
--- a/tests/lib/installers/local
+++ b/tests/lib/installers/local
@@ -1,9 +1,7 @@
#!/bin/bash
-function get_installer_ip {
- # Noop
- return
-}
+COMPUTE_USER=${COMPUTE_USER:-$(whoami)}
+ssh_opts_cpu="$ssh_opts"
function installer_get_ssh_keys {
echo "INSTALLER_TYPE set to 'local'. Assuming SSH keys already exchanged with $COMPUTE_HOST"
@@ -15,7 +13,24 @@ function installer_apply_patches {
return
}
-function cleanup_installer_local {
+function setup_installer {
+ installer_get_ssh_keys
+ installer_apply_patches
+}
+
+function get_compute_ip_from_hostname {
+ local compute_host=$1
+
+ if is_set COMPUTE_IP; then
+ echo "Using pre-configured COMPUTE_IP=$COMPUTE_IP ..."
+ return
+ fi
+ COMPUTE_IP=$(getent hosts "$compute_host" | awk '{ print $1 }')
+ die_if_not_set $LINENO COMPUTE_IP \
+ "Could not resolve $compute_host. Either manually set COMPUTE_IP or enable DNS resolution."
+}
+
+function cleanup_installer {
# Noop
return
}