Skip to content

Commit

Permalink
Merge pull request #45 from spuder/feature/environment
Browse files Browse the repository at this point in the history
Set tentacle register environment default to be the chef environment
  • Loading branch information
brentm5 authored Aug 8, 2016
2 parents 860051e + 34d29af commit 1caf884
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ end
- :server: Url to Octopus Deploy Server (e.g https://octopus.example.com)
- :api_key: Api Key used to register Tentacle to Octopus Server
- :roles: Array of roles to apply to Tentacle when registering with Octopus Deploy Server (e.g ["web-server","app-server"])
- :environment: Which environment the Tentacle will become part of when registering with Octopus Deploy Server
- :environment: Which environment the Tentacle will become part of when registering with Octopus Deploy Server (Defaults to node.chef_environment )

#### Example
Install version 3.2.24 of Octopus Deploy Tentacle
Expand All @@ -89,7 +89,6 @@ octopus_deploy_tentacle 'Tentacle' do
server 'https://octopus.example.com'
api_key '12345678910'
roles ['database']
environment 'prod'
configure_firewall true
end
```
Expand All @@ -104,7 +103,6 @@ octopus_deploy_tentacle 'Tentacle' do
api_key '12345678910'
roles ['web-default']
polling true
environment 'dev'
end
```

Expand Down
2 changes: 1 addition & 1 deletion resources/tentacle.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@
attribute :server, kind_of: String
attribute :api_key, kind_of: String
attribute :roles, kind_of: Array
attribute :environment, kind_of: String
attribute :environment, kind_of: String, default: node.chef_environment

0 comments on commit 1caf884

Please sign in to comment.