Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

Commit

Permalink
Merge pull request #212 from signalfx/puppet-chef-final-stage
Browse files Browse the repository at this point in the history
Using the right name for main package repo
  • Loading branch information
keitwb authored Mar 15, 2018
2 parents 7c275f8 + 6893675 commit 14019f0
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion deployments/chef/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ of the form `<agent version>-<package revision>` (e.g. package version
the packaging scripts (e.g. init scripts) but contain the same agent bundle.

`node['signalfx_agent']['package_stage']`: The package repository to use. Can
be `main` (default, for final releases), `beta` (for beta releases), or `test`
be `final` (default, for main releases), `beta` (for beta releases), or `test`
(for unsigned test releases).

`node['signalfx_agent']['conf']`: Agent configuration object. Everything
Expand Down
2 changes: 1 addition & 1 deletion deployments/chef/attributes/default.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

default['signalfx_agent']['repo_base_url'] = "https://dl.signalfx.com"
default['signalfx_agent']['package_stage'] = 'main'
default['signalfx_agent']['package_stage'] = 'final'

default['signalfx_agent']['debian_repo_url'] = "#{node['signalfx_agent']['repo_base_url']}/debs/signalfx-agent"
default['signalfx_agent']['debian_gpg_key_url'] = "#{node['signalfx_agent']['repo_base_url']}/debian.gpg"
Expand Down
4 changes: 2 additions & 2 deletions deployments/puppet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ class accepts the following parameters:
`signalfx_agent::config`, which will make it automatically filled in as a
parameter.

- `$package_stage`: The package repo stage to use: `main`, `beta`, or `test`
(**default:** 'main')
- `$package_stage`: The package repo stage to use: `final`, `beta`, or `test`
(**default:** 'final')

- `$config_file_path`: The path of the config file that will be rendered by the
module (**default:** '/etc/signalfx/agent.yaml')
Expand Down
2 changes: 1 addition & 1 deletion deployments/puppet/manifests/init.pp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Main class that installs and configures the agent
class signalfx_agent (
$config,
$package_stage = 'main',
$package_stage = 'final',
$repo_base = 'dl.signalfx.com',
$config_file_path = '/etc/signalfx/agent.yaml',
$version = 'latest') {
Expand Down

0 comments on commit 14019f0

Please sign in to comment.