aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYujun Zhang <zhang.yujunz@zte.com.cn>2017-01-09 02:46:48 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-01-09 02:46:48 +0000
commit2a3a0aec933566bc676ad259ca51e6eaa1f8ab76 (patch)
treee36e3879364e4a1abe57a8f207ccf3cccbda9406
parent8e1acb5d6bcc8c96f452d269f269a417af85d8af (diff)
parent6db68b48dc6cec7614d58d97a0edef8ae2b82ff7 (diff)
Merge "Retire `qtip-desk` server to save cost"
-rw-r--r--opt/servers/dev.yml10
-rw-r--r--opt/servers/inventory4
-rw-r--r--opt/servers/test.yml6
3 files changed, 6 insertions, 14 deletions
diff --git a/opt/servers/dev.yml b/opt/servers/dev.yml
deleted file mode 100644
index 2e0cca93..00000000
--- a/opt/servers/dev.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- hosts: development
- roles:
- - user
- - docker
- - elk
- - mongo
- - nginx
- - qtip
- - testapi
diff --git a/opt/servers/inventory b/opt/servers/inventory
index 0a862caa..1ba1dc45 100644
--- a/opt/servers/inventory
+++ b/opt/servers/inventory
@@ -1,8 +1,4 @@
-desk ansible_host=desk.qtip.io # 2vCPU/4GiB/16GiB (AWS us-east-1a)
table ansible_host=table.qtip.io # 1vCPU/1024MB/100Mbps/40GB (Aliyun Hongkong B)
-[development]
-desk
-
[testing]
table
diff --git a/opt/servers/test.yml b/opt/servers/test.yml
index 549b7255..ee3ded13 100644
--- a/opt/servers/test.yml
+++ b/opt/servers/test.yml
@@ -2,3 +2,9 @@
- hosts: testing
roles:
- user
+ - docker
+ - elk
+ - mongo
+ - nginx
+ - qtip
+ - testapi