openstack
/
kuryr-kubernetes
Code Issues Proposed changes

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

And fix documents typo about "generate_k8s_resource_definitions.sh"

Closes-bug: 1873544
Change-Id: I1e227b6d9efce4c41ee2431a817b00d97d33af91
This commit is contained in:
xujingsong 2020-04-21 10:19:14 +08:00
parent 457a91c17f
commit 92e1b7f63a
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
$ ./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.
* ``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
auth_url = $auth_url
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]
ovs_bridge = br-int
service_subnet = $service_subnet_id