From 92e1b7f63a7ba9de5549b624720452314a257691 Mon Sep 17 00:00:00 2001 From: xujingsong Date: Tue, 21 Apr 2020 10:19:14 +0800 Subject: [PATCH] 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 --- doc/source/installation/containerized.rst | 2 +- tools/generate_k8s_resource_definitions.sh | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/doc/source/installation/containerized.rst b/doc/source/installation/containerized.rst index fe1f14faa..926931287 100644 --- a/doc/source/installation/containerized.rst +++ b/doc/source/installation/containerized.rst @@ -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 [] [] [] + $ ./tools/generate_k8s_resource_definitions.sh [] [] [] * ``output_dir`` - directory where to put yaml files with definitions. * ``controller_conf_path`` - path to custom kuryr-controller configuration diff --git a/tools/generate_k8s_resource_definitions.sh b/tools/generate_k8s_resource_definitions.sh index ac86b3639..b5199570f 100755 --- a/tools/generate_k8s_resource_definitions.sh +++ b/tools/generate_k8s_resource_definitions.sh @@ -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