openstack
/
monasca-api
Code Issues Proposed changes

Refactor monasca libraries 

Refactor the code about cloning and installing monasca-common
and monasca-statsd repos. Provide new variables in settings
for monasca-statsd.
Removed installation of monasca-common or monasca-statsd where it was
not needed.

Change-Id: I226e42655c834a9a8ac7e58989ac86018d7d4576
This commit is contained in:
Artur Basiak 2017-01-23 12:11:11 +01:00
parent 28a08cc43e
commit fb166d9a68
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
devstack/plugin.sh
View File

@ -839,25 +839,15 @@ function download_monasca_libraries {
echo_summary "Download Monasca monasca_common and monasca_statsd"
git_clone $MONASCA_COMMON_REPO $MONASCA_COMMON_DIR $MONASCA_COMMON_BRANCH
git_clone $MONASCA_STATSD_REPO $MONASCA_STATSD_DIR $MONASCA_STATSD_BRANCH
(cd "${MONASCA_COMMON_DIR}"/java ; sudo mvn clean install -DskipTests)
(cd "${MONASCA_BASE}"/monasca-common ; sudo python setup.py sdist)
(cd "${MONASCA_COMMON_DIR}" ; python setup.py sdist)
MONASCA_COMMON_SRC_DIST=$(ls -td "$MONASCA_COMMON_DIR"/dist/monasca-common*.tar.gz | head -1)
MONASCA_COMMON_SRC_DIST=$(ls -td "$MONASCA_BASE"/monasca-common/dist/monasca-common*.tar.gz | head -1)
sudo pip install $MONASCA_COMMON_SRC_DIST
if [[ ! -d "${MONASCA_BASE}"/monasca-statsd ]]; then
sudo git clone https://git.openstack.org/openstack/monasca-statsd "${MONASCA_BASE}"/monasca-statsd
fi
(cd "${MONASCA_BASE}"/monasca-statsd ; sudo python setup.py sdist)
MONASCA_STATSD_SRC_DIST=$(ls -td "$MONASCA_BASE"/monasca-statsd/dist/monasca-statsd*.tar.gz | head -1)
sudo pip install $MONASCA_STATSD_SRC_DIST
(cd "${MONASCA_STATSD_DIR}"; python setup.py sdist)
MONASCA_STATSD_SRC_DIST=$(ls -td "$MONASCA_STATSD_DIR"/dist/monasca-statsd*.tar.gz | head -1)
}
@ -1213,8 +1203,6 @@ function install_monasca_persister_python {
(cd /opt/monasca-persister ; sudo ./bin/pip install $MONASCA_COMMON_SRC_DIST)
(cd /opt/monasca-persister ; sudo ./bin/pip install $MONASCA_STATSD_SRC_DIST)
(cd /opt/monasca-persister ; ./bin/pip install $MONASCA_PERSISTER_SRC_DIST)
if [[ "${MONASCA_METRICS_DB,,}" == 'influxdb' ]]; then
@ -1678,10 +1666,6 @@ function install_monasca_agent {
(cd /opt/monasca-agent ; sudo virtualenv .)
(cd /opt/monasca-agent ; sudo ./bin/pip install $MONASCA_COMMON_SRC_DIST)
(cd /opt/monasca-agent ; sudo ./bin/pip install $MONASCA_STATSD_SRC_DIST)
(cd /opt/monasca-agent ; sudo ./bin/pip install $MONASCA_AGENT_SRC_DIST)
(cd /opt/monasca-agent ; sudo ./bin/pip install $MONASCA_CLIENT_SRC_DIST)

4
devstack/settings
View File

@ -142,6 +142,10 @@ MONASCA_COMMON_REPO=${MONASCA_COMMON_REPO:-${GIT_BASE}/openstack/monasca-common.
MONASCA_COMMON_BRANCH=${MONASCA_COMMON_BRANCH:-master}
MONASCA_COMMON_DIR=${MONASCA_BASE}/monasca-common
MONASCA_STATSD_REPO=${MONASCA_STATSD_REPO:-${GIT_BASE}/openstack/monasca-statsd.git}
MONASCA_STATSD_BRANCH=${MONASCA_STATSD_BRANCH:-master}
MONASCA_STATSD_DIR=${MONASCA_BASE}/monasca-statsd
MONASCA_GRAFANA_DATASOURCE_REPO=${MONASCA_GRAFANA_DATASOURCE_REPO:-${GIT_BASE}/openstack/monasca-grafana-datasource.git}
MONASCA_GRAFANA_DATASOURCE_BRANCH=${MONASCA_GRAFANA_DATASOURCE_BRANCH:-master}
MONASCA_GRAFANA_DATASOURCE_DIR=${MONASCA_BASE}/monasca-grafana-datasource