aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--opt/servers/inventory6
-rw-r--r--opt/servers/mongo.yml4
-rw-r--r--opt/servers/roles/mongo/tasks/main.yml10
-rw-r--r--opt/servers/roles/ngnix/defaults/main.yml3
-rw-r--r--opt/servers/roles/ngnix/tasks/main.yml1
-rw-r--r--opt/servers/roles/ngnix/templates/testapi.conf.j217
-rw-r--r--opt/servers/roles/testapi/files/run_testapi.sh4
-rw-r--r--opt/servers/roles/testapi/tasks/main.yml4
-rw-r--r--opt/servers/testapi.yml4
-rw-r--r--qtip/cli/commands/cmd_perftest.py2
-rw-r--r--qtip/cli/commands/cmd_suite.py3
11 files changed, 56 insertions, 2 deletions
diff --git a/opt/servers/inventory b/opt/servers/inventory
index b5d66985..f038d877 100644
--- a/opt/servers/inventory
+++ b/opt/servers/inventory
@@ -8,3 +8,9 @@ qtip-dev
[qtip-servers]
qtip-dev
+
+[testapi-servers]
+qtip-dev
+
+[mongo-servers]
+qtip-dev
diff --git a/opt/servers/mongo.yml b/opt/servers/mongo.yml
new file mode 100644
index 00000000..e64c0c69
--- /dev/null
+++ b/opt/servers/mongo.yml
@@ -0,0 +1,4 @@
+---
+- hosts: mongo-servers
+ roles:
+ - mongo
diff --git a/opt/servers/roles/mongo/tasks/main.yml b/opt/servers/roles/mongo/tasks/main.yml
new file mode 100644
index 00000000..81fb49b5
--- /dev/null
+++ b/opt/servers/roles/mongo/tasks/main.yml
@@ -0,0 +1,10 @@
+---
+- name: pulling mongo
+ become: true
+ docker_image: name=mongo:3.2.1 state=present
+
+- name: setting up mongo
+ become: true
+ docker_container:
+ name: mongo
+ image: mongo:3.2.1
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
diff --git a/qtip/cli/commands/cmd_perftest.py b/qtip/cli/commands/cmd_perftest.py
index 0eb6d062..5cfe4110 100644
--- a/qtip/cli/commands/cmd_perftest.py
+++ b/qtip/cli/commands/cmd_perftest.py
@@ -11,7 +11,7 @@ from prettytable import PrettyTable
import yaml
import click
import os
-from cli import helper
+from qtip.cli import helper
class PerfTest:
diff --git a/qtip/cli/commands/cmd_suite.py b/qtip/cli/commands/cmd_suite.py
index 757f11a1..f6c839ba 100644
--- a/qtip/cli/commands/cmd_suite.py
+++ b/qtip/cli/commands/cmd_suite.py
@@ -10,12 +10,13 @@
from prettytable import PrettyTable
import os
import click
+from qtip.cli import helper
class Suite:
def __init__(self):
- self.path = os.path.join(os.path.dirname(__file__), '..', '..', 'benchmarks/suite')
+ self.path = os.path.join(helper.fetch_root(), 'suite')
def list(self):
table = PrettyTable(["Name"])