From 3b40a1e93b3a91c84bc41d0770b2f69fe7ad0bcd Mon Sep 17 00:00:00 2001 From: Tim Pepper Date: Mon, 23 May 2016 13:56:19 -0700 Subject: [PATCH 1/2] ciao: update CNCI image location A new image is rsyncing to https://download.clearlinux.org/demos/ciao/ and the documentation needs to reference it. To prevent the need for these changes repeatedly in the future, we'll soon have things set up to consume automagically whatever is the latest image. Signed-off-by: Tim Pepper --- source/ciao-cluster-setup.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/ciao-cluster-setup.rst b/source/ciao-cluster-setup.rst index 31d71b99..bb86d40f 100644 --- a/source/ciao-cluster-setup.rst +++ b/source/ciao-cluster-setup.rst @@ -299,10 +299,10 @@ This section describes how to generate a CNCI image from a vanilla Clear Cloud qcow2 image:: $ cd /var/lib/ciao/images - $ curl -O https://download.clearlinux.org/demos/ciao/clear-7520-ciao-networking.img.xz - $ xz -T0 --decompress clear-7520-ciao-networking.img.xz - $ ln -s clear-7520-ciao-networking.img 4e16e743-265a-4bf2-9fd1-57ada0b28904 - $ $GOPATH/src/github.com/01org/ciao/networking/ciao-cnci-agent/scripts/update_cnci_cloud_image.sh /var/lib/ciao/images/clear-7520-ciao-networking.img /etc/pki/ciao/ + $ curl -O https://download.clearlinux.org/demos/ciao/clear-8260-ciao-networking.img.xz + $ xz -T0 --decompress clear-8260-ciao-networking.img.xz + $ ln -s clear-8260-ciao-networking.img 4e16e743-265a-4bf2-9fd1-57ada0b28904 + $ $GOPATH/src/github.com/01org/ciao/networking/ciao-cnci-agent/scripts/update_cnci_cloud_image.sh /var/lib/ciao/images/clear-8260-ciao-networking.img /etc/pki/ciao/ Start the network node launcher ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ From 95181ccb9f7163ef2b9a2b03234dedcfe731b032 Mon Sep 17 00:00:00 2001 From: Mark Ryan Date: Thu, 7 Jul 2016 20:16:44 +0100 Subject: [PATCH 2/2] ciao: Update ciao-launcher instructions This commit removes the --network option that was specified on the various ciao-launcher example command lines in the previous version of this document. --network is no longer needed as the role of a given launcher instance is now determined from its SSNTP certificate. The instructions for resetting compute and network nodes have been updated. The --hard-reset option for launcher makes the other steps unnecessary. Signed-off-by: Mark Ryan --- source/ciao-cluster-setup.rst | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/source/ciao-cluster-setup.rst b/source/ciao-cluster-setup.rst index bb86d40f..0b5d512f 100644 --- a/source/ciao-cluster-setup.rst +++ b/source/ciao-cluster-setup.rst @@ -37,21 +37,21 @@ Network node ("nn") ~~~~~~~~~~~~~~~~~~~ * IP ``192.168.0.102`` -* Runs Launcher with ``--network=nn`` option +* Runs Launcher * Has CNCI image in ``/var/lib/ciao/images``. See below for more on CNCI image preparation. Compute node 1 ("cn1") ~~~~~~~~~~~~~~~~~~~~~~ * IP ``192.168.0.103`` -* Runs Launcher with ``--network=cn`` option +* Runs Launcher * Has workload images in ``/var/lib/ciao/images`` Compute node 2 ("cn2") ~~~~~~~~~~~~~~~~~~~~~~ * ``IP 192.168.0.104`` -* Runs Launcher with ``--network=cn option`` +* Runs Launcher * Has workload images in ``/var/lib/ciao/images`` @@ -269,12 +269,9 @@ images with which you wish to test. Start the compute node launcher ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The launcher is run with options declaring certificates, maximum VMs -(controls when FULL is returned by a node, scaling to the resources -available on your node), server location, and compute node ("cn") -launching type. For example:: +The launcher is run with options for declaring certificates. For example:: - $ sudo ./ciao-launcher --cacert=/etc/pki/ciao/CAcert-[scheduler-node-hostname].pem --cert=/etc/pki/ciao/cert-CNAgent-localhost.pem --network=cn + $ sudo ./ciao-launcher --cacert=/etc/pki/ciao/CAcert-[scheduler-node-hostname].pem --cert=/etc/pki/ciao/cert-CNAgent-localhost.pem Optionally, add ``-logtostderr`` (more verbose with also ``-v=2``) to get console logging output. @@ -307,11 +304,9 @@ Clear Cloud qcow2 image:: Start the network node launcher ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The network node's launcher is run similarly to the compute node's launcher. -The primary difference is that it uses the network node ("nn") launching -type:: +The network node's launcher is run similarly to the compute node's launcher:: - $ sudo ./ciao-launcher --cacert=/etc/pki/ciao/CAcert-[scheduler-node-hostname].pem --cert=/etc/pki/ciao/cert-NetworkingAgent-localhost.pem --network=nn + $ sudo ./ciao-launcher --cacert=/etc/pki/ciao/CAcert-[scheduler-node-hostname].pem --cert=/etc/pki/ciao/cert-NetworkingAgent-localhost.pem Start the controller -------------------- @@ -493,19 +488,13 @@ On the node running your keystone VM, run the following command:: On the network node, run the following commands:: - $ sudo ./launcher --cacert=/etc/pki/ciao/CAcert-[scheduler-node-hostname].pem --cert=/etc/pki/ciao/cert-NetworkingAgent-localhost.pem --network=nn - $ sudo killall -9 qemu-system-x86_64 - $ sudo rm -rf /var/lib/ciao/instances/ + $ sudo ./launcher --hard-reset $ sudo reboot If you were unable to successfully delete all workload VM instances through the UI, then on each compute node run these commands:: - $ sudo ./launcher --cacert=/etc/pki/ciao/CAcert-[scheduler-node-hostname].pem --cert=/etc/pki/ciao/cert-CNAgent-localhost.pem --network=cn - $ sudo killall -9 qemu-system-x86_64 - $ sudo docker rm $(sudo docker ps -qa) - $ sudo docker network rm $(sudo docker network ls -q -f "type=custom") - $ sudo rm -rf /var/lib/ciao/instances/ + $ sudo ./launcher --hard-reset $ sudo reboot Restart your scheduler, network node launcher, compute node launcher,