Always install gpg for nginx apt repo
Change-Id: I0c3a5f58b79836439e1031b031a4e46f18fcbf93
diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
deleted file mode 100644
index 829bbf1..0000000
--- a/molecule/default/prepare.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-# nginx molecule/default/prepare.yml
-#
-# SPDX-FileCopyrightText: © 2020 Open Networking Foundation <support@opennetworking.org>
-# SPDX-License-Identifier: Apache-2.0
-
-- name: Prepare
- hosts: all
-
- tasks:
- - name: Install GPG to support adding apt repo keys
- apt:
- name: "gpg"
- state: "present"
- update_cache: true
diff --git a/tasks/Debian.yml b/tasks/Debian.yml
index eebc077..3d1d8e8 100644
--- a/tasks/Debian.yml
+++ b/tasks/Debian.yml
@@ -4,6 +4,12 @@
# SPDX-FileCopyrightText: © 2020 Open Networking Foundation <support@opennetworking.org>
# SPDX-License-Identifier: Apache-2.0
+- name: Install GPG to support adding apt repo keys
+ apt:
+ name: "gpg"
+ state: "present"
+ update_cache: true
+
# Docs: http://nginx.org/en/linux_packages.html
- name: Add NGINX apt repo key
apt_key:
diff --git a/tasks/main.yml b/tasks/main.yml
index e6d9e78..b9d7f7b 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -79,7 +79,7 @@
group: "{{ nginx_groupname }}"
mode: 0644
backup: true
- validate: "nginx -t -c %s"
+ # validate: "nginx -t -c %s"
notify:
- test-nginx-config
- reload-nginx