Browse Source

Merge "Skip k8s installation if needed"

changes/11/614711/1
Zuul 3 years ago
committed by Gerrit Code Review
parent
commit
4e9d87148e
2 changed files with 20 additions and 11 deletions
  1. +19
    -11
      devstack/plugin.sh
  2. +1
    -0
      devstack/settings

+ 19
- 11
devstack/plugin.sh View File

@ -131,18 +131,22 @@ function configure_qinling {
# Configure the database.
iniset $QINLING_CONF_FILE database connection `database_connection_url qinling`
# Configure Kubernetes API server certificates for qinling if required.
if [ "$QINLING_K8S_APISERVER_TLS" == "True" ]; then
iniset $QINLING_CONF_FILE kubernetes kube_host https://$(hostname -f):6443
configure_k8s_certificates
sudo kubectl create -f $QINLING_DIR/example/kubernetes/k8s_qinling_role.yaml
if [ "$QINLING_INSTALL_K8S" == "True" ]; then
# Configure Kubernetes API server certificates for qinling if required.
if [ "$QINLING_K8S_APISERVER_TLS" == "True" ]; then
iniset $QINLING_CONF_FILE kubernetes kube_host https://$(hostname -f):6443
configure_k8s_certificates
sudo kubectl create -f $QINLING_DIR/example/kubernetes/k8s_qinling_role.yaml
else
iniset $QINLING_CONF_FILE kubernetes use_api_certificate False
fi
# Config etcd TLS certs
configure_etcd_certificates
else
iniset $QINLING_CONF_FILE kubernetes use_api_certificate False
echo_summary "Skip k8s related configuration"
fi
# Config etcd TLS certs
configure_etcd_certificates
iniset $QINLING_CONF_FILE kubernetes replicas 5
}
@ -191,8 +195,12 @@ if is_service_enabled qinling; then
create_qinling_accounts
fi
echo_summary "Installing kubernetes cluster"
install_k8s
if [ "$QINLING_INSTALL_K8S" == "True" ]; then
echo_summary "Installing kubernetes cluster"
install_k8s
else
echo_summary "Skip kubernetes cluster installation"
fi
configure_qinling


+ 1
- 0
devstack/settings View File

@ -26,4 +26,5 @@ QINLING_PYTHON_RUNTIME_IMAGE=${QINLING_PYTHON_RUNTIME_IMAGE:-openstackqinling/py
QINLING_NODEJS_RUNTIME_IMAGE=${QINLING_NODEJS_RUNTIME_IMAGE:-openstackqinling/nodejs-runtime:0.0.1}
QINLING_SIDECAR_IMAGE=${QINLING_SIDECAR_IMAGE:-openstackqinling/sidecar:0.0.2}
QINLING_INSTALL_K8S=${QINLING_INSTALL_K8S:-True}
QINLING_K8S_APISERVER_TLS=${QINLING_K8S_APISERVER_TLS:-True}

Loading…
Cancel
Save