From: asteroide <thomas.duval@orange.com>
Date: Fri, 28 Jul 2017 07:24:17 +0000 (+0200)
Subject: Add bootstrap file to configure and run orchestrator
X-Git-Tag: opnfv-5.1.RC1~14
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=845dca2727c28fbff0b86ef7275d8b182354a85f;p=moon.git

Add bootstrap file to configure and run orchestrator

Change-Id: I1ffca2ccfd90dfa3fc22e49d39d8905765a50b7a
---

diff --git a/moonv4/moon_orchestrator/Changelog b/moonv4/moon_orchestrator/Changelog
index 544e8fd1..31aabf5d 100644
--- a/moonv4/moon_orchestrator/Changelog
+++ b/moonv4/moon_orchestrator/Changelog
@@ -19,3 +19,7 @@ CHANGES
 -----
 - add Changelog
 
+1.1.0
+-----
+- add bootstrap file to start Orchestrator with all configuration
+
diff --git a/moonv4/moon_orchestrator/Dockerfile b/moonv4/moon_orchestrator/Dockerfile
index 0425d959..b68c130f 100644
--- a/moonv4/moon_orchestrator/Dockerfile
+++ b/moonv4/moon_orchestrator/Dockerfile
@@ -1,6 +1,9 @@
 FROM ubuntu:latest
 
-RUN apt update && apt install python3.5 python3-pip -y
+ENV CONSUL_HOST=consul
+ENV CONSUL_PORT=8500
+
+RUN apt update && apt install python3.5 python3-pip python3-mysql.connector -y
 RUN pip3 install pip --upgrade
 
 ADD . /root
@@ -8,4 +11,4 @@ WORKDIR /root/
 RUN pip3 install -r requirements.txt --upgrade
 RUN pip3 install . --upgrade
 
-CMD ["python3", "-m", "moon_orchestrator"]
\ No newline at end of file
+CMD ["python3", "bootstrap.py"]
\ No newline at end of file
diff --git a/moonv4/moon_orchestrator/moon_orchestrator/__init__.py b/moonv4/moon_orchestrator/moon_orchestrator/__init__.py
index 2249a1b6..2302dea9 100644
--- a/moonv4/moon_orchestrator/moon_orchestrator/__init__.py
+++ b/moonv4/moon_orchestrator/moon_orchestrator/__init__.py
@@ -3,4 +3,4 @@
 # license which can be found in the file 'LICENSE' in this package distribution
 # or at 'http://www.apache.org/licenses/LICENSE-2.0'.
 
-__version__ = "1.0.1"
+__version__ = "1.1.0"