diff options
| author | Luke Kanies <luke@madstop.com> | 2008-08-18 11:47:40 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-08-18 11:47:40 -0500 |
| commit | e3971b9751141cd448a8197da024be43581f6dcd (patch) | |
| tree | 3ae780db3d9dae0a4df10ec24f928bf3a844e749 /test/ral | |
| parent | 025edc5c3737f476119df4bab73ebdc68be19430 (diff) | |
| parent | 2ec4e298c3274abc8eaad4230bca8d39a48d2e35 (diff) | |
| download | puppet-e3971b9751141cd448a8197da024be43581f6dcd.tar.gz puppet-e3971b9751141cd448a8197da024be43581f6dcd.tar.xz puppet-e3971b9751141cd448a8197da024be43581f6dcd.zip | |
Merge branch '0.24.x'
Conflicts:
CHANGELOG
test/util/posixtest.rb
Diffstat (limited to 'test/ral')
| -rwxr-xr-x | test/ral/type/yumrepo.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/test/ral/type/yumrepo.rb b/test/ral/type/yumrepo.rb index 273179bc4..a42fa9058 100755 --- a/test/ral/type/yumrepo.rb +++ b/test/ral/type/yumrepo.rb @@ -48,7 +48,10 @@ class TestYumRepo < Test::Unit::TestCase :enabled => "1", :gpgcheck => "1", :includepkgs => "absent", - :gpgkey => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora" + :gpgkey => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora", + :proxy => "http://proxy.example.com:80/", + :proxy_username => "username", + :proxy_password => "password" } repo = make_repo("base", values) @@ -102,6 +105,9 @@ baseurl=http://example.com/yum/$releasever/$basearch/os/ enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora +proxy=http://proxy.example.com:80/ +proxy_username=username +proxy_password=password EOF end |