opendev
/
system-config
Code Issues Proposed changes

Update for feature/zuulv3 merging into master 

We are merging feature/zuulv3 in Zuul and Nodepool into master. That
means we need to point things that were pointing at feature/zuulv3 back
to master. Make this update.

Change-Id: Id95fcfbf872e0ed5122941c8c14c0dbf8f393ba4
This commit is contained in:
Clark Boylan 2018-01-18 09:55:30 -08:00
parent 9b8af2e4b5
commit a17b99c0d0
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/signing.rst
View File

@ -457,7 +457,7 @@ as a secret to Zuul for use by release jobs.
> --export-secret-subkeys 0xC0224DB5F541FB68\!
root@puppetmaster:~# wget -O encrypt_secret.py \
> https://git.openstack.org/cgit/openstack-infra/zuul/plain/tools/encrypt_secret.py?\
> h=feature/zuulv3
> h=master
root@puppetmaster:~# python encrypt_secret.py --infile temporary.gnupg/for-zuul \
> --outfile temporary.gnupg/zuul.yaml https://zuul.openstack.org gerrit \
> openstack-infra/project-config

4
doc/source/zuulv3.rst
View File

@ -28,7 +28,7 @@ At a Glance
* :config:`zuul/main.yaml`
* :config:`zuul.yaml`
:Projects:
* https://git.openstack.org/cgit/openstack-infra/zuul/tree/?h=feature/zuulv3
* https://git.openstack.org/cgit/openstack-infra/zuul/tree/
:Bugs:
* https://storyboard.openstack.org/#!/project/679
:Resources:
@ -222,5 +222,5 @@ Information about the configuration of the OpenStack Zuul App itself can be
found on the :ref:`github` page at :ref:`openstack_zuul_app`.
.. _OpenStack Zuul: https://github.com/apps/openstack-zuul
.. _Zuul Reference Manual: https://docs.openstack.org/infra/zuul/feature/zuulv3
.. _Zuul Reference Manual: https://docs.openstack.org/infra/zuul
.. _Zuul Status Page: http://zuul.openstack.org

12
manifests/site.pp
View File

@ -1026,7 +1026,7 @@ node /^nl\d+\.openstack\.org$/ {
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
oscc_file_contents => $clouds_yaml,
statsd_host => 'graphite.openstack.org',
revision => 'feature/zuulv3',
revision => 'master',
python_version => 3,
}
@ -1097,7 +1097,7 @@ node /^nb0[12].openstack\.org$/ {
statsd_host => 'graphite.openstack.org',
builder_logging_conf_template => 'openstack_project/nodepool/nodepool-builder.logging.conf.erb',
upload_workers => '16',
revision => 'feature/zuulv3',
revision => 'master',
python_version => 3,
zuulv3 => true,
}
@ -1221,7 +1221,7 @@ node /^ze\d+\.openstack\.org$/ {
$zuul_static_private_key = hiera('jenkins_ssh_private_key_contents')
$git_email = 'zuul@openstack.org'
$git_name = 'OpenStack Zuul'
$revision = 'feature/zuulv3'
$revision = 'master'
class { 'openstack_project::server':
iptables_public_tcp_ports => [79, 7900],
@ -1302,7 +1302,7 @@ node 'zuulv3.openstack.org' {
$zuul_url = "http://${::fqdn}/p"
$git_email = 'zuul@openstack.org'
$git_name = 'OpenStack Zuul'
$revision = 'feature/zuulv3'
$revision = 'master'
class { 'openstack_project::server':
iptables_public_tcp_ports => [79, 80, 443],
@ -1397,7 +1397,7 @@ node /^zuul\d+\.openstack\.org$/ {
$zuul_url = "http://zuul.openstack.org/p"
$git_email = 'zuul@openstack.org'
$git_name = 'OpenStack Zuul'
$revision = 'feature/zuulv3'
$revision = 'master'
class { 'openstack_project::server':
iptables_public_tcp_ports => [79, 80, 443],
@ -1493,7 +1493,7 @@ node /^zm\d+.openstack\.org$/ {
$zuul_url = "http://${::fqdn}/p"
$git_email = 'zuul@openstack.org'
$git_name = 'OpenStack Zuul'
$revision = 'feature/zuulv3'
$revision = 'master'
class { 'openstack_project::server':
iptables_public_tcp_ports => [80],