Skip to content

Commit 25e0cc9

Browse files
chipchilderschipchilders
committed
Checkpoint commit - work in progress.
Attempting to provide devcloud base box build process via veewee and puppet provisining via Vagrant.
1 parent 2943dc2 commit 25e0cc9

18 files changed

Lines changed: 161 additions & 87 deletions

File tree

tools/devcloud/vagrant/Vagrantfile renamed to tools/devcloud/basebuild/Vagrantfile

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@
1919
# under the License.
2020

2121
Vagrant::Config.run do |config|
22-
config.vm.box = "devcloudbase-ubuntu-12-04-64bit"
22+
config.vm.box = "devcloud"
2323
# TODO: Get a URL to host the base image
2424
# config.vm.box_url = "http://domain.com/path/to/above.box"
25+
config.vm.guest = :xen
26+
config.ssh.username = "devcloud"
2527

2628
# Uncomment this line to enable the console for debugging the
2729
# build process.
28-
#config.vm.boot_mode = :gui
30+
config.vm.boot_mode = :gui
2931

3032
# Setup port forwarding
3133
config.vm.forward_port 22, 2222
@@ -46,27 +48,4 @@ Vagrant::Config.run do |config|
4648
puppet.module_path = "puppet-devcloudinitial"
4749
end
4850

49-
# Enable provisioning with Puppet stand alone. Puppet manifests
50-
# are contained in a directory path relative to this Vagrantfile.
51-
# You will need to create the manifests directory and a manifest in
52-
# the file my_box.pp in the manifests_path directory.
53-
#
54-
# An example Puppet manifest to provision the message of the day:
55-
#
56-
# # group { "puppet":
57-
# # ensure => "present",
58-
# # }
59-
# #
60-
# # File { owner => 0, group => 0, mode => 0644 }
61-
# #
62-
# # file { '/etc/motd':
63-
# # content => "Welcome to your Vagrant-built virtual machine!
64-
# # Managed by Puppet.\n"
65-
# # }
66-
#
67-
# config.vm.provision :puppet do |puppet|
68-
# puppet.manifests_path = "manifests"
69-
# puppet.manifest_file = "my_box.pp"
70-
# end
71-
7251
end

tools/devcloud/puppet/puppet-devcloudinitial/Modulefile renamed to tools/devcloud/basebuild/puppet-devcloudinitial/Modulefile

File renamed without changes.

tools/devcloud/puppet/puppet-devcloudinitial/files/grub renamed to tools/devcloud/basebuild/puppet-devcloudinitial/files/grub

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# For full documentation of the options in this file, see:
44
# info -f grub -n 'Simple configuration'
55

6-
GRUB_DEFAULT=0
6+
GRUB_DEFAULT=2
77
#GRUB_HIDDEN_TIMEOUT=0
88
GRUB_HIDDEN_TIMEOUT_QUIET=true
99
GRUB_TIMEOUT=2

tools/devcloud/puppet/puppet-devcloudinitial/files/interfaces renamed to tools/devcloud/basebuild/puppet-devcloudinitial/files/interfaces

File renamed without changes.

tools/devcloud/puppet/puppet-devcloudinitial/files/network.conf renamed to tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf

File renamed without changes.

tools/devcloud/puppet/puppet-devcloudinitial/files/xen-defaults renamed to tools/devcloud/basebuild/puppet-devcloudinitial/files/xen-defaults

File renamed without changes.

tools/devcloud/puppet/puppet-devcloudinitial/files/xend renamed to tools/devcloud/basebuild/puppet-devcloudinitial/files/xend

File renamed without changes.

tools/devcloud/puppet/puppet-devcloudinitial/init.pp renamed to tools/devcloud/basebuild/puppet-devcloudinitial/init.pp

File renamed without changes.

tools/devcloud/puppet/puppet-devcloudinitial/manifests/init.pp renamed to tools/devcloud/basebuild/puppet-devcloudinitial/manifests/init.pp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
ensure => latest,
55
}
66

7-
package { 'xen-hypervisor-4.1-amd64':
7+
package { 'xen-hypervisor-4.1-i386':
88
ensure => latest,
99
}
1010

1111
package { 'xcp-xapi':
12-
require => Package['xen-hypervisor-4.1-amd64'],
12+
require => Package['xen-hypervisor-4.1-i386'],
1313
ensure => latest,
1414
}
1515

@@ -38,7 +38,7 @@
3838
}
3939

4040
file { '/etc/default/grub':
41-
require => Package['xen-hypervisor-4.1-amd64'],
41+
require => Package['xen-hypervisor-4.1-i386'],
4242
ensure => 'file',
4343
source => 'puppet:///modules/puppet-devcloudinitial/grub',
4444
group => '0',
@@ -53,7 +53,7 @@
5353
}
5454

5555
file { '/usr/share/qemu':
56-
require => Package['xen-hypervisor-4.1-amd64'],
56+
require => Package['xen-hypervisor-4.1-i386'],
5757
ensure => 'directory',
5858
group => '0',
5959
mode => '755',
@@ -78,7 +78,7 @@
7878
}
7979

8080
file { '/etc/default/xen':
81-
require => Package['xen-hypervisor-4.1-amd64'],
81+
require => Package['xen-hypervisor-4.1-i386'],
8282
ensure => 'file',
8383
source => 'puppet:///modules/puppet-devcloudinitial/xen-defaults',
8484
group => '0',

‎tools/devcloud/devcloudbox/Vagrantfile‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# -*- mode: ruby -*-
2+
# vi: set ft=ruby :
3+
4+
# Licensed to the Apache Software Foundation (ASF) under one
5+
# or more contributor license agreements. See the NOTICE file
6+
# distributed with this work for additional information
7+
# regarding copyright ownership. The ASF licenses this file
8+
# to you under the Apache License, Version 2.0 (the
9+
# "License"); you may not use this file except in compliance
10+
# with the License. You may obtain a copy of the License at
11+
#
12+
# http://www.apache.org/licenses/LICENSE-2.0
13+
#
14+
# Unless required by applicable law or agreed to in writing,
15+
# software distributed under the License is distributed on an
16+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
# KIND, either express or implied. See the License for the
18+
# specific language governing permissions and limitations
19+
# under the License.
20+
21+
Vagrant::Config.run do |config|
22+
config.vm.box = "devcloud"
23+
# TODO: Get a URL to host the base image
24+
# config.vm.box_url = "http://domain.com/path/to/above.box"
25+
config.vm.guest = :xen
26+
config.ssh.username = "devcloud"
27+
28+
# Uncomment this line to enable the console for debugging the
29+
# build process.
30+
config.vm.boot_mode = :gui
31+
32+
# Setup port forwarding
33+
config.vm.forward_port 22, 2222
34+
config.vm.forward_port 8080, 8080
35+
config.vm.forward_port 8443, 8443
36+
config.vm.forward_port 5901, 5901
37+
config.vm.forward_port 8787, 8787
38+
config.vm.forward_port 8250, 8250
39+
40+
# Ensure the VM has the right virtual resources
41+
#config.vm.
42+
43+
# config.vm.provision :puppet do |puppet|
44+
# puppet.manifests_path = "puppet-devcloud"
45+
# puppet.manifest_file = "init.pp"
46+
# puppet.with_ssh = true
47+
# puppet.pp_path = "/etc/puppet"
48+
# puppet.module_path = "puppet-devcloud"
49+
# end
50+
51+
end

0 commit comments

Comments
 (0)