x/apmec
Code Issues Proposed changes

Update APMEC code

Browse Source
This commit is contained in:
Tung Doan 2018-05-07 19:31:01 +02:00
parent 6f5e1d7338
commit cd07ba2e87
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
devstack/lib/apmec
View File

@ -27,8 +27,6 @@
# Apmec # Apmec
# --------------- # ---------------
CUSTOM_BASE="https://pineunity:Doantung92*@github.com/pineunity"
EXTRA_CUSTOM_BASE="git+https://pineunity:Doantung92*@github.com/pineunity"
#LIB_DEST=/usr/local/lib/python2.7/dist-packages #LIB_DEST=/usr/local/lib/python2.7/dist-packages
# Save trace setting # Save trace setting
@ -43,19 +41,19 @@ if is_ssl_enabled_service "apmec" || is_service_enabled tls-proxy; then
fi fi
# Set up default directories # Set up default directories
GITREPO["apmec-horizon"]=${APMECHORIZON_REPO:-${CUSTOM_BASE}/apmec-horizon.git} GITREPO["apmec-horizon"]=${APMECHORIZON_REPO:-${GIT_BASE}/apmec-horizon.git}
GITBRANCH["apmec-horizon"]=${APMECHORIZON_BRANCH:-master} GITBRANCH["apmec-horizon"]=${APMECHORIZON_BRANCH:-master}
GITDIR["apmec-horizon"]=$DEST/apmec-horizon GITDIR["apmec-horizon"]=$DEST/apmec-horizon
GITREPO["python-apmecclient"]=${APMECHORIZON_REPO:-${CUSTOM_BASE}/python-apmecclient.git} GITREPO["python-apmecclient"]=${APMECHORIZON_REPO:-${GIT_BASE}/python-apmecclient.git}
GITBRANCH["python-apmecclient"]=${APMECHORIZON_BRANCH:-apmec-nfv} GITBRANCH["python-apmecclient"]=${APMECHORIZON_BRANCH:-apmec-nfv}
GITDIR["python-apmecclient"]=$DEST/python-apmecclient GITDIR["python-apmecclient"]=$DEST/python-apmecclient
#GITREPO["mec-tosca-parser"]=${APMECHORIZON_REPO:-${CUSTOM_BASE}/mec-tosca-parser.git} #GITREPO["mec-tosca-parser"]=${APMECHORIZON_REPO:-${GIT_BASE}/mec-tosca-parser.git}
#GITBRANCH["mec-tosca-parser"]=${APMECHORIZON_BRANCH:-master} #GITBRANCH["mec-tosca-parser"]=${APMECHORIZON_BRANCH:-master}
#GITDIR["mec-tosca-parser"]=/$LIB_DEST/toscaparser #GITDIR["mec-tosca-parser"]=/$LIB_DEST/toscaparser
#GITREPO["mec-heat-translator"]=${APMECHORIZON_REPO:-${CUSTOM_BASE}/mec-heat-translator.git} #GITREPO["mec-heat-translator"]=${APMECHORIZON_REPO:-${GIT_BASE}/mec-heat-translator.git}
#GITBRANCH["mec-heat-translator"]=${APMECHORIZON_BRANCH:-master} #GITBRANCH["mec-heat-translator"]=${APMECHORIZON_BRANCH:-master}
#GITDIR["mec-heat-translator"]=$LIB_DEST/heat_translator #GITDIR["mec-heat-translator"]=$LIB_DEST/heat_translator
@ -334,14 +332,14 @@ function _apmec_setup_keystone {
configure_auth_token_middleware $conf_file $APMEC_ADMIN_USERNAME $APMEC_AUTH_CACHE_DIR $section configure_auth_token_middleware $conf_file $APMEC_ADMIN_USERNAME $APMEC_AUTH_CACHE_DIR $section
} }
function mec_tosca_parser_install { #function mec_tosca_parser_install {
sudo pip install ${EXTRA_CUSTOM_BASE}/mec-tosca-parser.git # sudo pip install ${EXTRA_CUSTOM_BASE}/mec-tosca-parser.git
} #}
function mec_heat_translator_install { #function mec_heat_translator_install {
sudo pip install ${EXTRA_CUSTOM_BASE}/mec-heat-translator.git # sudo pip install ${EXTRA_CUSTOM_BASE}/mec-heat-translator.git
} #}
function apmec_horizon_install { function apmec_horizon_install {
git_clone_by_name "apmec-horizon" git_clone_by_name "apmec-horizon"

8
devstack/plugin.sh
View File

@ -14,10 +14,10 @@ if is_service_enabled apmec; then
# Perform installation of service source # Perform installation of service source
echo_summary "Installing Apmec" echo_summary "Installing Apmec"
install_apmec install_apmec
echo_summary "Installing tosca parser" # echo_summary "Installing tosca parser"
mec_tosca_parser_install # mec_tosca_parser_install
echo_summary "Installing heat translator" # echo_summary "Installing heat translator"
mec_heat_translator_install # mec_heat_translator_install
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

2
requirements.txt
View File

@ -41,3 +41,5 @@ paramiko>=2.0.0 # LGPLv2.1+
pyroute2>=0.4.21;sys_platform!='win32' # Apache-2.0 (+ dual licensed GPL2) pyroute2>=0.4.21;sys_platform!='win32' # Apache-2.0 (+ dual licensed GPL2)
python-mistralclient>=3.1.0 # Apache-2.0 python-mistralclient>=3.1.0 # Apache-2.0
python-barbicanclient!=4.5.0,!=4.5.1,>=4.0.0 # Apache-2.0 python-barbicanclient!=4.5.0,!=4.5.1,>=4.0.0 # Apache-2.0
tosca-parser>=0.8.1 # Apache-2.0
heat-translator>=0.4.0 # Apache-2.0