tools: config_file_generation
With the advent of this tool. Generating the config for local usage and packaging will be much simpler. Closes-bug: #1619252 Change-Id: I95f8f0ec76fb8a75153f6dac12c6ec1d2f485e8b Signed-off-by: Antoni Segura Puimedon <antonisp@celebdor.com>
This commit is contained in:
parent
20456034fe
commit
7d2133d250
|
@ -74,7 +74,7 @@ if is_service_enabled kuryr-libnetwork; then
|
||||||
else
|
else
|
||||||
echo -n "${KURYR_CONFIG} and the default config missing. Auto generating and copying one... "
|
echo -n "${KURYR_CONFIG} and the default config missing. Auto generating and copying one... "
|
||||||
cd ${KURYR_HOME}
|
cd ${KURYR_HOME}
|
||||||
oslo-config-generator --config-file=${KURYR_CONFIG_GENERATOR}
|
tools/generate_config_file_samples.sh
|
||||||
sudo cp ${KURYR_DEFAULT_CONFIG}.sample ${KURYR_DEFAULT_CONFIG}
|
sudo cp ${KURYR_DEFAULT_CONFIG}.sample ${KURYR_DEFAULT_CONFIG}
|
||||||
sudo cp ${KURYR_DEFAULT_CONFIG} ${KURYR_CONFIG}
|
sudo cp ${KURYR_DEFAULT_CONFIG} ${KURYR_CONFIG}
|
||||||
cd -
|
cd -
|
||||||
|
|
|
@ -2,8 +2,6 @@
|
||||||
KURYR_HOME=${KURYR_HOME:-$DEST/kuryr-libnetwork}
|
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=${KURYR_HOME}/etc/${KURYR_CONFIG_GENERATOR_FILENAME}
|
|
||||||
|
|
||||||
# See libnetwork's plugin discovery mechanism:
|
# See libnetwork's plugin discovery mechanism:
|
||||||
# https://github.com/docker/docker/blob/c4d45b6a29a91f2fb5d7a51ac36572f2a9b295c6/docs/extend/plugin_api.md#plugin-discovery
|
# https://github.com/docker/docker/blob/c4d45b6a29a91f2fb5d7a51ac36572f2a9b295c6/docs/extend/plugin_api.md#plugin-discovery
|
||||||
|
|
|
@ -0,0 +1,54 @@
|
||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
# License for the specific language governing permissions and limitations
|
||||||
|
# under the License.
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
GEN_CMD=oslo-config-generator
|
||||||
|
SCRIPT_PATH=$(dirname "$(readlink -f "$0")")
|
||||||
|
DIST_PATH=$(dirname "$SCRIPT_PATH")
|
||||||
|
|
||||||
|
prerequisites() (
|
||||||
|
if ! command -v "$GEN_CMD" > /dev/null; then
|
||||||
|
echo "ERROR: $GEN_CMD not installed on the system."
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! [ -f "${DIST_PATH}/kuryr_libnetwork.egg-info/entry_points.txt" ]; then
|
||||||
|
curr_dir=$(pwd)
|
||||||
|
cd "${DIST_PATH}"
|
||||||
|
python setup.py egg_info # Generate entrypoints for config generation
|
||||||
|
cd "${curr_dir}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
return 0
|
||||||
|
)
|
||||||
|
|
||||||
|
generate() (
|
||||||
|
curr_dir=$(pwd)
|
||||||
|
cd "${DIST_PATH}"
|
||||||
|
# Set PYTHONPATH so that it will use the generated egg-info
|
||||||
|
PYTHONPATH=. find "etc/oslo-config-generator" -type f -exec "$GEN_CMD" --config-file="{}" \;
|
||||||
|
cd "${curr_dir}"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
prerequisites
|
||||||
|
rc=$?
|
||||||
|
if [ $rc -ne 0 ]; then
|
||||||
|
exit $rc
|
||||||
|
fi
|
||||||
|
|
||||||
|
generate
|
||||||
|
|
||||||
|
set -x
|
Loading…
Reference in New Issue