aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYujun Zhang <zhang.yujunz@zte.com.cn>2016-12-10 07:16:48 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-12-10 07:16:48 +0000
commit1f20a1ff764359f7ffe0adbae9f027e823ade99e (patch)
tree8646e8432ec1f957dfa333fb85cbaf26fa18277f
parent989b093d2e9f9d72e11cef6d7f8f9f272b036df6 (diff)
parent506f51c433c8df784370491199cbafb6595ec243 (diff)
Merge "Fix role name error"
-rw-r--r--opt/servers/roles/nginx/defaults/main.yml (renamed from opt/servers/roles/ngnix/defaults/main.yml)0
-rw-r--r--opt/servers/roles/nginx/handlers/main.yml (renamed from opt/servers/roles/ngnix/handlers/main.yml)0
-rw-r--r--opt/servers/roles/nginx/tasks/main.yml (renamed from opt/servers/roles/ngnix/tasks/main.yml)0
-rw-r--r--opt/servers/roles/nginx/templates/elk.conf.j2 (renamed from opt/servers/roles/ngnix/templates/elk.conf.j2)0
-rw-r--r--opt/servers/roles/nginx/templates/qtip.conf.j2 (renamed from opt/servers/roles/ngnix/templates/qtip.conf.j2)0
-rw-r--r--opt/servers/roles/nginx/templates/testapi.conf.j2 (renamed from opt/servers/roles/ngnix/templates/testapi.conf.j2)0
6 files changed, 0 insertions, 0 deletions
diff --git a/opt/servers/roles/ngnix/defaults/main.yml b/opt/servers/roles/nginx/defaults/main.yml
index cdd1d773..cdd1d773 100644
--- a/opt/servers/roles/ngnix/defaults/main.yml
+++ b/opt/servers/roles/nginx/defaults/main.yml
diff --git a/opt/servers/roles/ngnix/handlers/main.yml b/opt/servers/roles/nginx/handlers/main.yml
index 35585363..35585363 100644
--- a/opt/servers/roles/ngnix/handlers/main.yml
+++ b/opt/servers/roles/nginx/handlers/main.yml
diff --git a/opt/servers/roles/ngnix/tasks/main.yml b/opt/servers/roles/nginx/tasks/main.yml
index 5c78166c..5c78166c 100644
--- a/opt/servers/roles/ngnix/tasks/main.yml
+++ b/opt/servers/roles/nginx/tasks/main.yml
diff --git a/opt/servers/roles/ngnix/templates/elk.conf.j2 b/opt/servers/roles/nginx/templates/elk.conf.j2
index 271690e0..271690e0 100644
--- a/opt/servers/roles/ngnix/templates/elk.conf.j2
+++ b/opt/servers/roles/nginx/templates/elk.conf.j2
diff --git a/opt/servers/roles/ngnix/templates/qtip.conf.j2 b/opt/servers/roles/nginx/templates/qtip.conf.j2
index 3a15c6ba..3a15c6ba 100644
--- a/opt/servers/roles/ngnix/templates/qtip.conf.j2
+++ b/opt/servers/roles/nginx/templates/qtip.conf.j2
diff --git a/opt/servers/roles/ngnix/templates/testapi.conf.j2 b/opt/servers/roles/nginx/templates/testapi.conf.j2
index 6a4d388b..6a4d388b 100644
--- a/opt/servers/roles/ngnix/templates/testapi.conf.j2
+++ b/opt/servers/roles/nginx/templates/testapi.conf.j2