Merge pull request #316 from cisco/release_1.3.0

Release 1.3.1
cisco · May 6, 2016 · a3d69e5 · a3d69e5
2 parents 95dfdc1 + c920c0e
commit a3d69e5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [1.3.0] - 2016-05-02
+## [1.3.1] - 2016-05-06
 
 ### New feature support
 #### Cisco Resources
@@ -63,6 +63,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Renamed all providers from `:nxapi` to `:cisco` as they may include support for multiple Cisco platforms, not all of which use NXAPI.
 
+## 1.3.0
+This version was never released.
+
 ## [1.2.3] - 2016-02-24
 ### Added
 - Download link for Nexus 5000 and Nexus 6000 Open Agent Container (OAC).
@@ -228,7 +231,7 @@ This version was never released.
 - Initial release of puppetlabs-ciscopuppet module, supporting Cisco NX-OS software release 7.0(3)I2(1) on Cisco Nexus switch platforms: N95xx, N93xx, N30xx and N31xx.
 - Please note: 0.9.0 is an EFT pre-release for a limited audience with access to NX-OS 7.0(3)I2(1). Additional code changes may occur in 0.9.x prior to the final 1.0.0 release.
 
-[1.3.0]: https://github.com/cisco/cisco-network-puppet-module/compare/v1.2.3...v1.3.0
+[1.3.1]: https://github.com/cisco/cisco-network-puppet-module/compare/v1.2.3...v1.3.1
 [1.2.3]: https://github.com/cisco/cisco-network-puppet-module/compare/v1.2.2...v1.2.3
 [1.2.2]: https://github.com/cisco/cisco-network-puppet-module/compare/v1.2.0...v1.2.2
 [1.2.0]: https://github.com/cisco/cisco-network-puppet-module/compare/v1.1.0...v1.2.0

diff --git a/README.md b/README.md
@@ -5,17 +5,17 @@
 This workflow map aids *users*, *developers* and *maintainers* of the ciscopuppet project in selecting the appropriate document(s) for their task.
 
 * User Guides
-  * [README-agent-install.md](https://github.com/cisco/cisco-network-puppet-module/blob/develop/docs/README-agent-install.md) : Agent Installation and Configuration Guide
-  * [README-beaker-agent-install.md](https://github.com/cisco/cisco-network-puppet-module/blob/develop/docs/README-beaker-agent-install.md) : Automated Agent Installation and Configuration
-  * [README-package-provider.md](https://github.com/cisco/cisco-network-puppet-module/blob/develop/docs/README-package-provider.md) : Cisco Nexus Package Management using the Package Provider
-  * [README-example-manifest.md](https://github.com/cisco/cisco-network-puppet-module/blob/develop/examples/README.md) : Example Demo Manifest User Guide
+  * [README-agent-install.md](https://github.com/cisco/cisco-network-puppet-module/blob/master/docs/README-agent-install.md) : Agent Installation and Configuration Guide
+  * [README-beaker-agent-install.md](https://github.com/cisco/cisco-network-puppet-module/blob/master/docs/README-beaker-agent-install.md) : Automated Agent Installation and Configuration
+  * [README-package-provider.md](https://github.com/cisco/cisco-network-puppet-module/blob/master/docs/README-package-provider.md) : Cisco Nexus Package Management using the Package Provider
+  * [README-example-manifest.md](https://github.com/cisco/cisco-network-puppet-module/blob/master/examples/README.md) : Example Demo Manifest User Guide
   * The remainder of this document is aimed at end users
 * Developer Guides
-  * [CONTRIBUTING.md](https://github.com/cisco/cisco-network-puppet-module/blob/develop/CONTRIBUTING.md) : Contribution guidelines
-  * [README-develop-types-providers.md](https://github.com/cisco/cisco-network-puppet-module/blob/develop/docs/README-develop-types-providers.md) : Developing new ciscopuppet Types and Providers
-  * [README-develop-beaker-scripts.md](https://github.com/cisco/cisco-network-puppet-module/blob/develop/docs/README-develop-beaker-scripts.md) : Developing new beaker test scripts for ciscopuppet
+  * [CONTRIBUTING.md](https://github.com/cisco/cisco-network-puppet-module/blob/master/CONTRIBUTING.md) : Contribution guidelines
+  * [README-develop-types-providers.md](https://github.com/cisco/cisco-network-puppet-module/blob/master/docs/README-develop-types-providers.md) : Developing new ciscopuppet Types and Providers
+  * [README-develop-beaker-scripts.md](https://github.com/cisco/cisco-network-puppet-module/blob/master/docs/README-develop-beaker-scripts.md) : Developing new beaker test scripts for ciscopuppet
 * Maintainers Guides
-  * [README-maintainers.md](https://github.com/cisco/cisco-network-puppet-module/blob/develop/docs/README-maintainers.md) : Guidelines for core maintainers of the ciscopuppet project
+  * [README-maintainers.md](https://github.com/cisco/cisco-network-puppet-module/blob/master/docs/README-maintainers.md) : Guidelines for core maintainers of the ciscopuppet project
   * All developer guides apply to maintainers as well
 
 Please see [Learning Resources](#learning-resources) for additional references.

diff --git a/docs/README-agent-install.md b/docs/README-agent-install.md
@@ -391,6 +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)
   * `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:

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-ciscopuppet",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "author": "cisco",
   "summary": "Cisco Puppet providers and types for NX-OS devices",
   "license": "Apache-2.0",
@@ -32,8 +32,7 @@
       "operatingsystemrelease": [
         "7.0(3)I2",
         "7.3(0)N1(1)",
-        "7.3(0)D1(1)",
-        "7.0(3)F1(1)"
+        "7.3(0)D1(1)"
       ]
     }
   ]