From: chenshuai@huawei.com <chenshuai@huawei.com>
Date: Wed, 10 Aug 2016 13:25:53 +0000 (-0400)
Subject: add environment for moon
X-Git-Tag: colorado.1.0~42
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=921163be0eee6bd3a3c71b4bd30d10232749537f;p=compass4nfv.git

add environment for moon

JIRA: COMPASS-469

Change-Id: Iec6623d6089a94062f910b566d86b8ee7b885404
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
---

diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/files/opendaylight.service b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/files/opendaylight.service
index eea02211..6c9e4c44 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/files/opendaylight.service
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/files/opendaylight.service
@@ -7,6 +7,7 @@ After=
 User=root
 Group=root
 Type=simple
+EnvironmentFile=-/opt/moon-environment
 WorkingDirectory=/opt/opendaylight-0.3.0
 PermissionsStartOnly=true
 ExecStartPre=
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/moon-odl.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/moon-odl.yml
index a2ad56c2..1ab27c9b 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/moon-odl.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/moon-odl.yml
@@ -52,7 +52,4 @@
   shell: rm -f {{ odl_home }}/etc/shiro.ini
 
 - name: set moon env
-  shell: >
-    export MOON_SERVER_ADDR={{ internal_vip.ip }};
-    export MOON_SERVER_PORT=5000;
-    export no_proxy="localhost,127.0.0.1";
+  template: src=moon-environment dest=/opt/moon-environment
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/templates/moon-environment b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/templates/moon-environment
new file mode 100644
index 00000000..9a13da8e
--- /dev/null
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/templates/moon-environment
@@ -0,0 +1,3 @@
+MOON_SERVER_ADDR={{ internal_vip.ip }}
+MOON_SERVER_PORT=5000
+no_proxy="localhost,127.0.0.1"