openstack/kuryr-kubernetes
Code Issues Proposed changes

Merge "Add option cafile default value in kuryr-controller's config"

Browse Source
This commit is contained in:
Zuul 2020-04-22 18:14:36 +00:00 committed by Gerrit Code Review
commit 0adbc029df
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/installation/containerized.rst
View File

@ -42,7 +42,7 @@ that can be used to Deploy Kuryr on Kubernetes. The script is placed in
.. code-block:: console .. code-block:: console
$ ./tools/generate_k8s_resource_definitions <output_dir> [<controller_conf_path>] [<cni_conf_path>] [<ca_certificate_path>] $ ./tools/generate_k8s_resource_definitions.sh <output_dir> [<controller_conf_path>] [<cni_conf_path>] [<ca_certificate_path>]
* ``output_dir`` - directory where to put yaml files with definitions. * ``output_dir`` - directory where to put yaml files with definitions.
* ``controller_conf_path`` - path to custom kuryr-controller configuration * ``controller_conf_path`` - path to custom kuryr-controller configuration

9
tools/generate_k8s_resource_definitions.sh
View File

@ -57,6 +57,15 @@ username = $username
password = $password password = $password
auth_url = $auth_url auth_url = $auth_url
auth_type = password auth_type = password
EOF
if [ ! -z $CA_CERTIFICATE_PATH ]; then
cat >> $CONF_PATH << EOF
cafile = /etc/ssl/certs/kuryr-ca-bundle.crt
EOF
fi
cat >> $CONF_PATH << EOF
[neutron_defaults] [neutron_defaults]
ovs_bridge = br-int ovs_bridge = br-int
service_subnet = $service_subnet_id service_subnet = $service_subnet_id