From 23b627df622eeafafa215ce19764310c1d55dd55 Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Sun, 8 Jan 2017 09:48:31 +0800 Subject: Reorganize the project folders Code from Brahmaputra is no longer maintained, including: - docker - playbooks - scripts - utils They are moved to legacy folder to avoid unnecessary confusion to new developers. Change-Id: Ia50383ca5c3bd82571eb7b2184e7f83e264ff8a7 Signed-off-by: Yujun Zhang --- opt/infra/ansible.cfg | 3 ++ opt/infra/inventory | 4 +++ opt/infra/roles/docker/handlers/main.yml | 4 +++ opt/infra/roles/docker/tasks/main.yml | 41 ++++++++++++++++++++++ opt/infra/roles/elk/tasks/main.yml | 22 ++++++++++++ opt/infra/roles/mongo/tasks/main.yml | 10 ++++++ opt/infra/roles/nginx/defaults/main.yml | 10 ++++++ opt/infra/roles/nginx/handlers/main.yml | 4 +++ opt/infra/roles/nginx/tasks/main.yml | 13 +++++++ opt/infra/roles/nginx/templates/elk.conf.j2 | 14 ++++++++ opt/infra/roles/nginx/templates/qtip.conf.j2 | 17 +++++++++ opt/infra/roles/nginx/templates/testapi.conf.j2 | 17 +++++++++ opt/infra/roles/qtip/files/run_qtip_server.sh | 4 +++ opt/infra/roles/qtip/tasks/main.yml | 5 +++ opt/infra/roles/testapi/files/run_testapi.sh | 4 +++ opt/infra/roles/testapi/tasks/main.yml | 4 +++ opt/infra/roles/user/defaults/main.yml | 7 ++++ opt/infra/roles/user/files/akhil.authorized_keys | 1 + opt/infra/roles/user/files/serena.authorized_keys | 1 + opt/infra/roles/user/files/sudoers.d-qtip | 2 ++ opt/infra/roles/user/files/taseer.authorized_keys | 1 + opt/infra/roles/user/files/yujunz.authorized_keys | 3 ++ opt/infra/roles/user/files/zhifeng.authorized_keys | 1 + opt/infra/roles/user/tasks/main.yml | 35 ++++++++++++++++++ opt/infra/test.yml | 10 ++++++ opt/servers/ansible.cfg | 3 -- opt/servers/inventory | 4 --- opt/servers/roles/docker/handlers/main.yml | 4 --- opt/servers/roles/docker/tasks/main.yml | 41 ---------------------- opt/servers/roles/elk/tasks/main.yml | 22 ------------ opt/servers/roles/mongo/tasks/main.yml | 10 ------ opt/servers/roles/nginx/defaults/main.yml | 10 ------ opt/servers/roles/nginx/handlers/main.yml | 4 --- opt/servers/roles/nginx/tasks/main.yml | 13 ------- opt/servers/roles/nginx/templates/elk.conf.j2 | 14 -------- opt/servers/roles/nginx/templates/qtip.conf.j2 | 17 --------- opt/servers/roles/nginx/templates/testapi.conf.j2 | 17 --------- opt/servers/roles/qtip/files/run_qtip_server.sh | 4 --- opt/servers/roles/qtip/tasks/main.yml | 5 --- opt/servers/roles/testapi/files/run_testapi.sh | 4 --- opt/servers/roles/testapi/tasks/main.yml | 4 --- opt/servers/roles/user/defaults/main.yml | 7 ---- opt/servers/roles/user/files/akhil.authorized_keys | 1 - .../roles/user/files/serena.authorized_keys | 1 - opt/servers/roles/user/files/sudoers.d-qtip | 2 -- .../roles/user/files/taseer.authorized_keys | 1 - .../roles/user/files/yujunz.authorized_keys | 3 -- .../roles/user/files/zhifeng.authorized_keys | 1 - opt/servers/roles/user/tasks/main.yml | 35 ------------------ opt/servers/test.yml | 10 ------ 50 files changed, 237 insertions(+), 237 deletions(-) create mode 100644 opt/infra/ansible.cfg create mode 100644 opt/infra/inventory create mode 100644 opt/infra/roles/docker/handlers/main.yml create mode 100644 opt/infra/roles/docker/tasks/main.yml create mode 100644 opt/infra/roles/elk/tasks/main.yml create mode 100644 opt/infra/roles/mongo/tasks/main.yml create mode 100644 opt/infra/roles/nginx/defaults/main.yml create mode 100644 opt/infra/roles/nginx/handlers/main.yml create mode 100644 opt/infra/roles/nginx/tasks/main.yml create mode 100644 opt/infra/roles/nginx/templates/elk.conf.j2 create mode 100644 opt/infra/roles/nginx/templates/qtip.conf.j2 create mode 100644 opt/infra/roles/nginx/templates/testapi.conf.j2 create mode 100644 opt/infra/roles/qtip/files/run_qtip_server.sh create mode 100644 opt/infra/roles/qtip/tasks/main.yml create mode 100644 opt/infra/roles/testapi/files/run_testapi.sh create mode 100644 opt/infra/roles/testapi/tasks/main.yml create mode 100644 opt/infra/roles/user/defaults/main.yml create mode 100644 opt/infra/roles/user/files/akhil.authorized_keys create mode 100644 opt/infra/roles/user/files/serena.authorized_keys create mode 100644 opt/infra/roles/user/files/sudoers.d-qtip create mode 100644 opt/infra/roles/user/files/taseer.authorized_keys create mode 100644 opt/infra/roles/user/files/yujunz.authorized_keys create mode 100644 opt/infra/roles/user/files/zhifeng.authorized_keys create mode 100644 opt/infra/roles/user/tasks/main.yml create mode 100644 opt/infra/test.yml delete mode 100644 opt/servers/ansible.cfg delete mode 100644 opt/servers/inventory delete mode 100644 opt/servers/roles/docker/handlers/main.yml delete mode 100644 opt/servers/roles/docker/tasks/main.yml delete mode 100644 opt/servers/roles/elk/tasks/main.yml delete mode 100644 opt/servers/roles/mongo/tasks/main.yml delete mode 100644 opt/servers/roles/nginx/defaults/main.yml delete mode 100644 opt/servers/roles/nginx/handlers/main.yml delete mode 100644 opt/servers/roles/nginx/tasks/main.yml delete mode 100644 opt/servers/roles/nginx/templates/elk.conf.j2 delete mode 100644 opt/servers/roles/nginx/templates/qtip.conf.j2 delete mode 100644 opt/servers/roles/nginx/templates/testapi.conf.j2 delete mode 100644 opt/servers/roles/qtip/files/run_qtip_server.sh delete mode 100644 opt/servers/roles/qtip/tasks/main.yml delete mode 100644 opt/servers/roles/testapi/files/run_testapi.sh delete mode 100644 opt/servers/roles/testapi/tasks/main.yml delete mode 100644 opt/servers/roles/user/defaults/main.yml delete mode 100644 opt/servers/roles/user/files/akhil.authorized_keys delete mode 100644 opt/servers/roles/user/files/serena.authorized_keys delete mode 100644 opt/servers/roles/user/files/sudoers.d-qtip delete mode 100644 opt/servers/roles/user/files/taseer.authorized_keys delete mode 100644 opt/servers/roles/user/files/yujunz.authorized_keys delete mode 100644 opt/servers/roles/user/files/zhifeng.authorized_keys delete mode 100644 opt/servers/roles/user/tasks/main.yml delete mode 100644 opt/servers/test.yml (limited to 'opt') diff --git a/opt/infra/ansible.cfg b/opt/infra/ansible.cfg new file mode 100644 index 00000000..93022c4e --- /dev/null +++ b/opt/infra/ansible.cfg @@ -0,0 +1,3 @@ +[defaults] +hostfile = inventory +host_key_checking = False \ No newline at end of file diff --git a/opt/infra/inventory b/opt/infra/inventory new file mode 100644 index 00000000..1ba1dc45 --- /dev/null +++ b/opt/infra/inventory @@ -0,0 +1,4 @@ +table ansible_host=table.qtip.io # 1vCPU/1024MB/100Mbps/40GB (Aliyun Hongkong B) + +[testing] +table diff --git a/opt/infra/roles/docker/handlers/main.yml b/opt/infra/roles/docker/handlers/main.yml new file mode 100644 index 00000000..985f8d41 --- /dev/null +++ b/opt/infra/roles/docker/handlers/main.yml @@ -0,0 +1,4 @@ +--- +- name: starting docker service + become: true + service: name=docker state=started diff --git a/opt/infra/roles/docker/tasks/main.yml b/opt/infra/roles/docker/tasks/main.yml new file mode 100644 index 00000000..1cf3bea0 --- /dev/null +++ b/opt/infra/roles/docker/tasks/main.yml @@ -0,0 +1,41 @@ +- 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 + become: true + apt: name={{item}} state=installed + with_items: + - python-dev + - python-pip + +- name: install docker-py + become: true + pip: + name: docker-py + version: 1.7.0 diff --git a/opt/infra/roles/elk/tasks/main.yml b/opt/infra/roles/elk/tasks/main.yml new file mode 100644 index 00000000..ed987f1a --- /dev/null +++ b/opt/infra/roles/elk/tasks/main.yml @@ -0,0 +1,22 @@ +--- +- name: pulling elasticsearch and kibana + become: true + docker_image: name={{ item }} state=present + with_items: + - elasticsearch + - kibana + +- name: setting up elasticsearch + become: true + docker_container: + name: esearch + image: elasticsearch + published_ports: 9200:9200 + +- name: setting up kibana + become: true + docker_container: + name: kibana + image: kibana + published_ports: 5601:5601 + links: esearch:elasticsearch diff --git a/opt/infra/roles/mongo/tasks/main.yml b/opt/infra/roles/mongo/tasks/main.yml new file mode 100644 index 00000000..81fb49b5 --- /dev/null +++ b/opt/infra/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/infra/roles/nginx/defaults/main.yml b/opt/infra/roles/nginx/defaults/main.yml new file mode 100644 index 00000000..cdd1d773 --- /dev/null +++ b/opt/infra/roles/nginx/defaults/main.yml @@ -0,0 +1,10 @@ +--- +services: + - { name: kibana, upstream: 'http://127.0.0.1:5601' } + - { name: elastic, upstream: 'http://127.0.0.1:9200' } + +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/infra/roles/nginx/handlers/main.yml b/opt/infra/roles/nginx/handlers/main.yml new file mode 100644 index 00000000..35585363 --- /dev/null +++ b/opt/infra/roles/nginx/handlers/main.yml @@ -0,0 +1,4 @@ +--- +- name: restart nginx + become: true + service: name=nginx state=restarted diff --git a/opt/infra/roles/nginx/tasks/main.yml b/opt/infra/roles/nginx/tasks/main.yml new file mode 100644 index 00000000..5c78166c --- /dev/null +++ b/opt/infra/roles/nginx/tasks/main.yml @@ -0,0 +1,13 @@ +--- +- 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 + - qtip + - testapi + notify: + - restart nginx diff --git a/opt/infra/roles/nginx/templates/elk.conf.j2 b/opt/infra/roles/nginx/templates/elk.conf.j2 new file mode 100644 index 00000000..271690e0 --- /dev/null +++ b/opt/infra/roles/nginx/templates/elk.conf.j2 @@ -0,0 +1,14 @@ +# {{ ansible_managed }} + +# servers +# +{% for service in services %} +server { + listen 80; + listen 443 ssl; + server_name {{ service.name }}.qtip.openzero.net; + location / { + proxy_pass {{ service.upstream }}; + } +} +{% endfor %} diff --git a/opt/infra/roles/nginx/templates/qtip.conf.j2 b/opt/infra/roles/nginx/templates/qtip.conf.j2 new file mode 100644 index 00000000..3a15c6ba --- /dev/null +++ b/opt/infra/roles/nginx/templates/qtip.conf.j2 @@ -0,0 +1,17 @@ +# {{ ansible_managed }} + +# servers +# +{% for service in qtip_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/infra/roles/nginx/templates/testapi.conf.j2 b/opt/infra/roles/nginx/templates/testapi.conf.j2 new file mode 100644 index 00000000..6a4d388b --- /dev/null +++ b/opt/infra/roles/nginx/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/infra/roles/qtip/files/run_qtip_server.sh b/opt/infra/roles/qtip/files/run_qtip_server.sh new file mode 100644 index 00000000..0f5cafea --- /dev/null +++ b/opt/infra/roles/qtip/files/run_qtip_server.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +envs="INSTALLER_TYPE=fuel -e INSTALLER_IP=10.20.0.2 -e NODE_NAME=zte-pod1" +docker run --name qtip -id -e $envs -p 5000:5000 opnfv/qtip diff --git a/opt/infra/roles/qtip/tasks/main.yml b/opt/infra/roles/qtip/tasks/main.yml new file mode 100644 index 00000000..b8292791 --- /dev/null +++ b/opt/infra/roles/qtip/tasks/main.yml @@ -0,0 +1,5 @@ +--- +# TODO:change the script to docker_container. +- name: setting up qtip + become: true + script: ../files/run_qtip_server.sh diff --git a/opt/infra/roles/testapi/files/run_testapi.sh b/opt/infra/roles/testapi/files/run_testapi.sh new file mode 100644 index 00000000..f9ba8387 --- /dev/null +++ b/opt/infra/roles/testapi/files/run_testapi.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +envs="mongodb_url=mongodb://mongo:27017/ -e api_port=8000 -e swagger_url=http://testapi.qtip.openzero.net" +docker run --name testapi --link mongo:mongo -p 8000:8000 -e $envs -d opnfv/testapi diff --git a/opt/infra/roles/testapi/tasks/main.yml b/opt/infra/roles/testapi/tasks/main.yml new file mode 100644 index 00000000..8ca91396 --- /dev/null +++ b/opt/infra/roles/testapi/tasks/main.yml @@ -0,0 +1,4 @@ +--- +- name: setting up testapi + become: true + script: ../files/run_testapi.sh diff --git a/opt/infra/roles/user/defaults/main.yml b/opt/infra/roles/user/defaults/main.yml new file mode 100644 index 00000000..ef496dd4 --- /dev/null +++ b/opt/infra/roles/user/defaults/main.yml @@ -0,0 +1,7 @@ +--- +users: + - { name: yujunz, comment: "Yujun Zhang " } + - { name: taseer, comment: "Taseer Ahmed " } + - { name: serena, comment: "Serena Feng " } + - { name: zhifeng, comment: "Zhifeng Jiang" } + - { name: akhil, comment: "Akhil Batra" } - - { name: taseer, comment: "Taseer Ahmed " } - - { name: serena, comment: "Serena Feng " } - - { name: zhifeng, comment: "Zhifeng Jiang" } - - { name: akhil, comment: "Akhil Batra