Skip to content

Commit e994f57

Browse files
author
Eric Windisch
committed
Remove bm_poseur, unmaintained and obsolete
The bm_poseur git repository link has been broken for over 11 months. The virtualized/fake baremetal environment is not working and has not worked in a long time. Now, on the tail of enabling 'enable -o errexit', this functionality now has a hard break. Change-Id: I3cbd8db58c422bc5273d2433278aaa5e449ecfd9 Closes-Bug: 1285954
1 parent 3208d7a commit e994f57

4 files changed

Lines changed: 4 additions & 54 deletions

File tree

‎lib/baremetal‎

Lines changed: 4 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,6 @@ BM_POWER_MANAGER=${BM_POWER_MANAGER:-nova.virt.baremetal.fake.FakePowerManager}
7777
# These should be customized to your environment and hardware
7878
# -----------------------------------------------------------
7979

80-
# whether to create a fake environment, eg. for devstack-gate
81-
BM_USE_FAKE_ENV=`trueorfalse False $BM_USE_FAKE_ENV`
82-
83-
# Extra options to pass to bm_poseur
84-
# change the bridge name or IP: --bridge br99 --bridge-ip 192.0.2.1
85-
# change the virtualization type: --engine qemu
86-
BM_POSEUR_EXTRA_OPTS=${BM_POSEUR_EXTRA_OPTS:-}
87-
8880
# To provide PXE, configure nova-network's dnsmasq rather than run the one
8981
# dedicated to baremetal. When enable this, make sure these conditions are
9082
# fulfilled:
@@ -97,15 +89,10 @@ BM_POSEUR_EXTRA_OPTS=${BM_POSEUR_EXTRA_OPTS:-}
9789
BM_DNSMASQ_FROM_NOVA_NETWORK=`trueorfalse False $BM_DNSMASQ_FROM_NOVA_NETWORK`
9890

9991
# BM_DNSMASQ_IFACE should match FLAT_NETWORK_BRIDGE
100-
if [ "$BM_USE_FAKE_ENV" ]; then
101-
BM_DNSMASQ_IFACE=${BM_DNSMASQ_IFACE:-br99}
102-
BM_DNSMASQ_RANGE=${BM_DNSMASQ_RANGE:-192.0.2.32,192.0.2.48}
103-
else
104-
BM_DNSMASQ_IFACE=${BM_DNSMASQ_IFACE:-eth0}
105-
# if testing on a physical network,
106-
# BM_DNSMASQ_RANGE must be changed to suit your network
107-
BM_DNSMASQ_RANGE=${BM_DNSMASQ_RANGE:-}
108-
fi
92+
BM_DNSMASQ_IFACE=${BM_DNSMASQ_IFACE:-eth0}
93+
# if testing on a physical network,
94+
# BM_DNSMASQ_RANGE must be changed to suit your network
95+
BM_DNSMASQ_RANGE=${BM_DNSMASQ_RANGE:-}
10996

11097
# BM_DNSMASQ_DNS provide dns server to bootstrap clients
11198
BM_DNSMASQ_DNS=${BM_DNSMASQ_DNS:-}
@@ -143,7 +130,6 @@ BM_FLAVOR_ARCH=${BM_FLAVOR_ARCH:-$BM_CPU_ARCH}
143130
# Below this, we set some path and filenames.
144131
# Defaults are probably sufficient.
145132
BM_IMAGE_BUILD_DIR=${BM_IMAGE_BUILD_DIR:-$DEST/diskimage-builder}
146-
BM_POSEUR_DIR=${BM_POSEUR_DIR:-$DEST/bm_poseur}
147133

