aboutsummaryrefslogtreecommitdiffstats
path: root/supporting/servers
diff options
context:
space:
mode:
authorzhifeng.jiang <jiang.zhifeng@zte.com.cn>2016-11-02 22:28:26 +0800
committerzhifeng.jiang <jiang.zhifeng@zte.com.cn>2016-11-03 15:58:28 +0800
commit44b306376ddd425acdb64a36fe77dfe7a9992a93 (patch)
treebca58b037b724b7e0c3d386b93a3ea5605367135 /supporting/servers
parentcdd2320235e1fec0b883dc79b8f2cbd5d931cede (diff)
Fix ansible Syntax Error while loading YAML and separates
docker,elk and nginx installing file. JIRA:QTIP-111 Change-Id: I8fe004b0edc86729e1beff07b406b568af60da89 Signed-off-by: zhifeng.jiang <jiang.zhifeng@zte.com.cn>
Diffstat (limited to 'supporting/servers')
-rw-r--r--supporting/servers/elk.yml1
-rw-r--r--supporting/servers/inventory3
-rw-r--r--supporting/servers/ngnix.yml4
-rw-r--r--supporting/servers/roles/docker/handlers/main.yml (renamed from supporting/servers/roles/elk/handlers/main.yml)4
-rw-r--r--supporting/servers/roles/docker/tasks/main.yml39
-rw-r--r--supporting/servers/roles/elk/tasks/main.yml50
-rw-r--r--supporting/servers/roles/ngnix/defaults/main.yml (renamed from supporting/servers/roles/elk/defaults/main.yml)0
-rw-r--r--supporting/servers/roles/ngnix/handlers/main.yml4
-rw-r--r--supporting/servers/roles/ngnix/tasks/main.yml11
-rw-r--r--supporting/servers/roles/ngnix/templates/elk.conf.j2 (renamed from supporting/servers/roles/elk/templates/elk.conf.j2)0
10 files changed, 62 insertions, 54 deletions
diff --git a/supporting/servers/elk.yml b/supporting/servers/elk.yml
index 406ba93f..e2696573 100644
--- a/supporting/servers/elk.yml
+++ b/supporting/servers/elk.yml
@@ -1,4 +1,5 @@
---
- hosts: elk-servers
roles:
+ - docker
- elk
diff --git a/supporting/servers/inventory b/supporting/servers/inventory
index f4ff2e55..1414fa7c 100644
--- a/supporting/servers/inventory
+++ b/supporting/servers/inventory
@@ -2,3 +2,6 @@ qtip-dev ansible_host=qtip.openzero.net
[elk-servers]
qtip-dev
+
+[ngnix-servers]
+qtip-dev
diff --git a/supporting/servers/ngnix.yml b/supporting/servers/ngnix.yml
new file mode 100644
index 00000000..d57a5603
--- /dev/null
+++ b/supporting/servers/ngnix.yml
@@ -0,0 +1,4 @@
+---
+- hosts: ngnix-servers
+ roles:
+ - ngnix
diff --git a/supporting/servers/roles/elk/handlers/main.yml b/supporting/servers/roles/docker/handlers/main.yml
index 46bd76c7..985f8d41 100644
--- a/supporting/servers/roles/elk/handlers/main.yml
+++ b/supporting/servers/roles/docker/handlers/main.yml
@@ -2,7 +2,3 @@
- name: starting docker service
become: true
service: name=docker state=started
-
-- name: restart nginx
- become: true
- service: name=nginx state=restarted
diff --git a/supporting/servers/roles/docker/tasks/main.yml b/supporting/servers/roles/docker/tasks/main.yml
new file mode 100644
index 00000000..881650dd
--- /dev/null
+++ b/supporting/servers/roles/docker/tasks/main.yml
@@ -0,0 +1,39 @@
+- name: adding keys
+ become: true
+ apt_key: keyserver=hkp://p80.pool.sks-keyservers.net id=0X58118E89F3A912897C070ADBF76221572C52609D
+
+- name: adding entry for ubuntu
+ become: true
+ apt_repository: repo='deb https://apt.dockerproject.org/repo ubuntu-xenial main' state=present filename='docker'
+ when: ansible_distribution == "Ubuntu" and ansible_distribution_version == "16.04"
+
+- name: installing from docker repo
+ become: true
+ shell: apt-cache policy docker-engine
+ when: ansible_distribution == "Ubuntu" and ansible_distribution_version== "16.04"
+
+- name: adding entry for ubuntu
+ become: true
+ apt_repository: repo='deb https://apt.dockerproject.org/repo ubuntu-trusty main' state=present filename='docker'
+ when: ansible_distribution == "Ubuntu" and ansible_distribution_version == "14.04"
+
+- name: updating
+ become: true
+ apt: update_cache=yes
+
+- name: installing docker engine
+ become: true
+ apt: name=docker-engine
+ notify:
+ - starting docker service
+
+- name: install pip
+ apt: pkg={{item}} state=installed
+ with_items:
+ - python-dev
+ - python-pip
+
+- name: install docker-py
+ pip:
+ name: docker-py
+
diff --git a/supporting/servers/roles/elk/tasks/main.yml b/supporting/servers/roles/elk/tasks/main.yml
index cc544be5..ed987f1a 100644
--- a/supporting/servers/roles/elk/tasks/main.yml
+++ b/supporting/servers/roles/elk/tasks/main.yml
@@ -1,43 +1,4 @@
---
-- name: adding keys
- become: true
- apt_key: keyserver=hkp://p80.pool.sks-keyservers.net id=0X58118E89F3A912897C070ADBF76221572C52609D
-
-- name: adding entry for ubuntu
- become: true
- apt_repository: repo='deb https://apt.dockerproject.org/repo ubuntu-xenial main' state=present filename='docker'
- when: ansible_distribution == "Ubuntu" and ansible_distribution_version == "16.04"
-
-- name: installing from docker repo
- become: true
- shell: apt-cache policy docker-engine
- when: ansible_distribution == "Ubuntu" and ansible_distribution_version== "16.04"
-
-- name: adding entry for ubuntu
- become: true
- apt_repository: repo='deb https://apt.dockerproject.org/repo ubuntu-trusty main' state=present filename='docker'
- when: ansible_distribution == "Ubuntu" and ansible_distribution_version == "14.04"
-
-- name: updating
- become: true
- apt: update_cache=yes
-
-- name: installing docker engine
- become: true
- apt: name=docker-engine
-
-- name: install pip
- apt:
- pkg:{{ item }} state=installed
- state: installed
- with_items:
- - python-dev
- - python-pip
-
-- name: install docker-py
- pip:
- name: docker-py
-
- name: pulling elasticsearch and kibana
become: true
docker_image: name={{ item }} state=present
@@ -59,14 +20,3 @@
image: kibana
published_ports: 5601:5601
links: esearch:elasticsearch
-
-- name: nginx is installed
- become: true
- package: name=nginx state=present
-- name: qtip server configuration is generated
- become: true
- template: src={{ item }}.conf.j2 dest=/etc/nginx/sites-enabled/{{ item }}.conf
- with_items:
- - elk
- notify:
- - restart nginx
diff --git a/supporting/servers/roles/elk/defaults/main.yml b/supporting/servers/roles/ngnix/defaults/main.yml
index 855fc7ea..855fc7ea 100644
--- a/supporting/servers/roles/elk/defaults/main.yml
+++ b/supporting/servers/roles/ngnix/defaults/main.yml
diff --git a/supporting/servers/roles/ngnix/handlers/main.yml b/supporting/servers/roles/ngnix/handlers/main.yml
new file mode 100644
index 00000000..35585363
--- /dev/null
+++ b/supporting/servers/roles/ngnix/handlers/main.yml
@@ -0,0 +1,4 @@
+---
+- name: restart nginx
+ become: true
+ service: name=nginx state=restarted
diff --git a/supporting/servers/roles/ngnix/tasks/main.yml b/supporting/servers/roles/ngnix/tasks/main.yml
new file mode 100644
index 00000000..8673b3d2
--- /dev/null
+++ b/supporting/servers/roles/ngnix/tasks/main.yml
@@ -0,0 +1,11 @@
+---
+- name: nginx is installed
+ become: true
+ package: name=nginx state=present
+- name: qtip server configuration is generated
+ become: true
+ template: src={{ item }}.conf.j2 dest=/etc/nginx/sites-enabled/{{ item }}.conf
+ with_items:
+ - elk
+ notify:
+ - restart nginx
diff --git a/supporting/servers/roles/elk/templates/elk.conf.j2 b/supporting/servers/roles/ngnix/templates/elk.conf.j2
index 271690e0..271690e0 100644
--- a/supporting/servers/roles/elk/templates/elk.conf.j2
+++ b/supporting/servers/roles/ngnix/templates/elk.conf.j2