openstack
/
magnum
Code Issues Proposed changes

Merge "Fix the order of enabling devstack plugin"

This commit is contained in:
Jenkins 2016-09-16 08:08:57 +00:00 committed by Gerrit Code Review
parent eb6dc42177 38059d53f9
commit 65e2f4daa8
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/source/dev/quickstart.rst
View File

@ -119,7 +119,7 @@ Kilo, and heat must be enabled by yourself)::
ADMIN_PASSWORD=password
# magnum requires the following to be set correctly
PUBLIC_INTERFACE=eth1
enable_plugin magnum https://git.openstack.org/openstack/magnum
# Enable barbican service and use it to store TLS certificates
# For details http://docs.openstack.org/developer/magnum/dev/tls.html
enable_plugin barbican https://git.openstack.org/openstack/barbican
@ -127,6 +127,9 @@ Kilo, and heat must be enabled by yourself)::
enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas
enable_plugin octavia https://git.openstack.org/openstack/octavia
# Enable magnum plugin after dependent plugins
enable_plugin magnum https://git.openstack.org/openstack/magnum
# Disable LBaaS(v1) service
disable_service q-lbaas
# Enable LBaaS(v2) services

4
magnum/tests/contrib/gate_hook.sh
View File

@ -20,7 +20,6 @@ special=$2
export PROJECTS="openstack/barbican $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin heat git://git.openstack.org/openstack/heat"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin magnum git://git.openstack.org/openstack/magnum"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
if [ "${coe}${special}" != "k8s-ironic" ]; then
@ -83,4 +82,7 @@ else
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-atomic-f23-dib'"
fi
# Enable magnum plugin in the last step
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin magnum git://git.openstack.org/openstack/magnum"
$BASE/new/devstack-gate/devstack-vm-gate.sh