Add a mirror33 slave node definition.
This will eventually run a job to feed any Python 3.3 specific dependencies into the pypi mirror. Change-Id: Idcfca576ee3b531bad54be5d53e0219f8719c25c
This commit is contained in:
parent
a16059c112
commit
40fc367771
@ -386,6 +386,14 @@ node 'mirror27.slave.openstack.org' {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
node 'mirror33.slave.openstack.org' {
|
||||||
|
include openstack_project
|
||||||
|
class { 'openstack_project::mirror33_slave':
|
||||||
|
jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key,
|
||||||
|
jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
node 'devstack-launch.slave.openstack.org' {
|
node 'devstack-launch.slave.openstack.org' {
|
||||||
include openstack_project
|
include openstack_project
|
||||||
class { 'openstack_project::devstack_launch_slave':
|
class { 'openstack_project::devstack_launch_slave':
|
||||||
|
27
modules/openstack_project/manifests/mirror33_slave.pp
Normal file
27
modules/openstack_project/manifests/mirror33_slave.pp
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
# Copyright 2013 OpenStack Foundation
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||||
|
# not use this file except in compliance with the License. You may obtain
|
||||||
|
# a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
# License for the specific language governing permissions and limitations
|
||||||
|
# under the License.
|
||||||
|
#
|
||||||
|
# Install a python33 mirror building slave.
|
||||||
|
|
||||||
|
class openstack_project::mirror33_slave (
|
||||||
|
$jenkins_ssh_public_key,
|
||||||
|
$jenkins_ssh_private_key,
|
||||||
|
) {
|
||||||
|
|
||||||
|
class { 'openstack_project::mirror_slave':
|
||||||
|
jenkins_ssh_public_key => $jenkins_ssh_public_key,
|
||||||
|
jenkins_ssh_private_key => $jenkins_ssh_private_key,
|
||||||
|
python3 => true,
|
||||||
|
}
|
||||||
|
}
|
@ -17,10 +17,12 @@
|
|||||||
class openstack_project::mirror_slave (
|
class openstack_project::mirror_slave (
|
||||||
$jenkins_ssh_public_key,
|
$jenkins_ssh_public_key,
|
||||||
$jenkins_ssh_private_key,
|
$jenkins_ssh_private_key,
|
||||||
|
$python3=false,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
class { 'openstack_project::slave':
|
class { 'openstack_project::slave':
|
||||||
ssh_key => $jenkins_ssh_public_key,
|
ssh_key => $jenkins_ssh_public_key,
|
||||||
|
python3 => $python3,
|
||||||
}
|
}
|
||||||
|
|
||||||
include jeepyb
|
include jeepyb
|
||||||
|
Loading…
x
Reference in New Issue
Block a user