summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/openstack_mitaka_xenial/roles
diff options
context:
space:
mode:
authorchenshuai@huawei.com <chenshuai@huawei.com>2016-08-10 09:25:53 -0400
committerchenshuai@huawei.com <chenshuai@huawei.com>2016-08-10 09:25:53 -0400
commit921163be0eee6bd3a3c71b4bd30d10232749537f (patch)
treeaf0f5427b2b188ba6c30fa0676f4292cb4f598fe /deploy/adapters/ansible/openstack_mitaka_xenial/roles
parente489f1add0aca1db9e2a33972acc611e8d3b2dbb (diff)
add environment for moon
JIRA: COMPASS-469 Change-Id: Iec6623d6089a94062f910b566d86b8ee7b885404 Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/openstack_mitaka_xenial/roles')
-rw-r--r--deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/files/opendaylight.service1
-rw-r--r--deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/moon-odl.yml5
-rw-r--r--deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/templates/moon-environment3
3 files changed, 5 insertions, 4 deletions
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"