Merge pull request #257 from newrelic/fix/yum-update-recipe

Replace yum update with makecache
newrelic · Mar 11, 2021 · 8844e6c · 8844e6c
2 parents e9e6b50 + 7edc9d5
commit 8844e6c
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 14 deletions.
diff --git a/recipes/newrelic/infrastructure/ohi/apache/rhel.yml b/recipes/newrelic/infrastructure/ohi/apache/rhel.yml
@@ -81,7 +81,7 @@ install:
         - |
           sudo mkdir -p "/etc/newrelic-infra/integrations.d"
         - |
-          sudo yum update -y
+          sudo yum -q makecache -y --disablerepo='*' --enablerepo='newrelic-infra'
         - |
           sudo yum install nri-apache -y
         - |

diff --git a/recipes/newrelic/infrastructure/ohi/cassandra/rhel.yml b/recipes/newrelic/infrastructure/ohi/cassandra/rhel.yml
@@ -84,7 +84,7 @@ install:
         - |
           sudo mkdir -p "/etc/newrelic-infra/integrations.d"
         - |
-          sudo yum update -y
+          sudo yum -q makecache -y --disablerepo='*' --enablerepo='newrelic-infra'
         - |
           sudo yum install nri-cassandra -y
         - |

diff --git a/recipes/newrelic/infrastructure/ohi/consul/rhel.yml b/recipes/newrelic/infrastructure/ohi/consul/rhel.yml
@@ -82,7 +82,7 @@ install:
         - |
           sudo mkdir -p "/etc/newrelic-infra/integrations.d"
         - |
-          sudo yum update -y
+          sudo yum -q makecache -y --disablerepo='*' --enablerepo='newrelic-infra'
         - |
           sudo yum install nri-consul -y
         - |

diff --git a/recipes/newrelic/infrastructure/ohi/couchbase/rhel.yml b/recipes/newrelic/infrastructure/ohi/couchbase/rhel.yml
@@ -87,7 +87,7 @@ install:
         - |
           sudo mkdir -p "/etc/newrelic-infra/integrations.d"
         - |
-          sudo yum update -y
+          sudo yum -q makecache -y --disablerepo='*' --enablerepo='newrelic-infra'
         - |
           sudo yum install nri-couchbase -y
         - |

diff --git a/recipes/newrelic/infrastructure/ohi/elasticsearch/rhel.yml b/recipes/newrelic/infrastructure/ohi/elasticsearch/rhel.yml
@@ -85,7 +85,7 @@ install:
         - |
           sudo mkdir -p "/etc/newrelic-infra/integrations.d"
         - |
-          sudo yum update -y
+          sudo yum -q makecache -y --disablerepo='*' --enablerepo='newrelic-infra'
         - |
           sudo yum install nri-elasticsearch -y
         - |

diff --git a/recipes/newrelic/infrastructure/ohi/haproxy/rhel.yml b/recipes/newrelic/infrastructure/ohi/haproxy/rhel.yml
@@ -74,7 +74,7 @@ install:
         - |
           sudo mkdir -p "/etc/newrelic-infra/integrations.d"
         - |
-          sudo yum update -y
+          sudo yum -q makecache -y --disablerepo='*' --enablerepo='newrelic-infra'
         - |
           sudo yum install nri-haproxy -y
         - |

diff --git a/recipes/newrelic/infrastructure/ohi/memcached/rhel.yml b/recipes/newrelic/infrastructure/ohi/memcached/rhel.yml
@@ -78,7 +78,7 @@ install:
         - |
           sudo mkdir -p "/etc/newrelic-infra/integrations.d"
         - |
-          sudo yum update -y
+          sudo yum -q makecache -y --disablerepo='*' --enablerepo='newrelic-infra'
         - |
           sudo yum install nri-memcached -y
         - |

diff --git a/recipes/newrelic/infrastructure/ohi/mongodb/rhel.yml b/recipes/newrelic/infrastructure/ohi/mongodb/rhel.yml
@@ -113,7 +113,7 @@ install:
         - |
           sudo mkdir -p "/etc/newrelic-infra/integrations.d"
         - |
