starlingx/nfv
Code Issues Proposed changes

Some updates to stx-nfv Devstack plugin

Browse Source 
This installs, starts, stops, and clean nova-api-proxy service.

Story: 2003163
Task: 28141

Change-Id: I6c48c21a97df0c9324e77f6ffff70b7afd0b57c9
Signed-off-by: Yi Wang <yi.c.wang@intel.com>
This commit is contained in:
Yi Wang 2018-12-05 18:04:56 +08:00
parent 8e91fba5c8
commit bd539f9e48
2 changed files with 60 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
devstack/lib/stx-nfv
View File

@ -22,6 +22,9 @@ NFV_PLUGINS_DIR=$NFV_DIR/nfv-plugins
NFV_TOOLS_DIR=$NFV_DIR/nfv-tools NFV_TOOLS_DIR=$NFV_DIR/nfv-tools
NFV_VIM_DIR=$NFV_DIR/nfv-vim NFV_VIM_DIR=$NFV_DIR/nfv-vim
NOVA_API_PROXY_CONF=$STXNFV_SYSCONFDIR/proxy
NOVA_API_PROXY_DIR=$STXNFV_DIR/nova-api-proxy/nova-api-proxy
GUEST_CLIENT_VERSION="3.0.1" GUEST_CLIENT_VERSION="3.0.1"
STX_SDK_DEPLOY_DIR=${STX_SDK_DEPLOY_DIR:-/opt/deploy/cgcs_sdk} STX_SDK_DEPLOY_DIR=${STX_SDK_DEPLOY_DIR:-/opt/deploy/cgcs_sdk}
@ -74,6 +77,28 @@ function cleanup_nfv_vim {
pip_uninstall nfv-vim pip_uninstall nfv-vim
} }
function cleanup_nova_api_proxy {
pip_uninstall api-proxy
}
function configure_nova_api_proxy {
iniset -sudo $NOVA_API_PROXY_CONF/nova-api-proxy.conf "DEFAULT" "pool_size" "256"
iniset -sudo $NOVA_API_PROXY_CONF/nova-api-proxy.conf "DEFAULT" "nfvi_compute_listen_port" "30003"
iniset -sudo $NOVA_API_PROXY_CONF/nova-api-proxy.conf "DEFAULT" "nfvi_compute_listen" "127.0.0.1"
iniset -sudo $NOVA_API_PROXY_CONF/nova-api-proxy.conf "keystone_authtoken" "auth_type" "password"
iniset -sudo $NOVA_API_PROXY_CONF/nova-api-proxy.conf "keystone_authtoken" "auth_url" "$KEYSTONE_SERVICE_URI"
iniset -sudo $NOVA_API_PROXY_CONF/nova-api-proxy.conf "keystone_authtoken" "user_domain_name" "$SERVICE_DOMAIN_NAME"
iniset -sudo $NOVA_API_PROXY_CONF/nova-api-proxy.conf "keystone_authtoken" "username" "nova"
iniset -sudo $NOVA_API_PROXY_CONF/nova-api-proxy.conf "keystone_authtoken" "password" "$SERVICE_PASSWORD"
iniset -sudo $NOVA_API_PROXY_CONF/nova-api-proxy.conf "keystone_authtoken" "project_domain_name" "$SERVICE_DOMAIN_NAME"
iniset -sudo $NOVA_API_PROXY_CONF/nova-api-proxy.conf "keystone_authtoken" "project_name" "$SERVICE_PROJECT_NAME"
iniset -sudo $NOVA_API_PROXY_CONF/nova-api-proxy.conf "keystone_authtoken" "admin_user" "nova"
iniset -sudo $NOVA_API_PROXY_CONF/nova-api-proxy.conf "keystone_authtoken" "admin_tenant_name" "$SERVICE_PROJECT_NAME"
iniset -sudo $STXNFV_SYSCONFDIR/systemd/system/devstack@nova-api-proxy.service "Service" "Type" "simple"
iniset -sudo $STXNFV_SYSCONFDIR/systemd/system/devstack@nova-api-proxy.service "Service" "PIDFile" "/var/run/nova-api-proxy.pid"
}
function install_guest_client { function install_guest_client {
pushd $STXNFV_DIR/guest-client/guest-client-$GUEST_CLIENT_VERSION pushd $STXNFV_DIR/guest-client/guest-client-$GUEST_CLIENT_VERSION
@ -198,6 +223,17 @@ function install_nfv_vim {
iniset -sudo $NFV_CONF_DIR/vim/config.ini "sw-mgmt-configuration" "single_controller" "True" iniset -sudo $NFV_CONF_DIR/vim/config.ini "sw-mgmt-configuration" "single_controller" "True"
} }
function install_nova_api_proxy {
pushd $NOVA_API_PROXY_DIR
python setup.py build
sudo python setup.py install --root=/ --install-lib=${PYTHON_SITE_DIR} --single-version-externally-managed
popd
sudo install -d -m 755 $NOVA_API_PROXY_CONF
sudo install -p -D -m 744 $NOVA_API_PROXY_DIR/nova_api_proxy/nova-api-proxy.conf $NOVA_API_PROXY_CONF/nova-api-proxy.conf
sudo install -p -D -m 744 $NOVA_API_PROXY_DIR/nova_api_proxy/api-proxy-paste.ini $NOVA_API_PROXY_CONF/api-proxy-paste.ini
}
function start_nfv { function start_nfv {
if is_service_enabled nfv-vim; then if is_service_enabled nfv-vim; then
start_nfv_vim start_nfv_vim
@ -228,6 +264,11 @@ function start_nfv_vim_webserver {
run_process nfv-vim-webserver "$NFV_OCF_DIR/vim-webserver start" root root run_process nfv-vim-webserver "$NFV_OCF_DIR/vim-webserver start" root root
} }
function start_nova_api_proxy {
local daemon=$(which nova-api-proxy)
run_process nova-api-proxy "$daemon --config-file=$NOVA_API_PROXY_CONF/nova-api-proxy.conf" root root
}
function stop_nfv { function stop_nfv {
if is_service_enabled nfv-vim; then if is_service_enabled nfv-vim; then
stop_nfv_vim stop_nfv_vim
@ -252,4 +293,8 @@ function stop_nfv_vim_webserver {
stop_process nfv-vim-webserver stop_process nfv-vim-webserver
} }
function stop_nova_api_proxy {
stop_process nova-api-proxy
}
$_XTRACE_STX_NFV $_XTRACE_STX_NFV

17
devstack/plugin.sh
View File

@ -13,6 +13,9 @@ if is_service_enabled stx-nfv; then
if is_service_enabled nfv-vim || is_service_enabled nfv-vim-api || is_service_enabled nfv-vim-webserver; then if is_service_enabled nfv-vim || is_service_enabled nfv-vim-api || is_service_enabled nfv-vim-webserver; then
install_nfv install_nfv
fi fi
if is_service_enabled nova-api-proxy; then
install_nova_api_proxy
fi
if is_service_enabled guest-client; then if is_service_enabled guest-client; then
install_guest_client install_guest_client
fi fi
@ -20,14 +23,18 @@ if is_service_enabled stx-nfv; then
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
# Configure after the other layer 1 and 2 services have been configured # Configure after the other layer 1 and 2 services have been configured
echo_summary "Configuring stx-nfv" echo_summary "Configuring stx-nfv"
: if is_service_enabled nova-api-proxy; then
configure_nova_api_proxy
fi
elif [[ "$1" == "stack" && "$2" == "extra" ]]; then elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
echo_summary "Starting stx-nfv" echo_summary "Starting stx-nfv"
if is_service_enabled nfv-vim || is_service_enabled nfv-vim-api || is_service_enabled nfv-vim-webserver; then if is_service_enabled nfv-vim || is_service_enabled nfv-vim-api || is_service_enabled nfv-vim-webserver; then
start_nfv start_nfv
fi fi
if is_service_enabled nova-api-proxy; then
start_nova_api_proxy
fi
fi fi
if [[ "$1" == "unstack" ]]; then if [[ "$1" == "unstack" ]]; then
@ -35,6 +42,9 @@ if is_service_enabled stx-nfv; then
if is_service_enabled nfv-vim || is_service_enabled nfv-vim-api || is_service_enabled nfv-vim-webserver; then if is_service_enabled nfv-vim || is_service_enabled nfv-vim-api || is_service_enabled nfv-vim-webserver; then
stop_nfv stop_nfv
fi fi
if is_service_enabled nova-api-proxy; then
stop_nova_api_proxy
fi
fi fi
if [[ "$1" == "clean" ]]; then if [[ "$1" == "clean" ]]; then
@ -42,6 +52,9 @@ if is_service_enabled stx-nfv; then
if is_service_enabled nfv-vim || is_service_enabled nfv-vim-api || is_service_enabled nfv-vim-webserver; then if is_service_enabled nfv-vim || is_service_enabled nfv-vim-api || is_service_enabled nfv-vim-webserver; then
cleanup_nfv cleanup_nfv
fi fi
if is_service_enabled nova-api-proxy; then
cleanup_nova_api_proxy
fi
if is_service_enabled guest-client; then if is_service_enabled guest-client; then
cleanup_guest_client cleanup_guest_client
fi fi