Skip to content

Commit

Permalink
Merge pull request #24 from cisco/hotfix_1.1.2
Browse files Browse the repository at this point in the history
Hotfix 1.1.2 - Documentation Only
  • Loading branch information
chrisvanheuveln committed Feb 25, 2016
2 parents 2700908 + a2be49c commit df840e5
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 14 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [1.1.2] - 2016-02-24
### Added
- Download link for Nexus 5000 and Nexus 6000 Open Agent Container (OAC).
- OAC programmability guide links.

## [1.1.1] - 2016-02-16
### Fixed
- Update README-agent-install.md to reflect higher minimum memory requirement for guestshell
Expand Down Expand Up @@ -51,6 +56,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- 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.

[unreleased]: https://github.com/cisco/cisco-network-puppet-module/compare/master...develop
[1.1.2]: https://github.com/cisco/cisco-network-chef-cookbook/compare/v1.1.1...v1.1.2
[1.1.1]: https://github.com/cisco/cisco-network-chef-cookbook/compare/v1.1.0...v1.1.1
[1.1.0]: https://github.com/cisco/cisco-network-chef-cookbook/compare/v1.0.1...v1.1.0
[1.0.1]: https://github.com/cisco/cisco-network-chef-cookbook/compare/v1.0.0...v1.0.1
Expand Down
31 changes: 18 additions & 13 deletions docs/README-agent-install.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
#### Table of Contents

1. [Overview](#overview)
2. [Pre-Install Tasks](#pre-install-tasks)
3. [chef-client Environment: bash-shell](#env-bs)
4. [chef-client Environment: guestshell](#env-gs)
5. [chef-client Installation, Configuration and Usage](#agent-config)
6. [(optional) guestshell & High Availability (HA) Platforms](#ha)
7. [(optional) chef-client Persistence](#persistence)
8. [(optional) Automated Installation Options](#auto-install)
9. [References](#references)
1. [Pre-Install Tasks](#pre-install-tasks)
1. [chef-client Environment: bash-shell](#env-bs)
1. [chef-client Environment: guestshell](#env-gs)
1. [chef-client Environment: open agent container (OAC)](#env-oac)
1. [chef-client Installation, Configuration and Usage](#agent-config)
1. [(optional) guestshell & High Availability (HA) Platforms](#ha)
1. [(optional) chef-client Persistence](#persistence)
1. [(optional) Automated Installation Options](#auto-install)
1. [References](#references)

## Overview

Expand Down Expand Up @@ -201,7 +202,7 @@ EOF

```

## <a name="env-gs">chef-client Environment: open agent container</a>
## <a name="env-oac">chef-client Environment: open agent container (OAC)</a>

This section is only necessary if chef-client will run from the `open agent container`.

Expand All @@ -211,8 +212,8 @@ Download the `OAC` `oac.1.0.0.ova` file.

| Platform | OAC Download Link |
|----------|-------------------|
| Nexus 7xxx | [Nexus 7xxx Download Link](https://software.cisco.com/download/release.html?i=!y&mdfid=283748960&softwareid=282088129&release=7.3%280%29D1%281%29&os=)|
| Nexus 56xx and 60xx | [**TODO**]|
| Nexus 7xxx | [Download Link](https://software.cisco.com/download/release.html?i=!y&mdfid=283748960&softwareid=282088129&release=7.3%280%29D1%281%29&os=)|
| Nexus 56xx and 60xx | [Download Link](https://software.cisco.com/download/release.html?i=!y&mdfid=284360574&softwareid=282088130&release=7.3%280%29N1%281%29&os=)|

Copy the `ova` file to the `bootflash:` device.

Expand Down Expand Up @@ -320,7 +321,7 @@ Retype new password:
[root@localhost ~]#
~~~

See [References](#references) for more OAC documentation *TODO*.
See [References](#references) for more OAC documentation.

#### Set Up OAC Network

Expand Down Expand Up @@ -605,7 +606,11 @@ systemctl start my_chef
[Cisco Nexus Chef Modules](../README.md) - Resources, Providers, Utilities
[Cisco Nexus Programmability Guide](http://www.cisco.com/c/en/us/td/docs/switches/datacenter/nexus9000/sw/6-x/programmability/guide/b_Cisco_Nexus_9000_Series_NX-OS_Programmability_Guide/b_Cisco_Nexus_9000_Series_NX-OS_Programmability_Guide_chapter_01010.html) - Guestshell Documentation
[Cisco Nexus 9000 Programmability Guide](http://www.cisco.com/c/en/us/td/docs/switches/datacenter/nexus9000/sw/6-x/programmability/guide/b_Cisco_Nexus_9000_Series_NX-OS_Programmability_Guide/b_Cisco_Nexus_9000_Series_NX-OS_Programmability_Guide_chapter_01010.html) - Guestshell Documentation
[Cisco Nexus 5000 and 6000 Programmability Guide](http://www.cisco.com/c/en/us/td/docs/switches/datacenter/nexus5000/sw/programmability/guide/b_Cisco_Nexus_5K6K_Series_NX-OS_Programmability_Guide/b_Cisco_Nexus_5K6K_Series_NX-OS_Programmability_Guide_chapter_01001.html) - Open Agent Container Documentation
[Cisco Nexus 7000 Programmability Guide](http://www.cisco.com/c/en/us/td/docs/switches/datacenter/nexus7000/sw/programmability/guide/b_Cisco_Nexus_7000_Series_NX-OS_Programmability_Guide/b_Cisco_Nexus_7000_Series_NX-OS_Programmability_Guide_chapter_01001.html) - Open Agent Container Documentation
--
Expand Down
2 changes: 1 addition & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
source_url 'https://github.com/cisco/cisco-network-chef-cookbook'
supports 'nexus'
supports 'nexus_centos'
version '1.1.1'
version '1.1.2'

0 comments on commit df840e5

Please sign in to comment.