openstack/fuel-library
Code Issues Proposed changes

Merge pull request #195 from xdel/master

Browse Source 
We decided to work with puppet-2
This commit is contained in:
Vladimir Kuklin 2013-05-28 00:25:54 -07:00
commit e0e2e6084a
8 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/puppet/astute/config.yaml
View File

@ -119,12 +119,12 @@ common:
# profile: "ubuntu_1204_x86_64"
netboot-enabled: "1"
# for Ubuntu
# ksmeta: "puppet_version=3.0.1-1puppetlabs1 \
# ksmeta: "puppet_version=2.7.19-1puppetlabs2 \
# for Centos
name-servers: "10.0.0.100"
name-servers-search: "localdomain"
gateway: 10.0.0.100
ksmeta: "puppet_version=3.0.1-1.el6 \
ksmeta: "puppet_version=2.7.19-1.el6 \
puppet_auto_setup=1 \
puppet_master=fuel-pm.localdomain \
puppet_enable=0 \

24
deployment/puppet/cobbler/examples/nodes.yaml
View File

@ -5,9 +5,9 @@ fuel-controller-01:
# profile: "ubuntu_1204_x86_64"
netboot-enabled: "1"
# for Ubuntu
# ksmeta: "puppet_version=3.0.1-1puppetlabs1 \
# ksmeta: "puppet_version=2.7.19-1puppetlabs2 \
# for Centos
ksmeta: "puppet_version=3.0.1-1.el6 \
ksmeta: "puppet_version=2.7.19-1.el6 \
puppet_auto_setup=1 \
puppet_master=fuel-pm.localdomain \
puppet_enable=0 \
@ -55,9 +55,9 @@ fuel-controller-02:
# profile: "ubuntu_1204_x86_64"
netboot-enabled: "1"
# for Ubuntu
# ksmeta: "puppet_version=3.0.1-1puppetlabs1 \
# ksmeta: "puppet_version=2.7.19-1puppetlabs2 \
# for Centos
ksmeta: "puppet_version=3.0.1-1.el6 \
ksmeta: "puppet_version=2.7.19-1.el6 \
puppet_auto_setup=1 \
puppet_master=fuel-pm.localdomain \
puppet_enable=0 \
@ -105,9 +105,9 @@ fuel-controller-03:
# profile: "ubuntu_1204_x86_64"
netboot-enabled: "1"
# for Ubuntu
# ksmeta: "puppet_version=3.0.1-1puppetlabs1 \
# ksmeta: "puppet_version=2.7.19-1puppetlabs2 \
# for Centos
ksmeta: "puppet_version=3.0.1-1.el6 \
ksmeta: "puppet_version=2.7.19-1.el6 \
puppet_auto_setup=1 \
puppet_master=fuel-pm.localdomain \
puppet_enable=0 \
@ -155,9 +155,9 @@ fuel-quantum:
# profile: "ubuntu_1204_x86_64"
netboot-enabled: "1"
# for Ubuntu
# ksmeta: "puppet_version=3.0.1-1puppetlabs1 \
# ksmeta: "puppet_version=2.7.19-1puppetlabs2 \
# for Centos
ksmeta: "puppet_version=3.0.1-1.el6 \
ksmeta: "puppet_version=2.7.19-1.el6 \
puppet_auto_setup=1 \
puppet_master=fuel-pm.localdomain \
puppet_enable=0 \
@ -202,9 +202,9 @@ fuel-compute-01:
# profile: "ubuntu_1204_x86_64"
netboot-enabled: "1"
# for Ubuntu
# ksmeta: "puppet_version=3.0.1-1puppetlabs1 \
# ksmeta: "puppet_version=2.7.19-1puppetlabs2 \
# for Centos
ksmeta: "puppet_version=3.0.1-1.el6 \
ksmeta: "puppet_version=2.7.19-1.el6 \
puppet_auto_setup=1 \
puppet_master=fuel-pm.localdomain \
puppet_enable=0 \
@ -250,9 +250,9 @@ fuel-compute-02:
# profile: "ubuntu_1204_x86_64"
netboot-enabled: "1"
# for Ubuntu
# ksmeta: "puppet_version=3.0.1-1puppetlabs1 \
# ksmeta: "puppet_version=2.7.19-1puppetlabs2 \
# for Centos
ksmeta: "puppet_version=3.0.1-1.el6 \
ksmeta: "puppet_version=2.7.19-1.el6 \
puppet_auto_setup=1 \
puppet_master=fuel-pm.localdomain \
puppet_enable=0 \

4
deployment/puppet/puppet/manifests/params.pp
View File