148134
# Use DIB to create deploy ramdisk and kernel.
149135
BM_BUILD_DEPLOY_RAMDISK=`trueorfalse True $BM_BUILD_DEPLOY_RAMDISK`
@@ -177,7 +163,6 @@ function is_baremetal {
177163
# so that we can build the deployment kernel & ramdisk
178164
function prepare_baremetal_toolchain {
179165
git_clone $BM_IMAGE_BUILD_REPO $BM_IMAGE_BUILD_DIR $BM_IMAGE_BUILD_BRANCH
180-
git_clone $BM_POSEUR_REPO $BM_POSEUR_DIR $BM_POSEUR_BRANCH
181166

182167
local shellinabox_basename=$(basename $BM_SHELL_IN_A_BOX)
183168
if [[ ! -e $DEST/$shellinabox_basename ]]; then
@@ -196,27 +181,6 @@ function prepare_baremetal_toolchain {
196181
fi
197182
}
198183

199-
# set up virtualized environment for devstack-gate testing
200-
function create_fake_baremetal_env {
201-
local bm_poseur="$BM_POSEUR_DIR/bm_poseur"
202-
# TODO(deva): add support for >1 VM
203-
sudo $bm_poseur $BM_POSEUR_EXTRA_OPTS create-bridge
204-
sudo $bm_poseur $BM_POSEUR_EXTRA_OPTS create-vm
205-
BM_FIRST_MAC=$(sudo $bm_poseur get-macs)
206-
207-
# NOTE: there is currently a limitation in baremetal driver
208-
# that requires second MAC even if it is not used.
209-
# Passing a fake value allows this to work.
210-
# TODO(deva): remove this after driver issue is fixed.
211-
BM_SECOND_MAC='12:34:56:78:90:12'
212-
}
213-
214-
function cleanup_fake_baremetal_env {
215-
local bm_poseur="$BM_POSEUR_DIR/bm_poseur"
216-
sudo $bm_poseur $BM_POSEUR_EXTRA_OPTS destroy-vm
217-
sudo $bm_poseur $BM_POSEUR_EXTRA_OPTS destroy-bridge
218-
}
219-
220184
# prepare various directories needed by baremetal hypervisor
221185
function configure_baremetal_nova_dirs {
222186
# ensure /tftpboot is prepared

‎stack.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,9 +1052,6 @@ if is_service_enabled nova && is_baremetal; then
10521052
echo_summary "Preparing for nova baremetal"
10531053
prepare_baremetal_toolchain
10541054
configure_baremetal_nova_dirs
1055-
if [[ "$BM_USE_FAKE_ENV" = "True" ]]; then
1056-
create_fake_baremetal_env
1057-
fi
10581055
fi
10591056

10601057

‎stackrc‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -229,12 +229,6 @@ TEMPEST_BRANCH=${TEMPEST_BRANCH:-master}
229229
BM_IMAGE_BUILD_REPO=${BM_IMAGE_BUILD_REPO:-${GIT_BASE}/openstack/diskimage-builder.git}
230230
BM_IMAGE_BUILD_BRANCH=${BM_IMAGE_BUILD_BRANCH:-master}
231231

232-
# bm_poseur
233-
# Used to simulate a hardware environment for baremetal
234-
# Only used if BM_USE_FAKE_ENV is set
235-
BM_POSEUR_REPO=${BM_POSEUR_REPO:-${GIT_BASE}/tripleo/bm_poseur.git}
236-
BM_POSEUR_BRANCH=${BM_POSEUR_BRANCH:-master}
237-
238232
# a websockets/html5 or flash powered VNC console for vm instances
239233
NOVNC_REPO=${NOVNC_REPO:-https://github.com/kanaka/noVNC.git}
240234
NOVNC_BRANCH=${NOVNC_BRANCH:-master}

‎unstack.sh‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,6 @@ if is_service_enabled tls-proxy; then
127127
killall stud
128128
fi
129129

130-
# baremetal might have created a fake environment
131-
if is_service_enabled baremetal && [[ "$BM_USE_FAKE_ENV" = "True" ]]; then
132-
cleanup_fake_baremetal_env
133-
fi
134-
135130
SCSI_PERSIST_DIR=$CINDER_STATE_PATH/volumes/*
136131

137132
# Get the iSCSI volumes

0 commit comments

Comments
 (0)