commit be09d2bcda06604d6792d4b3221a4350b0b22d22
Author: Jay Pipes <email address hidden>
Date: Tue Feb 18 12:11:48 2014 -0500
Adds ! defined() guards around a2mod declarations
If you attempt to include both Zuul and Jenkins master modules in a
single manifest, you will get an error about A2mod[rewrite] resource
already being declared, like so:
Duplicate declaration: A2mod[rewrite] is already declared in file
/home/ubuntu/os-ext-testing/puppet/modules/os_ext_testing/manifests/master.pp
at line 30; cannot redeclare at
/root/config/modules/zuul/manifests/init.pp:236 on node undef
This isn't noticed by upstream, because no server runs both a Jenkins
master and a Zuul server. However, in smaller systems, where both
Jenkins and Zuul can be installed on the same host, the problem becomes
apparent.
This patch fixes that issue by adding guards around the a2mod
declarations in the Zuul init.pp and Jenkins master.pp manifests.
Reviewed: https:/ /review. openstack. org/74443 /git.openstack. org/cgit/ openstack- infra/config/ commit/ ?id=be09d2bcda0 6604d6792d4b322 1a4350b0b22d22
Committed: https:/
Submitter: Jenkins
Branch: master
commit be09d2bcda06604 d6792d4b3221a43 50b0b22d22
Author: Jay Pipes <email address hidden>
Date: Tue Feb 18 12:11:48 2014 -0500
Adds ! defined() guards around a2mod declarations
If you attempt to include both Zuul and Jenkins master modules in a
single manifest, you will get an error about A2mod[rewrite] resource
already being declared, like so:
Duplicate declaration: A2mod[rewrite] is already declared in file ubuntu/ os-ext- testing/ puppet/ modules/ os_ext_ testing/ manifests/ master. pp config/ modules/ zuul/manifests/ init.pp: 236 on node undef
/home/
at line 30; cannot redeclare at
/root/
This isn't noticed by upstream, because no server runs both a Jenkins
master and a Zuul server. However, in smaller systems, where both
Jenkins and Zuul can be installed on the same host, the problem becomes
apparent.
This patch fixes that issue by adding guards around the a2mod
declarations in the Zuul init.pp and Jenkins master.pp manifests.
Change-Id: I2a298eb09ec8da 33caed9349f465b 2d163e2c299
Closes-bug: #1281676