Fix devstack installation for kuryr-libnetwork
Change-Id: Iafc88db02a4cb019a978c5183f4393b70a78f9bb Closes-bug: #1604781
This commit is contained in:
parent
f012544988
commit
1335bfa6a3
|
@ -9,8 +9,8 @@ SERVICE_PASSWORD=pass
|
||||||
SERVICE_TOKEN=pass
|
SERVICE_TOKEN=pass
|
||||||
ADMIN_PASSWORD=pass
|
ADMIN_PASSWORD=pass
|
||||||
|
|
||||||
enable_plugin kuryr https://git.openstack.org/openstack/kuryr
|
enable_plugin kuryr-libnetwork https://git.openstack.org/openstack/kuryr-libnetwork
|
||||||
enable_service kuryr
|
enable_service kuryr-libnetwork
|
||||||
enable_service etcd-server
|
enable_service etcd-server
|
||||||
enable_service docker-engine
|
enable_service docker-engine
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ function check_docker {
|
||||||
|
|
||||||
|
|
||||||
# main loop
|
# main loop
|
||||||
if is_service_enabled kuryr; then
|
if is_service_enabled kuryr-libnetwork; then
|
||||||
if [[ "$1" == "stack" && "$2" == "install" ]]; then
|
if [[ "$1" == "stack" && "$2" == "install" ]]; then
|
||||||
install_etcd_data_store
|
install_etcd_data_store
|
||||||
setup_develop $KURYR_HOME
|
setup_develop $KURYR_HOME
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
KURYR_HOME=${KURYR_HOME:-$DEST/kuryr}
|
KURYR_HOME=${KURYR_HOME:-$DEST/kuryr-libnetwork}
|
||||||
KURYR_ACTIVATOR_FILENAME=kuryr.spec
|
KURYR_ACTIVATOR_FILENAME=kuryr.spec
|
||||||
KURYR_DEFAULT_ACTIVATOR=${KURYR_HOME}/etc/${KURYR_ACTIVATOR_FILENAME}
|
KURYR_DEFAULT_ACTIVATOR=${KURYR_HOME}/etc/${KURYR_ACTIVATOR_FILENAME}
|
||||||
KURYR_CONFIG_GENERATOR_FILENAME=kuryr-config-generator.conf
|
KURYR_CONFIG_GENERATOR_FILENAME=kuryr-config-generator.conf
|
||||||
|
|
Loading…
Reference in New Issue