From 0a324e03a0d39bb205c43b6544740d2d9d9d9144 Mon Sep 17 00:00:00 2001 From: SerenaFeng Date: Mon, 21 Nov 2016 15:14:10 +0800 Subject: deploy testapi to qtip dashboard server add ansible code to deploy testapi in qtip dashboard server JIRA: QTIP-166 Change-Id: I09111ea762d2677061c010e85208105f3f556fc6 Signed-off-by: SerenaFeng --- opt/servers/inventory | 5 ++++- opt/servers/roles/ngnix/defaults/main.yml | 3 +++ opt/servers/roles/ngnix/tasks/main.yml | 1 + opt/servers/roles/ngnix/templates/testapi.conf.j2 | 17 +++++++++++++++++ opt/servers/roles/testapi/files/run_testapi.sh | 4 ++++ opt/servers/roles/testapi/tasks/main.yml | 4 ++++ opt/servers/testapi.yml | 4 ++++ 7 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 opt/servers/roles/ngnix/templates/testapi.conf.j2 create mode 100644 opt/servers/roles/testapi/files/run_testapi.sh create mode 100644 opt/servers/roles/testapi/tasks/main.yml create mode 100644 opt/servers/testapi.yml (limited to 'opt') diff --git a/opt/servers/inventory b/opt/servers/inventory index b5d66985..20afa528 100644 --- a/opt/servers/inventory +++ b/opt/servers/inventory @@ -1,4 +1,4 @@ -qtip-dev ansible_host=dev.qtip.io +qtip-dev ansible_host=54.209.126.178 [elk-servers] qtip-dev @@ -8,3 +8,6 @@ qtip-dev [qtip-servers] qtip-dev + +[testapi-servers] +qtip-dev diff --git a/opt/servers/roles/ngnix/defaults/main.yml b/opt/servers/roles/ngnix/defaults/main.yml index cb3b3934..cdd1d773 100644 --- a/opt/servers/roles/ngnix/defaults/main.yml +++ b/opt/servers/roles/ngnix/defaults/main.yml @@ -5,3 +5,6 @@ services: qtip_services: - { name: restful_api, upstream: 'http://127.0.0.1:5000' } + +testapi_services: + - { name: testapi, upstream: 'http://127.0.0.1:8000' } diff --git a/opt/servers/roles/ngnix/tasks/main.yml b/opt/servers/roles/ngnix/tasks/main.yml index ec146850..5c78166c 100644 --- a/opt/servers/roles/ngnix/tasks/main.yml +++ b/opt/servers/roles/ngnix/tasks/main.yml @@ -8,5 +8,6 @@ with_items: - elk - qtip + - testapi notify: - restart nginx diff --git a/opt/servers/roles/ngnix/templates/testapi.conf.j2 b/opt/servers/roles/ngnix/templates/testapi.conf.j2 new file mode 100644 index 00000000..6a4d388b --- /dev/null +++ b/opt/servers/roles/ngnix/templates/testapi.conf.j2 @@ -0,0 +1,17 @@ +# {{ ansible_managed }} + +# servers +# +{% for service in testapi_services %} +server { + listen 80; + listen 443 ssl; + server_name {{ service.name }}.qtip.openzero.net; + location / { + proxy_pass {{ service.upstream }}; + sub_filter {{ service.upstream }} 'http://{{ service.name }}.qtip.openzero.net'; + sub_filter_once off; + sub_filter_types text/html application/json; + } +} +{% endfor %} diff --git a/opt/servers/roles/testapi/files/run_testapi.sh b/opt/servers/roles/testapi/files/run_testapi.sh new file mode 100644 index 00000000..ccc37f16 --- /dev/null +++ b/opt/servers/roles/testapi/files/run_testapi.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +envs="mongodb_url=mongodb://172.17.0.1:27017/ -e api_port=8000 -e swagger_url=http://testapi.qtip.openzero.net" +docker run --name testapi -id -e $envs -p 8000:8000 opnfv/testapi diff --git a/opt/servers/roles/testapi/tasks/main.yml b/opt/servers/roles/testapi/tasks/main.yml new file mode 100644 index 00000000..8ca91396 --- /dev/null +++ b/opt/servers/roles/testapi/tasks/main.yml @@ -0,0 +1,4 @@ +--- +- name: setting up testapi + become: true + script: ../files/run_testapi.sh diff --git a/opt/servers/testapi.yml b/opt/servers/testapi.yml new file mode 100644 index 00000000..556284db --- /dev/null +++ b/opt/servers/testapi.yml @@ -0,0 +1,4 @@ +--- +- hosts: testapi-servers + roles: + - testapi -- cgit 1.2.3-korg