opendev
/
puppet-zuul
Code Issues Proposed changes

Update to new zuul JS content url 

Also, remove the idempotency check since it's not compatible with
install-ara-safely.

Change-Id: If0d1f127644b0a897f2fd4869b635435b2f60e81
This commit is contained in:
James E. Blair 2019-07-19 12:55:55 -07:00
parent 7eca8bc3ee
commit 311e638d8a
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/web.pp
View File

@ -40,8 +40,8 @@ class zuul::web (
$zuul_web_root = '/opt/zuul-web'
$zuul_web_content_root = '/opt/zuul-web/content'
$zuul_web_src_root = '/opt/zuul-web/source'
$zuul_web_filename = 'zuul-content-latest.tar.gz'
$zuul_web_url = "http://tarballs.openstack.org/zuul/${zuul_web_filename}"
$zuul_web_filename = 'zuul-js-content-master.tar.gz'
$zuul_web_url = "https://tarballs.opendev.org/zuul/zuul/${zuul_web_filename}"
if $vhosts == {} {
if $ssl_cert_file_contents == '' {

4
spec/acceptance/basic_spec.rb
View File

@ -43,10 +43,6 @@ describe 'puppet-zuul module', :if => ['debian', 'ubuntu'].include?(os[:family])
apply_manifest(default_puppet_module, catch_failures: true)
end
it 'should be idempotent' do
apply_manifest(default_puppet_module, catch_changes: true)
end
it 'should enable zuul server and zuul merger services' do
apply_manifest(post_conditions_puppet_module, catch_failures: true)
end