diff options
Diffstat (limited to 'deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster')
3 files changed, 6 insertions, 5 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..25306059 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 @@ -19,7 +19,7 @@ shell: rm -rf {{ odl_home }}/system/org/opendaylight/aaa/ - name: download apache maven package file - get_url: url="http://{{ http_server.stdout_lines[0] }}/packages/odl/apache-maven-3.3.9-bin.tar.gz" dest=/opt/apache-maven-3.3.9-bin.tar.gz + get_url: url="http://{{ http_server.stdout_lines[0] }}/packages/moon/apache-maven-3.3.9-bin.tar.gz" dest=/opt/apache-maven-3.3.9-bin.tar.gz - name: create maven folder shell: mkdir -p /opt/apache-maven-3.3.9/ @@ -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" |