-          sudo yum update -y
+          sudo yum -q makecache -y --disablerepo='*' --enablerepo='newrelic-infra'
         - |
           sudo yum install nri-mongodb -y
         - |

diff --git a/recipes/newrelic/infrastructure/ohi/nagios/rhel.yml b/recipes/newrelic/infrastructure/ohi/nagios/rhel.yml
@@ -66,9 +66,9 @@ install:
         - |
           sudo mkdir -p "/etc/newrelic-infra/integrations.d"
         - |
-          sudo yum update -y -q
+          sudo yum -q makecache -y --disablerepo='*' --enablerepo='newrelic-infra'
         - |
-          sudo yum install nri-nagios -y -q
+          sudo yum install nri-nagios -y
         - |
           if [ -f /etc/newrelic-infra/integrations.d/nagios-config.yml ]; then
             sudo rm /etc/newrelic-infra/integrations.d/nagios-config.yml;

diff --git a/recipes/newrelic/infrastructure/ohi/nginx/rhel.yml b/recipes/newrelic/infrastructure/ohi/nginx/rhel.yml
@@ -80,6 +80,8 @@ install:
       cmds:
         - |
           sudo mkdir -p "/etc/newrelic-infra/integrations.d"
+        - |
+          sudo yum -q makecache -y --disablerepo='*' --enablerepo='newrelic-infra'
         - |
           sudo yum install nri-nginx -y -q
         - |

diff --git a/recipes/newrelic/infrastructure/ohi/postgres/rhel.yml b/recipes/newrelic/infrastructure/ohi/postgres/rhel.yml
@@ -93,7 +93,7 @@ install:
         - |
           sudo mkdir -p "/etc/newrelic-infra/integrations.d"
         - |
-          sudo yum update -y
+          sudo yum -q makecache -y --disablerepo='*' --enablerepo='newrelic-infra'
         - |
           sudo yum install nri-postgresql -y
         - |

diff --git a/recipes/newrelic/infrastructure/ohi/rabbitmq/rhel.yml b/recipes/newrelic/infrastructure/ohi/rabbitmq/rhel.yml
@@ -101,7 +101,7 @@ install:
         - |
           sudo mkdir -p "/etc/newrelic-infra/integrations.d"
         - |
-          sudo yum update -y
+          sudo yum -q makecache -y --disablerepo='*' --enablerepo='newrelic-infra'
         - |
           sudo yum install nri-rabbitmq -y
         - |

diff --git a/recipes/newrelic/infrastructure/ohi/redis/rhel.yml b/recipes/newrelic/infrastructure/ohi/redis/rhel.yml
@@ -84,7 +84,7 @@ install:
         - |
           sudo mkdir -p "/etc/newrelic-infra/integrations.d"
         - |
-          sudo yum update -y
+          sudo yum -q makecache -y --disablerepo='*' --enablerepo='newrelic-infra'
         - |
           sudo yum install nri-redis -y
         - |

diff --git a/recipes/newrelic/infrastructure/ohi/varnish/rhel.yml b/recipes/newrelic/infrastructure/ohi/varnish/rhel.yml
@@ -76,7 +76,7 @@ install:
         - |
           sudo mkdir -p "/etc/newrelic-infra/integrations.d"
         - |
-          sudo yum update -y
+          sudo yum -q makecache -y --disablerepo='*' --enablerepo='newrelic-infra'
         - |
           sudo yum install nri-varnish -y
         - |
-Original file line number
+Diff line change
@@ Expand Up / @@ -80,6 +80,8 @@ install: @@
           cmds:
             - |
               sudo mkdir -p "/etc/newrelic-infra/integrations.d"
+            - |
+              sudo yum -q makecache -y --disablerepo='*' --enablerepo='newrelic-infra'
             - |
               sudo yum install nri-nginx -y -q
             - |
@@ Expand Down @@