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

Bug #1163982 Cobbler would now send https requests to the UCSM by default instead of http #21

Merged
merged 2 commits into from Apr 23, 2013
Merged

Bug #1163982 Cobbler would now send https requests to the UCSM by default instead of http #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e259744
Cobbler will send https requests to the UCSM by default instead of http
Apr 3, 2013
e5c1abf
Bug #1163982 Enable cobbler to send http/https requests to ucsm
Apr 10, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion manifests/init.pp
View file
Open in desktop
Expand Up @@ -19,6 +19,7 @@
# - $ntp_server NTP server if the default (ntp.ubuntu.com) isn't reachable
# - $proxy = '' If a proxy is required to get to the internet for updates, define it
# - $password_crypted = "x" - The default 'localadmin' user password, MD5 encrypted.
# - $ucsm_port The port at which the ucsm accepts requests(for ucs bseries only). Default value is 443(https)
#
# == Requires:
#
Expand Down Expand Up @@ -55,7 +56,8 @@
$dns_service = undef,
$dhcp_service = undef,
$ntp_server = undef,
$password_crypted = "x")
$password_crypted = "x",
$ucsm_port)
{

package { cobbler:
Expand Down
7 changes: 6 additions & 1 deletion templates/power_ucs_domain.erb
View file
Open in desktop
Expand Up @@ -4,4 +4,9 @@
#else
#set $org_arg = ""
#end if
fence_cisco_ucs $org_arg -a "$power_address" -l "$power_user" -p "$power_pass" -n "$power_id" -o "$power_mode"
<%- if ucsm_port == "80" %>
#set $z_arg = ""
<%- else %>
#set $z_arg = "-z"
<%- end %>
fence_cisco_ucs $org_arg $z_arg -a "$power_address" -l "$power_user" -p "$power_pass" -n "$power_id" -o "$power_mode"