diff --git a/Dockerfile b/Dockerfile index c8427a61..bb7832c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,8 +8,8 @@ WORKDIR /code RUN apt-get update && \ apt-get install --no-install-recommends -y libsasl2-dev python-dev libldap2-dev libssl-dev && \ rm -rf /var/lib/apt/lists/* && \ - mkdir /var/log/kqueen-api - + mkdir /var/log/kqueen-api && \ + mkdir /opt/kqueen # install kubespray RUN git clone -b v2.5.0 https://github.com/kubernetes-incubator/kubespray.git && \ pip install -r kubespray/requirements.txt diff --git a/README.rst b/README.rst index 760b53fb..eb735ea3 100644 --- a/README.rst +++ b/README.rst @@ -90,6 +90,21 @@ Development :: ./bootstrap_admin.py DemoOrg demoorg admin default + +- Create directories to store Kqueen data and log files + + .. code-block:: bash + + mkdir - m 666 /var/log/kqueen-api + mkdir - m 666 /opt/kqueen + +- Install kubespray or provide path to the existing installation by specifying ``KS_KUBESPRAY_PATH`` in the config file + + .. code-block:: bash + + git clone -b v2.5.0 https://github.com/kubernetes-incubator/kubespray.git && \ + pip install -r kubespray/requirements.txt + - You can start KQueen API service directly :: diff --git a/kqueen/config/base.py b/kqueen/config/base.py index 09d85b81..12145a3e 100644 --- a/kqueen/config/base.py +++ b/kqueen/config/base.py @@ -15,8 +15,8 @@ class BaseConfig: POOL_MAX_WORKERS = 64 # Kubespray settings - KS_FILES_PATH = "/tmp/kqueen" - KS_KUBESPRAY_PATH = "/tmp/kubespray" + KS_FILES_PATH = "/opt/kqueen" + KS_KUBESPRAY_PATH = "./kubespray" KS_SSH_CMD = "/usr/bin/ssh" KS_SSH_KEYGEN_CMD = "/usr/bin/ssh-keygen" KS_ANSIBLE_CMD = "/usr/bin/ansible"