Merge pull request #27 from cooktheryan/master

shrinks image by 150mb

Dockerfile

@@ -1,22 +1,19 @@
 FROM fedora
 MAINTAINER Red Hat, Inc. <container-tools@redhat.com>
 
-RUN dnf -y update && dnf -y install --setopt=tsflags=nodocs rsync openssh-clients redhat-rpm-config python-pip python-virtualenv git gcc libffi-devel ; dnf clean all
-
 ENV MHM_RELEASE v0.0.0
 ENV PYTHONPATH  /commissaire/src/
 
-# TODO: Pull a release?
-RUN git clone https://github.com/projectatomic/commissaire.git && \
+# Install required dependencies and commissaire
+RUN dnf -y update && dnf -y install --setopt=tsflags=nodocs rsync openssh-clients redhat-rpm-config python-pip python-virtualenv git gcc libffi-devel ; dnf clean all && \
+git clone https://github.com/projectatomic/commissaire.git && \
 virtualenv /environment && \
 . /environment/bin/activate && \
 cd commissaire && \
 pip install -U pip && \
 pip install -r requirements.txt && \
-pip freeze > /installed-python-deps.txt
-
-# Clean up
-RUN dnf remove -y gcc git redhat-rpm-config libffi-devel && dnf clean all
+pip freeze > /installed-python-deps.txt  && \
+dnf remove -y gcc git redhat-rpm-config libffi-devel && dnf clean all
 
 EXPOSE 8000
 WORKDIR /commissaire

doc/gettingstarted.rst

@@ -32,19 +32,6 @@ From the repo root...
    ...
    (virtualenv)$ python setup.py nosetests
 
-Adding a Host Manually
-~~~~~~~~~~~~~~~~~~~~~~
-
-.. todo::
-
-   Remove this once container registration work is merged.
-
-Verify that etcd is running then execute...
-
-.. code-block:: shell
-
-   (virtualenv)$ etcdctl set /commissaire/hosts/10.0.0.1 '{"address": "10.0.0.1","status": "available","os": "atomic","cpus": 2,"memory": 11989228,"space": 487652,"last_check": "2015-12-17T15:48:18.710454","ssh_priv_key": "dGVzdAo=", "cluster": "default"}'
-
 (Optional): Put Configs in Etcd
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 commissaire will default back to the local files but using Etcd is where configuration should be stored.
@@ -95,3 +82,22 @@ To run the image specify the ETCD and KUBE variables pointing towards the specif
 
     docker run -d -e ETCD=http://127.0.0.1:2379 -e KUBE=http://127.0.0.1:8080 commissaire
     ...
+
+Adding a Cluster
+~~~~~~~~~~~~~~~~
+Verify that Commissaire is running as a container or in the virtual environment then execute...
+
+.. code-block:: shell
+
+   curl -u "a:a" -XPUT -H "Content-Type: application/json" http://localhost:8000/api/v0/cluster/datacenter1
+   ...
+
+
+Adding a Host
+~~~~~~~~~~~~~
+Verify that Commissaire is running as a container or in the virtual environment then execute...
+
+.. code-block:: shell
+
+   curl -u "a:a" -XPUT -H "Content-Type: application/json" http://localhost:8000/api/v0/host/192.168.1.100 -d '{"host": "192.168.1.100", "cluster": "datacenter1", "ssh_priv_key": "dGVzdAo="}'
+   ...