Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing gui_package install #20

Merged
merged 3 commits into from
Sep 24, 2014
Merged

Fixing gui_package install #20

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38ba6f0
Fixing gui_package install
Sep 8, 2014
92e3d61
Removing notify , debug info
Sep 9, 2014
09f80cb
Removing old comments
Sep 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion manifests/install.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@
ensure => $consul::package_ensure,
}

if $consul::ui_package_name {
# Guessing this is a bug
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not necessary.

if $consul::ui_dir {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does need to be updated to reflect that if the install_method is a package, then the UI will be installed via a package. (right now it just says that if you provide ui_dir, then you get it)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This logic needs a test that reflects the logic that we think is right:

context 'When installing via a package and a ui_dir is provided' do
  let(:params) {{
    :install_method => 'package'
    :config_hash => {
     ....
       'ui_dir' => '/opt/bla/ui'
    }
  }}
  it { should contain_package(......
end

package { $consul::ui_package_name:
ensure => $consul::ui_package_ensure,
}
Expand Down