From 995ac71c82dc138e3133fc064b9187966108e7fc Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Fri, 24 Jul 2020 16:36:24 -0500 Subject: [PATCH] Fixes #298: Change usage of 'src' in requirements.yml files. --- deployments-balancer/requirements.yml | 7 +-- deployments-rolling/requirements.yml | 7 +-- deployments/requirements.yml | 9 ++-- docker-flask/requirements.yml | 3 +- elk/requirements.yml | 15 ++++--- gluster/requirements.yml | 5 ++- https-letsencrypt/requirements.yml | 7 +-- .../provisioning/requirements.yml | 7 +-- .../provisioning/requirements.yml | 7 +-- jenkins/requirements.yml | 11 ++--- lamp-infrastructure/requirements.yml | 19 ++++---- tests/requirements.yml | 43 ++++++++++--------- 12 files changed, 76 insertions(+), 64 deletions(-) diff --git a/deployments-balancer/requirements.yml b/deployments-balancer/requirements.yml index 8e1f7599..2f321d7f 100644 --- a/deployments-balancer/requirements.yml +++ b/deployments-balancer/requirements.yml @@ -1,4 +1,5 @@ --- -- src: geerlingguy.firewall -- src: geerlingguy.haproxy -- src: geerlingguy.apache +roles: + - name: geerlingguy.firewall + - name: geerlingguy.haproxy + - name: geerlingguy.apache diff --git a/deployments-rolling/requirements.yml b/deployments-rolling/requirements.yml index d1487a26..d5038ad0 100644 --- a/deployments-rolling/requirements.yml +++ b/deployments-rolling/requirements.yml @@ -1,4 +1,5 @@ --- -- src: geerlingguy.firewall -- src: geerlingguy.nodejs -- src: geerlingguy.git +roles: + - name: geerlingguy.firewall + - name: geerlingguy.nodejs + - name: geerlingguy.git diff --git a/deployments/requirements.yml b/deployments/requirements.yml index 6dd5f2cf..5b1ffa9c 100644 --- a/deployments/requirements.yml +++ b/deployments/requirements.yml @@ -1,5 +1,6 @@ --- -- src: geerlingguy.git -- src: geerlingguy.ruby -- src: geerlingguy.nodejs -- src: geerlingguy.passenger +roles: + - name: geerlingguy.git + - name: geerlingguy.ruby + - name: geerlingguy.nodejs + - name: geerlingguy.passenger diff --git a/docker-flask/requirements.yml b/docker-flask/requirements.yml index 3a013f3a..56a652d1 100644 --- a/docker-flask/requirements.yml +++ b/docker-flask/requirements.yml @@ -1,2 +1,3 @@ --- -- src: geerlingguy.docker +roles: + - name: geerlingguy.docker diff --git a/elk/requirements.yml b/elk/requirements.yml index 995647a1..4e62b069 100644 --- a/elk/requirements.yml +++ b/elk/requirements.yml @@ -1,13 +1,14 @@ --- -- src: geerlingguy.java -- src: geerlingguy.nginx -- src: geerlingguy.elasticsearch +roles: +- name: geerlingguy.java +- name: geerlingguy.nginx +- name: geerlingguy.elasticsearch version: 4.1.1 -- src: geerlingguy.elasticsearch-curator +- name: geerlingguy.elasticsearch-curator version: 2.1.0 -- src: geerlingguy.kibana +- name: geerlingguy.kibana version: 4.0.0 -- src: geerlingguy.logstash +- name: geerlingguy.logstash version: 5.1.0 -- src: geerlingguy.filebeat +- name: geerlingguy.filebeat version: 3.0.1 diff --git a/gluster/requirements.yml b/gluster/requirements.yml index 823c1830..59a48fdb 100644 --- a/gluster/requirements.yml +++ b/gluster/requirements.yml @@ -1,3 +1,4 @@ --- -- src: geerlingguy.firewall -- src: geerlingguy.glusterfs +roles: + - name: geerlingguy.firewall + - name: geerlingguy.glusterfs diff --git a/https-letsencrypt/requirements.yml b/https-letsencrypt/requirements.yml index a57a5775..b5f98c46 100644 --- a/https-letsencrypt/requirements.yml +++ b/https-letsencrypt/requirements.yml @@ -1,4 +1,5 @@ --- -- src: geerlingguy.firewall -- src: geerlingguy.certbot -- src: geerlingguy.nginx +roles: + - name: geerlingguy.firewall + - name: geerlingguy.certbot + - name: geerlingguy.nginx diff --git a/https-nginx-proxy/provisioning/requirements.yml b/https-nginx-proxy/provisioning/requirements.yml index dd5a5836..d63352c5 100644 --- a/https-nginx-proxy/provisioning/requirements.yml +++ b/https-nginx-proxy/provisioning/requirements.yml @@ -1,4 +1,5 @@ --- -- src: geerlingguy.firewall -- src: geerlingguy.pip -- src: geerlingguy.nginx +roles: + - name: geerlingguy.firewall + - name: geerlingguy.pip + - name: geerlingguy.nginx diff --git a/https-self-signed/provisioning/requirements.yml b/https-self-signed/provisioning/requirements.yml index dd5a5836..d63352c5 100644 --- a/https-self-signed/provisioning/requirements.yml +++ b/https-self-signed/provisioning/requirements.yml @@ -1,4 +1,5 @@ --- -- src: geerlingguy.firewall -- src: geerlingguy.pip -- src: geerlingguy.nginx +roles: + - name: geerlingguy.firewall + - name: geerlingguy.pip + - name: geerlingguy.nginx diff --git a/jenkins/requirements.yml b/jenkins/requirements.yml index 89ea50b1..a90e1052 100644 --- a/jenkins/requirements.yml +++ b/jenkins/requirements.yml @@ -1,6 +1,7 @@ --- -- src: geerlingguy.firewall -- src: geerlingguy.pip -- src: geerlingguy.ansible -- src: geerlingguy.java -- src: geerlingguy.jenkins +roles: + - name: geerlingguy.firewall + - name: geerlingguy.pip + - name: geerlingguy.ansible + - name: geerlingguy.java + - name: geerlingguy.jenkins diff --git a/lamp-infrastructure/requirements.yml b/lamp-infrastructure/requirements.yml index 71b43dcc..370163ce 100644 --- a/lamp-infrastructure/requirements.yml +++ b/lamp-infrastructure/requirements.yml @@ -1,10 +1,11 @@ --- -- src: geerlingguy.firewall -- src: geerlingguy.repo-epel -- src: geerlingguy.varnish -- src: geerlingguy.apache -- src: geerlingguy.php -- src: geerlingguy.php-mysql -- src: geerlingguy.php-memcached -- src: geerlingguy.mysql -- src: geerlingguy.memcached +roles: + - name: geerlingguy.firewall + - name: geerlingguy.repo-epel + - name: geerlingguy.varnish + - name: geerlingguy.apache + - name: geerlingguy.php + - name: geerlingguy.php-mysql + - name: geerlingguy.php-memcached + - name: geerlingguy.mysql + - name: geerlingguy.memcached diff --git a/tests/requirements.yml b/tests/requirements.yml index 5a72c256..4840b7ca 100644 --- a/tests/requirements.yml +++ b/tests/requirements.yml @@ -1,23 +1,24 @@ --- -- src: geerlingguy.firewall -- src: geerlingguy.git -- src: geerlingguy.ruby -- src: geerlingguy.nginx -- src: geerlingguy.nodejs -- src: geerlingguy.passenger -- src: geerlingguy.docker -- src: geerlingguy.pip -- src: geerlingguy.ansible -- src: geerlingguy.java -- src: geerlingguy.jenkins +roles: + - name: geerlingguy.firewall + - name: geerlingguy.git + - name: geerlingguy.ruby + - name: geerlingguy.nginx + - name: geerlingguy.nodejs + - name: geerlingguy.passenger + - name: geerlingguy.docker + - name: geerlingguy.pip + - name: geerlingguy.ansible + - name: geerlingguy.java + - name: geerlingguy.jenkins -- src: geerlingguy.elasticsearch - version: 4.1.1 -- src: geerlingguy.elasticsearch-curator - version: 2.1.0 -- src: geerlingguy.kibana - version: 4.0.0 -- src: geerlingguy.logstash - version: 5.1.0 -- src: geerlingguy.filebeat - version: 3.0.1 + - name: geerlingguy.elasticsearch + version: 4.1.1 + - name: geerlingguy.elasticsearch-curator + version: 2.1.0 + - name: geerlingguy.kibana + version: 4.0.0 + - name: geerlingguy.logstash + version: 5.1.0 + - name: geerlingguy.filebeat + version: 3.0.1