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

Fixes #32766 - adds scheme and pulp content path to setting value #200

Merged
merged 9 commits into from
Jun 11, 2021
Merged

Fixes #32766 - adds scheme and pulp content path to setting value #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a03dde5
Fixes #32766 - adds scheme and pulp content path to setting value
Jun 9, 2021
e7a589b
Fixes #32766 - attempt to repair spec
Jun 9, 2021
ffcc42a
Fixes #32766 - construct url from provided variables
Jun 9, 2021
82669fc
Fixes #32766 - moves external content url to init
Jun 9, 2021
cb00f3f
Fixes #32766 - lint warning
Jun 9, 2021
fe890c1
Fixes #32766 - moving to end
Jun 10, 2021
1c61720
Fixes #32766 - updates content path in ansible content host context a…
Jun 10, 2021
63c5ac2
Fixes #32766 - moved extern url construction back to ansible manifest
Jun 10, 2021
6f5e291
Fixes #32766 - remove trailing slash
Jun 11, 2021
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
10 changes: 9 additions & 1 deletion manifests/plugin/ansible.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,16 @@
],
}

if ! $pulpcore::apache_https_vhost {
fail('HTTPS must be turned on for Ansible content')
} elsif $pulpcore::apache::https_port != 443 {
$external_content_url = "https://${pulpcore::servername}:${pulpcore::apache::https_port}${pulpcore::apache::content_path}"
} else {
$external_content_url = "https://${pulpcore::servername}${pulpcore::apache::content_path}"
}

pulpcore::plugin { 'ansible':
config => "ANSIBLE_API_HOSTNAME = \"${pulpcore::servername}\"\nANSIBLE_CONTENT_HOSTNAME = \"${pulpcore::servername}\"",
config => "ANSIBLE_API_HOSTNAME = \"${pulpcore::servername}\"\nANSIBLE_CONTENT_HOSTNAME = \"${external_content_url}\"",
https_content => epp('pulpcore/apache-fragment.epp', $context),
}
}
2 changes: 1 addition & 1 deletion spec/classes/plugin_ansible_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
.with_content(expected_vhost_content)
is_expected.to contain_concat__fragment('plugin-ansible')
.with_content(/^ANSIBLE_API_HOSTNAME = "foo.example.com"/)
.with_content(/^ANSIBLE_CONTENT_HOSTNAME = "foo.example.com"/)
.with_content(%r{^ANSIBLE_CONTENT_HOSTNAME = "https://foo.example.com/pulp/content"})
end
end
end
Expand Down