openstack/zun
Code Issues Proposed changes

Remove LIBS_FROM_GIT from the plugin code

Browse Source 
LIBS_FROM_GIT should config by user in them local.conf,
This patch Remove LIBS_FROM_GIT from the plugin code.

Closes-Bug: #1733805
Change-Id: I89f6c541e07e8f84cbbd0d7aece91bd320370442
This commit is contained in:
zhurong 2017-11-22 16:59:05 +08:00
parent b295cf8d38
commit d3f19e181e
6 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/README.rst
View File

@ -16,6 +16,10 @@ zun plugin::
enable_plugin zun https://git.openstack.org/openstack/zun master enable_plugin zun https://git.openstack.org/openstack/zun master
END END
If you would like to install python-zunclient from git, add to local.conf::
LIBS_FROM_GIT="python-zunclient"
Then run devstack normally:: Then run devstack normally::
cd /opt/stack/devstack cd /opt/stack/devstack

3
devstack/local.conf.sample
View File

@ -10,5 +10,8 @@ enable_plugin devstack-plugin-container https://git.openstack.org/openstack/devs
KURYR_ETCD_PORT=2379 KURYR_ETCD_PORT=2379
enable_plugin kuryr-libnetwork https://git.openstack.org/openstack/kuryr-libnetwork enable_plugin kuryr-libnetwork https://git.openstack.org/openstack/kuryr-libnetwork
# install python-zunclient from git
LIBS_FROM_GIT="python-zunclient"
# Optional: uncomment to enable the Zun UI plugin in Horizon # Optional: uncomment to enable the Zun UI plugin in Horizon
# enable_plugin zun-ui https://git.openstack.org/openstack/zun-ui # enable_plugin zun-ui https://git.openstack.org/openstack/zun-ui

1
devstack/plugin.sh
View File

@ -13,7 +13,6 @@ if is_service_enabled zun-api zun-compute; then
echo_summary "Installing zun" echo_summary "Installing zun"
install_zun install_zun
LIBS_FROM_GIT="${LIBS_FROM_GIT},python-zunclient"
install_zunclient install_zunclient
cleanup_zun cleanup_zun

3
doc/source/contributor/quickstart.rst
View File

@ -40,6 +40,9 @@ required OpenStack services::
enable_plugin zun https://git.openstack.org/openstack/zun enable_plugin zun https://git.openstack.org/openstack/zun
enable_plugin kuryr-libnetwork https://git.openstack.org/openstack/kuryr-libnetwork enable_plugin kuryr-libnetwork https://git.openstack.org/openstack/kuryr-libnetwork
# install python-zunclient from git
LIBS_FROM_GIT="python-zunclient"
# Optional: uncomment to enable the Zun UI plugin in Horizon # Optional: uncomment to enable the Zun UI plugin in Horizon
# enable_plugin zun-ui https://git.openstack.org/openstack/zun-ui # enable_plugin zun-ui https://git.openstack.org/openstack/zun-ui
END END

1
playbooks/zun-devstack-base-multinode/run.yaml
View File

@ -30,6 +30,7 @@
cat << 'EOF' >>"/tmp/dg-local.conf" cat << 'EOF' >>"/tmp/dg-local.conf"
[[local|localrc]] [[local|localrc]]
enable_plugin zun git://git.openstack.org/openstack/zun enable_plugin zun git://git.openstack.org/openstack/zun
LIBS_FROM_GIT="python-zunclient"
[[post-config|$KURYR_CONFIG]] [[post-config|$KURYR_CONFIG]]
[DEFAULT] [DEFAULT]

1
playbooks/zun-devstack-base/run.yaml
View File

@ -30,6 +30,7 @@
cat << 'EOF' >>"/tmp/dg-local.conf" cat << 'EOF' >>"/tmp/dg-local.conf"
[[local|localrc]] [[local|localrc]]
enable_plugin zun git://git.openstack.org/openstack/zun enable_plugin zun git://git.openstack.org/openstack/zun
LIBS_FROM_GIT="python-zunclient"
EOF EOF
executable: /bin/bash executable: /bin/bash