@ -5,7 +5,7 @@ class puppet::params
case $::osfamily {
'RedHat': {
$puppet_master_version = "3.0.1-1"
$puppet_master_version = "2.7.19-1"
$puppet_master_packages = ["puppet-server", "puppet"]
$mongrel_packages = "rubygem-mongrel"
$thin_packages = "rubygem-thin"
@ -14,7 +14,7 @@ class puppet::params
$puppet_config_template = "puppet/puppet.conf.centos.erb"
}
'Debian': {
$puppet_master_version = "3.0.1-1puppetlabs1"
$puppet_master_version = "2.7.19-1puppetlabs2"
$puppet_master_packages = ["puppetmaster", "puppetmaster-common", "puppet-common"]
$mongrel_packages = "mongrel"
$thin_packages = "thin"

4
docs/pages/installation-instructions/0050-configuring-cobbler.rst
View File

@ -132,7 +132,7 @@ Fuel can install CentOS or Ubuntu on your servers, or you can add a profile of y
netboot-enabled: "1"
# for Ubuntu
# ksmeta: "puppet_version=3.0.1-1puppetlabs1 \
# ksmeta: "puppet_version=2.7.19-1puppetlabs2 \
# for Centos
name-servers: "10.20.0.100"
name-servers-search: "localdomain"
@ -140,7 +140,7 @@ Fuel can install CentOS or Ubuntu on your servers, or you can add a profile of y
Set the default nameserver to be fuel-pm, and change the domain name to your own domain name. Set the ``gateway`` to the public network's default gateway. Alternatively, if you don't plan to use your public networks actual gateway, you can set this value to be the IP address of the master node. **Please note:** You must specify a working gateway (or proxy) in order to install OpenStack, because the system will need to communicate with public repositories. ::
ksmeta: "puppet_version=3.0.1-1puppetlabs1 \
ksmeta: "puppet_version=2.7.19-1puppetlabs2 \
puppet_auto_setup=1 \
puppet_master=fuel-pm.localdomain \

6
docs/pages/installation-instructions/config.yaml
View File

@ -96,12 +96,12 @@ common:
# profile: "ubuntu_1204_x86_64"
netboot-enabled: "1"
# for Ubuntu
# ksmeta: "puppet_version=3.0.1-1puppetlabs1 \
# ksmeta: "puppet_version=2.7.19-1puppetlabs2 \
# for Centos
name-servers: "10.0.0.100"
name-servers-search: "local"
gateway: "10.0.0.100"
ksmeta: "puppet_version=3.0.1-1.el6 \
ksmeta: "puppet_version=2.7.19-1.el6 \
puppet_auto_setup=1 \
puppet_master=fuel-pm.local \
puppet_enable=0 \
@ -149,7 +149,7 @@ fuel-controller-02:
hostname: "fuel-controller-02"
role: controller
profile: "ubuntu_1204_x86_64"
ksmeta: "puppet_version=3.0.1-1puppetlabs1 \
ksmeta: "puppet_version=2.7.19-1puppetlabs2 \
puppet_auto_setup=1 \
puppet_master=fuel-pm.local \
puppet_enable=0 \

2
fuel_test/iso_master.py
View File

@ -28,4 +28,4 @@ class SelfTest(TestCase):
print get_config(hostname='fuel-pm', domain='local', management_interface='eth0', management_ip='10.0.0.100',
management_mask='255.255.255.0', external_interface='eth1', dhcp_start_address='10.0.0.201',
dhcp_end_address='10.0.0.254', mirror_type='iso', external_ip='asdf', external_mask='asdff',
parent_proxy="1.2.3.4:3128", puppet_master_version='3.0.1')
parent_proxy="1.2.3.4:3128", puppet_master_version='2.7.19')

2
iso/functions.sh
View File

@ -89,7 +89,7 @@ function default_settings {
dhcp_start_address="10.0.0.201"
dhcp_end_address="10.0.0.254"
mirror_type="default"
puppet_master_version="3.0.1-1.el6"
puppet_master_version="2.7.19-1.el6"
# Read settings from file
[ -f $FUELCONF ] && source $FUELCONF

2
maintenance/functions.sh
View File

@ -22,7 +22,7 @@ function sync_repo_osci {
createrepo .
}
function get_puppet27 {
puppetver="3.0.1-1.el6"
puppetver="2.7.19-1.el6"
kojitag="puppet27"
mkdir -p noarch/ SRPMS/
wget "$REPOTOPDIR/$kojitag/$BINARYDIR/puppet-$puppetver.noarch.rpm" -O noarch/puppet-$puppetver.noarch.rpm