From deab2aad2bb4da44700f074fee7795348d9958fd Mon Sep 17 00:00:00 2001 From: Julien Muchembled Date: Fri, 13 Dec 2019 15:23:45 +0100 Subject: [PATCH] playbook: clean up ntp --- playbook/imt-server-update.yml | 3 +-- playbook/imt-server.yml | 1 - playbook/roles/ntp/meta/main.yml | 3 +++ playbook/roles/ntp/tasks/main.yml | 7 ------- playbook/roles/slapos/meta/main.yml | 2 +- playbook/slapos-test-node.yml | 1 - playbook/slapos.yml | 1 - playbook/vifib-base.yml | 1 - playbook/vifib-without-re6stnet.yml | 1 - playbook/vifib.yml | 1 - 10 files changed, 5 insertions(+), 16 deletions(-) create mode 100644 playbook/roles/ntp/meta/main.yml diff --git a/playbook/imt-server-update.yml b/playbook/imt-server-update.yml index 19184e72..c602ef07 100644 --- a/playbook/imt-server-update.yml +++ b/playbook/imt-server-update.yml @@ -3,7 +3,6 @@ connection: local roles: - - { role: package, package_name: ntp, package_state: latest } + - ntp - { role: package, package_name: re6st-node, package_state: latest } - { role: package, package_name: slapos-node, package_state: latest } - diff --git a/playbook/imt-server.yml b/playbook/imt-server.yml index f2d8d472..37a4c044 100644 --- a/playbook/imt-server.yml +++ b/playbook/imt-server.yml @@ -19,5 +19,4 @@ roles: - { role: imt-slapos, mount_directory: /virt } - { role: slapos, package_state: present } - - { role: package, package_name: ntp, package_state: present } - { role: imt-slapos, post_config: True } diff --git a/playbook/roles/ntp/meta/main.yml b/playbook/roles/ntp/meta/main.yml new file mode 100644 index 00000000..17a24283 --- /dev/null +++ b/playbook/roles/ntp/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - { role: package, package_name: ntp, package_state: present } diff --git a/playbook/roles/ntp/tasks/main.yml b/playbook/roles/ntp/tasks/main.yml index 971aae2c..98b4c7e6 100644 --- a/playbook/roles/ntp/tasks/main.yml +++ b/playbook/roles/ntp/tasks/main.yml @@ -1,11 +1,4 @@ --- - - name: Install ntp - apt: name=ntp state=latest update_cache=yes cache_valid_time=86400 - when: ansible_os_family == "Debian" - - - include: ../../yum/tasks/main.yml name=ntp cache_valid_time=86400 - when: ansible_os_family == "RedHat" - - name: ensure ntp is runing service: name=ntp state=started enabled=yes when: ansible_os_family == "Debian" diff --git a/playbook/roles/slapos/meta/main.yml b/playbook/roles/slapos/meta/main.yml index 4c651fdc..25454c5f 100644 --- a/playbook/roles/slapos/meta/main.yml +++ b/playbook/roles/slapos/meta/main.yml @@ -1,3 +1,3 @@ --- dependencies: - - { role: repository } + - { role: ntp } diff --git a/playbook/slapos-test-node.yml b/playbook/slapos-test-node.yml index 4a884f88..4db99908 100644 --- a/playbook/slapos-test-node.yml +++ b/playbook/slapos-test-node.yml @@ -23,5 +23,4 @@ roles: - { role: slapos, package_state: present } - - { role: package, package_name: ntp, package_state: present } - vifib-team-ssh-key diff --git a/playbook/slapos.yml b/playbook/slapos.yml index cf107a50..e21245a1 100644 --- a/playbook/slapos.yml +++ b/playbook/slapos.yml @@ -28,6 +28,5 @@ roles: - { role: slapos, package_state: present } - - { role: package, package_name: ntp, package_state: present } diff --git a/playbook/vifib-base.yml b/playbook/vifib-base.yml index d108cd4f..8e90474f 100644 --- a/playbook/vifib-base.yml +++ b/playbook/vifib-base.yml @@ -15,7 +15,6 @@ roles: - { role: re6stnet-install } - { role: slapos, package_state: present } - - { role: package, package_name: ntp, package_state: present } - vifib-team-ssh-key - upgrader - vifib-server diff --git a/playbook/vifib-without-re6stnet.yml b/playbook/vifib-without-re6stnet.yml index cc17ca0a..1c2e1cf7 100644 --- a/playbook/vifib-without-re6stnet.yml +++ b/playbook/vifib-without-re6stnet.yml @@ -23,7 +23,6 @@ roles: - { role: slapos, package_state: present } - - { role: package, package_name: ntp, package_state: present } - vifib-team-ssh-key - upgrader - vifib-server diff --git a/playbook/vifib.yml b/playbook/vifib.yml index dc466e31..2dcf3bc4 100644 --- a/playbook/vifib.yml +++ b/playbook/vifib.yml @@ -24,7 +24,6 @@ roles: - { role: re6stnet-install, package_state: present } - { role: slapos, package_state: present } - - { role: package, package_name: ntp, package_state: present } - vifib-team-ssh-key - upgrader - vifib-server -- 2.30.9