From ba197de900785a6e63db1f5c4ac583a6143f637b Mon Sep 17 00:00:00 2001 From: Alberto Murillo Silva Date: Tue, 14 Mar 2017 17:51:53 -0600 Subject: [PATCH 1/3] ciao: Deprecate the use of ciao-deploy container Signed-off-by: Alberto Murillo Silva --- source/ciao-deploy.rst | 49 +++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 32 deletions(-) diff --git a/source/ciao-deploy.rst b/source/ciao-deploy.rst index 4340f7df..76d1a5b6 100644 --- a/source/ciao-deploy.rst +++ b/source/ciao-deploy.rst @@ -36,13 +36,24 @@ that, configure a user for passwordless SSH connections from the deployment container to the cluster nodes. This user must also have passwordless sudo privileges on the cluster nodes. -This guide uses a Docker* container to provide all the needed deployment tools; -in order to use it, you will need Docker in the machine you're using to orchestrate -your deployment. - Configure your cluster setup ============================ +The deployment node requires the following software to be installed: + * ansible>=2.2.1.0 + * openstackclient + * python-netaddr + * gcc + * go>=1.7 + * git + +You can install all of them with the following command + +.. code-block:: console + + # swupd bundle-add sysadmin-hostmgmt c-basic go-basic openstack-python-clients + + You will need to download the ciao example deployment as follows: .. code-block:: console @@ -73,40 +84,14 @@ A full list of available variables can be found in the :file:`defaults/main.yml` file of each role at https://github.com/01org/ciao/tree/master/_DeploymentAndDistroPackaging/ansible/roles. -To start your cluster setup, we provide a ready-to-use Docker container. -Simply download it and run your setup: - -.. code-block:: console - - $ docker pull clearlinux/ciao-deploy - - -You can later launch the container with: - -.. code-block:: console - - $ docker run --privileged -v /dev/:/dev/ - -v /path/to/your/.ssh/key:/root/.ssh/id_rsa \ - -v $(pwd)/ciao:/root/ciao \ - -it clearlinux/ciao-deploy - -.. note:: - - The cotainer needs `--privileged -v /dev/:/dev/` in order to - install your certificates in the `CNCI image`_. - To learn more about the Docker options used, please refer to the - `Docker* documentation`_. - Run the playbook ================ -Once the variables and hosts file are configured, continue in the -`/root/ciao/_DeploymentAndDistroPackaging/ansible` directory and -start the deployment: +Once the variables and hosts file are configured, start the deployment: .. code-block:: console - # cd /root/ciao/_DeploymentAndDistroPackaging/ansible + # cd ciao/_DeploymentAndDistroPackaging/ansible/ # ansible-playbook -i hosts ciao.yml \ --private-key=~/.ssh/id_rsa \ From d31c34ef0e8a87fe4f960d421cde924cfa28a646 Mon Sep 17 00:00:00 2001 From: Rodrigo Caballero Date: Thu, 16 Mar 2017 16:41:29 -0600 Subject: [PATCH 2/3] Edit grammar, style, and markup. Removed the overly familiar style, fixed some minor grammar issues, and added the appropriate markup where needed. Signed-off-by: Rodrigo Caballero --- source/ciao-deploy.rst | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/source/ciao-deploy.rst b/source/ciao-deploy.rst index 76d1a5b6..e4bd3f07 100644 --- a/source/ciao-deploy.rst +++ b/source/ciao-deploy.rst @@ -39,19 +39,22 @@ privileges on the cluster nodes. Configure your cluster setup ============================ -The deployment node requires the following software to be installed: - * ansible>=2.2.1.0 +Ensure the following packages are installed before running the deployment +node: + + * ansible version 2.2.1.0 or higher * openstackclient * python-netaddr * gcc - * go>=1.7 + * go version 1.7 or higher * git -You can install all of them with the following command +Install all of the needed packages with the following command: .. code-block:: console - # swupd bundle-add sysadmin-hostmgmt c-basic go-basic openstack-python-clients + # swupd bundle-add sysadmin-hostmgmt c-basic go-basic + openstack-python-clients You will need to download the ciao example deployment as follows: @@ -87,7 +90,9 @@ https://github.com/01org/ciao/tree/master/_DeploymentAndDistroPackaging/ansible/ Run the playbook ================ -Once the variables and hosts file are configured, start the deployment: + +After the variables and the :file:`hosts` file are configured, start the +deployment with the following commands: .. code-block:: console From 95a1433f772ac21b60cd33d497d55694d3f0dcef Mon Sep 17 00:00:00 2001 From: Alberto Murillo Silva Date: Fri, 17 Mar 2017 18:16:57 -0600 Subject: [PATCH 3/3] ciao-deploy: Install python-keystoneclient python-keystoneclient package used to live in the now deprecated openstack-python-clients bundle and needs to be installed with pip Signed-off-by: Alberto Murillo Silva --- source/ciao-deploy.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/ciao-deploy.rst b/source/ciao-deploy.rst index e4bd3f07..90e3e4ca 100644 --- a/source/ciao-deploy.rst +++ b/source/ciao-deploy.rst @@ -49,12 +49,12 @@ node: * go version 1.7 or higher * git -Install all of the needed packages with the following command: +Install all of the needed packages with the following commands: .. code-block:: console # swupd bundle-add sysadmin-hostmgmt c-basic go-basic - openstack-python-clients + # pip2 install python-keystoneclient You will need to download the ciao example deployment as follows: