From eb4de7a3ab49b81f358e58abde5de313e9700ba4 Mon Sep 17 00:00:00 2001 From: mikewiebe Date: Fri, 6 May 2016 10:11:57 -0400 Subject: [PATCH 1/5] Clarify rpm agent caveat statement --- docs/README-agent-install.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/README-agent-install.md b/docs/README-agent-install.md index 90fbe8c3d..914420da7 100644 --- a/docs/README-agent-install.md +++ b/docs/README-agent-install.md @@ -391,8 +391,8 @@ The recommended Puppet RPM varies by environment: * NX-OS: * `bash-shell`: Use [http://yum.puppetlabs.com/puppetlabs-release-pc1-cisco-wrlinux-5.noarch.rpm](http://yum.puppetlabs.com/puppetlabs-release-pc1-cisco-wrlinux-5.noarch.rpm) * `guestshell`: Use [http://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm](http://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm) - * **NOTE:** Due to issue https://tickets.puppetlabs.com/browse/FACT-1409, please install the following puppet agent RPM inside the `guestshell`. - * [http://yum.puppetlabs.com/el/7/PC1/x86_64/puppet-agent-1.3.6-1.el7.x86_64.rpm](http://yum.puppetlabs.com/el/7/PC1/x86_64/puppet-agent-1.3.6-1.el7.x86_64.rpm) + * **NOTE:** Due to issue https://tickets.puppetlabs.com/browse/FACT-1409, please install a `1.3.x` version of the puppet agent RPM inside the `guestshell`. + * Here is the latest `1.3.x` version: [http://yum.puppetlabs.com/el/7/PC1/x86_64/puppet-agent-1.3.6-1.el7.x86_64.rpm](http://yum.puppetlabs.com/el/7/PC1/x86_64/puppet-agent-1.3.6-1.el7.x86_64.rpm) * `open agent container (OAC)`: Use [http://yum.puppetlabs.com/puppetlabs-release-pc1-el-6.noarch.rpm](http://yum.puppetlabs.com/puppetlabs-release-pc1-el-6.noarch.rpm) Using the appropriate RPM for your environment as described above, do: From 841260c2deb4b79893c70ce852a7843bceb70d2b Mon Sep 17 00:00:00 2001 From: mikewiebe Date: Fri, 6 May 2016 10:13:26 -0400 Subject: [PATCH 2/5] Clarify rpm agent caveat statement --- docs/README-agent-install.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README-agent-install.md b/docs/README-agent-install.md index 914420da7..b97c9c851 100644 --- a/docs/README-agent-install.md +++ b/docs/README-agent-install.md @@ -392,7 +392,7 @@ The recommended Puppet RPM varies by environment: * `bash-shell`: Use [http://yum.puppetlabs.com/puppetlabs-release-pc1-cisco-wrlinux-5.noarch.rpm](http://yum.puppetlabs.com/puppetlabs-release-pc1-cisco-wrlinux-5.noarch.rpm) * `guestshell`: Use [http://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm](http://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm) * **NOTE:** Due to issue https://tickets.puppetlabs.com/browse/FACT-1409, please install a `1.3.x` version of the puppet agent RPM inside the `guestshell`. - * Here is the latest `1.3.x` version: [http://yum.puppetlabs.com/el/7/PC1/x86_64/puppet-agent-1.3.6-1.el7.x86_64.rpm](http://yum.puppetlabs.com/el/7/PC1/x86_64/puppet-agent-1.3.6-1.el7.x86_64.rpm) + * Latest `1.3.x` version: [http://yum.puppetlabs.com/el/7/PC1/x86_64/puppet-agent-1.3.6-1.el7.x86_64.rpm](http://yum.puppetlabs.com/el/7/PC1/x86_64/puppet-agent-1.3.6-1.el7.x86_64.rpm) * `open agent container (OAC)`: Use [http://yum.puppetlabs.com/puppetlabs-release-pc1-el-6.noarch.rpm](http://yum.puppetlabs.com/puppetlabs-release-pc1-el-6.noarch.rpm) Using the appropriate RPM for your environment as described above, do: From e243dcc3ee1a051ceabdc6e9250243c5e5ced3d4 Mon Sep 17 00:00:00 2001 From: mikewiebe Date: Fri, 6 May 2016 10:17:01 -0400 Subject: [PATCH 3/5] Clarify rpm agent caveat statement --- docs/README-agent-install.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/README-agent-install.md b/docs/README-agent-install.md index b97c9c851..6b65a6856 100644 --- a/docs/README-agent-install.md +++ b/docs/README-agent-install.md @@ -392,7 +392,8 @@ The recommended Puppet RPM varies by environment: * `bash-shell`: Use [http://yum.puppetlabs.com/puppetlabs-release-pc1-cisco-wrlinux-5.noarch.rpm](http://yum.puppetlabs.com/puppetlabs-release-pc1-cisco-wrlinux-5.noarch.rpm) * `guestshell`: Use [http://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm](http://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm) * **NOTE:** Due to issue https://tickets.puppetlabs.com/browse/FACT-1409, please install a `1.3.x` version of the puppet agent RPM inside the `guestshell`. - * Latest `1.3.x` version: [http://yum.puppetlabs.com/el/7/PC1/x86_64/puppet-agent-1.3.6-1.el7.x86_64.rpm](http://yum.puppetlabs.com/el/7/PC1/x86_64/puppet-agent-1.3.6-1.el7.x86_64.rpm) + * Latest `1.3.x` version at the time of publishing this module: + * [http://yum.puppetlabs.com/el/7/PC1/x86_64/puppet-agent-1.3.6-1.el7.x86_64.rpm](http://yum.puppetlabs.com/el/7/PC1/x86_64/puppet-agent-1.3.6-1.el7.x86_64.rpm) * `open agent container (OAC)`: Use [http://yum.puppetlabs.com/puppetlabs-release-pc1-el-6.noarch.rpm](http://yum.puppetlabs.com/puppetlabs-release-pc1-el-6.noarch.rpm) Using the appropriate RPM for your environment as described above, do: From 40358d9b04e1ae007d370588aa8d9e9752ee42fa Mon Sep 17 00:00:00 2001 From: mikewiebe Date: Fri, 6 May 2016 10:20:40 -0400 Subject: [PATCH 4/5] Clarify rpm agent caveat statement --- docs/README-agent-install.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README-agent-install.md b/docs/README-agent-install.md index 6b65a6856..36f6bdd90 100644 --- a/docs/README-agent-install.md +++ b/docs/README-agent-install.md @@ -393,7 +393,7 @@ The recommended Puppet RPM varies by environment: * `guestshell`: Use [http://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm](http://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm) * **NOTE:** Due to issue https://tickets.puppetlabs.com/browse/FACT-1409, please install a `1.3.x` version of the puppet agent RPM inside the `guestshell`. * Latest `1.3.x` version at the time of publishing this module: - * [http://yum.puppetlabs.com/el/7/PC1/x86_64/puppet-agent-1.3.6-1.el7.x86_64.rpm](http://yum.puppetlabs.com/el/7/PC1/x86_64/puppet-agent-1.3.6-1.el7.x86_64.rpm) + * [http://yum.puppetlabs.com/el/7/PC1/x86_64/puppet-agent-1.3.6-1.el7.x86_64.rpm](http://yum.puppetlabs.com/el/7/PC1/x86_64/puppet-agent-1.3.6-1.el7.x86_64.rpm) * `open agent container (OAC)`: Use [http://yum.puppetlabs.com/puppetlabs-release-pc1-el-6.noarch.rpm](http://yum.puppetlabs.com/puppetlabs-release-pc1-el-6.noarch.rpm) Using the appropriate RPM for your environment as described above, do: From 228bc35cd20df9f4d62bb16b51255cfa6dbff017 Mon Sep 17 00:00:00 2001 From: mikewiebe Date: Fri, 6 May 2016 10:29:15 -0400 Subject: [PATCH 5/5] Additional agent install doc updates --- docs/README-agent-install.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/README-agent-install.md b/docs/README-agent-install.md index 36f6bdd90..03572b03a 100644 --- a/docs/README-agent-install.md +++ b/docs/README-agent-install.md @@ -390,10 +390,10 @@ rpm --import http://yum.puppetlabs.com/RPM-GPG-KEY-reductive The recommended Puppet RPM varies by environment: * NX-OS: * `bash-shell`: Use [http://yum.puppetlabs.com/puppetlabs-release-pc1-cisco-wrlinux-5.noarch.rpm](http://yum.puppetlabs.com/puppetlabs-release-pc1-cisco-wrlinux-5.noarch.rpm) - * `guestshell`: Use [http://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm](http://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm) - * **NOTE:** Due to issue https://tickets.puppetlabs.com/browse/FACT-1409, please install a `1.3.x` version of the puppet agent RPM inside the `guestshell`. + * `guestshell`: Due to issue https://tickets.puppetlabs.com/browse/FACT-1409, please install a `1.3.x` version of the puppet agent RPM inside the `guestshell`. * Latest `1.3.x` version at the time of publishing this module: * [http://yum.puppetlabs.com/el/7/PC1/x86_64/puppet-agent-1.3.6-1.el7.x86_64.rpm](http://yum.puppetlabs.com/el/7/PC1/x86_64/puppet-agent-1.3.6-1.el7.x86_64.rpm) + * Once this issue is resolved use [http://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm](http://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm) * `open agent container (OAC)`: Use [http://yum.puppetlabs.com/puppetlabs-release-pc1-el-6.noarch.rpm](http://yum.puppetlabs.com/puppetlabs-release-pc1-el-6.noarch.rpm) Using the appropriate RPM for your environment as described above, do: