Merge pull request #40 from totem/develop

0.3.5 Release

Author: sukrit007

Dockerfile

@@ -8,7 +8,7 @@ RUN apt-get update --fix-missing && apt-get install -y \
     && apt-get clean \
     && rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/*
 
-#Etcdctl
+# Etcdctl
 ENV ETCDCTL_VERSION v0.4.6
 RUN curl -L https://github.com/coreos/etcd/releases/download/$ETCDCTL_VERSION/etcd-$ETCDCTL_VERSION-linux-amd64.tar.gz -o /tmp/etcd-$ETCDCTL_VERSION-linux-amd64.tar.gz && \
     cd /tmp && gzip -dc etcd-$ETCDCTL_VERSION-linux-amd64.tar.gz | tar -xof - && \
@@ -21,13 +21,13 @@ RUN pip install supervisor==3.1.2 supervisor-stdout
 ADD requirements.txt /opt/requirements.txt
 RUN pip install -r /opt/requirements.txt
 
-#Supervisor Config
+# Supervisor Config
 RUN mkdir -p /var/log/supervisor
 ADD bin/supervisord-wrapper.sh /usr/sbin/supervisord-wrapper.sh
 RUN chmod +x /usr/sbin/supervisord-wrapper.sh && \
     ln -sf /etc/supervisor/supervisord.conf /etc/supervisord.conf
 
-#Etc Config
+# Etc Config
 ADD etc /etc
 
 ADD . /opt/cluster-orchestrator

README.md

@@ -87,7 +87,8 @@ sudo docker run -it --rm -h cluster-orchestrator-${USER} --name cluster-orchestr
 | Env Variable | Description |  Default Value (Local) | Default Value (Docker)|
 | ------------ | ----------- | ---------------------- | --------------------- |
 | QUAY_ORGANIZATION | Organization in quay to pull images from | totem | totem|
-| ETCD_HOST | Etcd server host. | 127.0.0.1 | 172.17.42.1 |
+| HOST_IP | HOST IP address | 127.0.0.1 | Determined using default route in routing table|
+| ETCD_HOST | Etcd server host. | 127.0.0.1 | ${HOST_IP} |
 | ETCD_PORT | Etcd server port. | 4001 | 4001 |
 | ETCD_TOTEM_BASE | Base path for totem configurations | /totem | /totem |
 | API_EXECUTORS | No. of uwsgi processes to be created for serving API | Not Used | 2 |

orchestrator/__init__.py

@@ -2,7 +2,7 @@
 from celery.signals import setup_logging
 import orchestrator.logger
 
-__version__ = '0.3.5'
+__version__ = '0.3.6'
 __author__ = 'sukrit'
 
 orchestrator.logger.init_logging()

requirements.txt

@@ -12,6 +12,6 @@ Jinja2==2.7.3
 requests[security]==2.7.0
 urllib3==1.11
 https://github.com/sukrit007/celery/archive/3.1.tar.gz
-https://github.com/totem/flask-hyperschema/archive/master.tar.gz
+https://github.com/totem/flask-hyperschema/archive/v0.1.1.tar.gz
 https://github.com/totem/totem-encrypt/archive/master.tar.gz
 https://github.com/dlitz/pycrypto/archive/v2.7a1.tar.gz