From f12c7c6d19eb21cd99690271f4ef71794a24b683 Mon Sep 17 00:00:00 2001 From: Yifei Xue Date: Thu, 20 Jul 2017 11:46:14 +0800 Subject: Adjust the plugins directory structure JIRA:- Since there may be multiple roles in one plugin, so add a level of roles to the directory. Move the copy operation of ODL from configure_osa to a new setup-opendaylgiht role. Add excute_order in the plugin description of ODL. Change-Id: I905fb84b11df201dc1436ec888f511e251bba89c Signed-off-by: Yifei Xue Signed-off-by: chigang --- plugins/ntp/handlers/main.yml | 13 ------------ plugins/ntp/roles/ntp/handlers/main.yml | 13 ++++++++++++ plugins/ntp/roles/ntp/tasks/main.yml | 32 +++++++++++++++++++++++++++++ plugins/ntp/roles/ntp/templates/ntp.conf.j2 | 21 +++++++++++++++++++ plugins/ntp/roles/ntp/vars/main.yml | 17 +++++++++++++++ plugins/ntp/tasks/main.yml | 32 ----------------------------- plugins/ntp/templates/ntp.conf.j2 | 21 ------------------- plugins/ntp/vars/main.yml | 17 --------------- 8 files changed, 83 insertions(+), 83 deletions(-) delete mode 100644 plugins/ntp/handlers/main.yml create mode 100644 plugins/ntp/roles/ntp/handlers/main.yml create mode 100644 plugins/ntp/roles/ntp/tasks/main.yml create mode 100644 plugins/ntp/roles/ntp/templates/ntp.conf.j2 create mode 100644 plugins/ntp/roles/ntp/vars/main.yml delete mode 100644 plugins/ntp/tasks/main.yml delete mode 100644 plugins/ntp/templates/ntp.conf.j2 delete mode 100644 plugins/ntp/vars/main.yml (limited to 'plugins/ntp') diff --git a/plugins/ntp/handlers/main.yml b/plugins/ntp/handlers/main.yml deleted file mode 100644 index 866f31c3..00000000 --- a/plugins/ntp/handlers/main.yml +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################## -# Copyright (c) 2016-2017 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -- name: restart ntp service - service: - name: ntp - state: restarted diff --git a/plugins/ntp/roles/ntp/handlers/main.yml b/plugins/ntp/roles/ntp/handlers/main.yml new file mode 100644 index 00000000..866f31c3 --- /dev/null +++ b/plugins/ntp/roles/ntp/handlers/main.yml @@ -0,0 +1,13 @@ +############################################################################## +# Copyright (c) 2016-2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +- name: restart ntp service + service: + name: ntp + state: restarted diff --git a/plugins/ntp/roles/ntp/tasks/main.yml b/plugins/ntp/roles/ntp/tasks/main.yml new file mode 100644 index 00000000..031fb36d --- /dev/null +++ b/plugins/ntp/roles/ntp/tasks/main.yml @@ -0,0 +1,32 @@ +############################################################################## +# Copyright (c) 2016-2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +- name: download packages + get_url: + url: "{{ ntp_url }}" + dest: "{{ workspace }}" + +- name: install dependent packages + apt: + name: "{{ item }}" + state: present + with_items: + - "{{ dependancy }}" + +- name: install ntp package + command: dpkg -i "{{ workspace }}/{{ ntp_pkg }}" + +- name: config ntp + template: + src: ntp.con.j2 + dest: /etc/ntp.conf + notify: + - restart ntp service + +- meta: flush_handlers diff --git a/plugins/ntp/roles/ntp/templates/ntp.conf.j2 b/plugins/ntp/roles/ntp/templates/ntp.conf.j2 new file mode 100644 index 00000000..697e4078 --- /dev/null +++ b/plugins/ntp/roles/ntp/templates/ntp.conf.j2 @@ -0,0 +1,21 @@ +driftfile /var/lib/ntp/ntp.drift + +statistics loopstats peerstats clockstats +filegen loopstats file loopstats type day enable +filegen peerstats file peerstats type day enable +filegen clockstats file clockstats type day enable + +pool 0.ubuntu.pool.ntp.org iburst +pool 1.ubuntu.pool.ntp.org iburst +pool 2.ubuntu.pool.ntp.org iburst +pool 3.ubuntu.pool.ntp.org iburst + +pool "{{ ntp_server }}" + +restrict -4 default kod notrap nomodify nopeer noquery limited +restrict -6 default kod notrap nomodify nopeer noquery limited + +restrict 127.0.0.1 +restrict ::1 + +restrict source notrap nomodify noquery diff --git a/plugins/ntp/roles/ntp/vars/main.yml b/plugins/ntp/roles/ntp/vars/main.yml new file mode 100644 index 00000000..708fa423 --- /dev/null +++ b/plugins/ntp/roles/ntp/vars/main.yml @@ -0,0 +1,17 @@ +############################################################################## +# Copyright (c) 2016-2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +workspace: /tmp/plugin + +ntp_url: http://archive.ubuntu.com/ubuntu/pool/main/n/ntp/ntp_4.2.8p4+dfsg-3ubuntu5.4_amd64.deb + +ntp_pkg: ntp_4.2.8p4+dfsg-3ubuntu5.4_amd64.deb + +dependancy: + - libopts25 diff --git a/plugins/ntp/tasks/main.yml b/plugins/ntp/tasks/main.yml deleted file mode 100644 index 031fb36d..00000000 --- a/plugins/ntp/tasks/main.yml +++ /dev/null @@ -1,32 +0,0 @@ -############################################################################## -# Copyright (c) 2016-2017 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -- name: download packages - get_url: - url: "{{ ntp_url }}" - dest: "{{ workspace }}" - -- name: install dependent packages - apt: - name: "{{ item }}" - state: present - with_items: - - "{{ dependancy }}" - -- name: install ntp package - command: dpkg -i "{{ workspace }}/{{ ntp_pkg }}" - -- name: config ntp - template: - src: ntp.con.j2 - dest: /etc/ntp.conf - notify: - - restart ntp service - -- meta: flush_handlers diff --git a/plugins/ntp/templates/ntp.conf.j2 b/plugins/ntp/templates/ntp.conf.j2 deleted file mode 100644 index 697e4078..00000000 --- a/plugins/ntp/templates/ntp.conf.j2 +++ /dev/null @@ -1,21 +0,0 @@ -driftfile /var/lib/ntp/ntp.drift - -statistics loopstats peerstats clockstats -filegen loopstats file loopstats type day enable -filegen peerstats file peerstats type day enable -filegen clockstats file clockstats type day enable - -pool 0.ubuntu.pool.ntp.org iburst -pool 1.ubuntu.pool.ntp.org iburst -pool 2.ubuntu.pool.ntp.org iburst -pool 3.ubuntu.pool.ntp.org iburst - -pool "{{ ntp_server }}" - -restrict -4 default kod notrap nomodify nopeer noquery limited -restrict -6 default kod notrap nomodify nopeer noquery limited - -restrict 127.0.0.1 -restrict ::1 - -restrict source notrap nomodify noquery diff --git a/plugins/ntp/vars/main.yml b/plugins/ntp/vars/main.yml deleted file mode 100644 index 708fa423..00000000 --- a/plugins/ntp/vars/main.yml +++ /dev/null @@ -1,17 +0,0 @@ -############################################################################## -# Copyright (c) 2016-2017 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -workspace: /tmp/plugin - -ntp_url: http://archive.ubuntu.com/ubuntu/pool/main/n/ntp/ntp_4.2.8p4+dfsg-3ubuntu5.4_amd64.deb - -ntp_pkg: ntp_4.2.8p4+dfsg-3ubuntu5.4_amd64.deb - -dependancy: - - libopts25 -- cgit 1.2.3-korg