opendev/system-config
Code Issues Proposed changes

Merge "Add f20-devstack-virt-preview node type"

Browse Source
This commit is contained in:
Jenkins 2014-09-03 17:27:56 +00:00 committed by Gerrit Code Review
commit 8bce2c45cb
3 changed files with 80 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/openstack_project/files/nodepool/scripts/prepare_devstack_virt_preview.sh Executable file
View File

@ -0,0 +1,25 @@
#!/bin/bash -xe
# Copyright (C) 2014 - Red Hat, Inc.
#
# 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 the virt-preview repository that includes bleeding edge versions of
# libvirt and qemu. The packages from this repo will get installed via
# prepare_devstack.sh.
wget http://fedorapeople.org/groups/virt/virt-preview/fedora-virt-preview.repo
sudo mv fedora-virt-preview.repo /etc/yum.repos.d/.
./prepare_devstack.sh

27
modules/openstack_project/files/nodepool/scripts/prepare_node_devstack_virt_preview.sh Executable file
View File

@ -0,0 +1,27 @@
#!/bin/bash -xe
# Copyright (C) 2014 - Red Hat, Inc.
#
# 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.
HOSTNAME=$1
export SUDO='true'
export THIN='true'
./prepare_node.sh "$HOSTNAME"
sudo -u jenkins -i /opt/nodepool-scripts/prepare_devstack_virt_preview.sh "$HOSTNAME"
./restrict_memory.sh

28
modules/openstack_project/templates/nodepool/nodepool.yaml.erb
View File

@ -136,6 +136,13 @@ labels:
- name: hpcloud-b3
- name: hpcloud-b4
- name: hpcloud-b5
- name: devstack-f20-virt-preview
image: devstack-f20-virt-preview
min-ready: 2
providers:
- name: rax-dfw
- name: rax-ord
- name: rax-iad
- name: devstack-centos7
image: devstack-centos7
min-ready: 2
@ -216,6 +223,13 @@ providers:
setup: prepare_node_devstack.sh
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: devstack-f20-virt-preview
base-image: 'Fedora 20 (Heisenbug) (PVHVM)'
min-ram: 8192
name-filter: 'Performance'
setup: prepare_node_devstack_virt_preview.sh
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: devstack-centos7
base-image: 'CentOS 7 (PVHVM)'
min-ram: 8192
@ -284,6 +298,13 @@ providers:
setup: prepare_node_devstack.sh
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: devstack-f20-virt-preview
base-image: 'Fedora 20 (Heisenbug) (PVHVM)'
min-ram: 8192
name-filter: 'Performance'
setup: prepare_node_devstack_virt_preview.sh
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: devstack-centos7
base-image: 'CentOS 7 (PVHVM)'
min-ram: 8192
@ -359,6 +380,13 @@ providers:
setup: prepare_node_devstack.sh
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: devstack-f20-virt-preview
base-image: 'Fedora 20 (Heisenbug) (PVHVM)'
min-ram: 8192
name-filter: 'Performance'
setup: prepare_node_devstack_virt_preview.sh
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: devstack-centos7
base-image: 'CentOS 7 (PVHVM)'
min-ram: 8192