openstack/fuel-library
Code Issues Proposed changes

Merge branch 'master' of github.com:Mirantis/fuel into asdfasdf

Browse Source
This commit is contained in:
vic
2013-05-24 17:10:42 +04:00
parent 061f1e4c6c 3127087d14
commit 304cfeb38e
15 changed files with 38 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/mcollective/astute/samples/config.yaml
View File

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

2
deployment/mcollective/astute/spec/example-logs/anaconda.log_
View File

@@ -402,7 +402,7 @@
2013-01-23T09:26:27 info: Installing ntp-4.2.4p8-2.el6.centos.x86_64
2013-01-23T09:26:27 info: Installing openssh-clients-5.3p1-81.el6_3.x86_64
2013-01-23T09:26:27 info: Installing openssh-server-5.3p1-81.el6_3.x86_64
2013-01-23T09:26:28 info: Installing puppet-2.7.19-1.el6.noarch
2013-01-23T09:26:28 info: Installing puppet-3.0.1-1.el6.noarch
2013-01-23T09:26:30 info: Installing policycoreutils-2.0.83-19.24.el6.x86_64
2013-01-23T09:26:31 info: Installing nailgun-net-check-0.0.2-1.x86_64
2013-01-23T09:26:31 info: Installing grub-0.97-77.el6.x86_64

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=2.7.19-1puppetlabs2 \
# ksmeta: "puppet_version=3.0.1-1puppetlabs1 \
# for Centos
ksmeta: "puppet_version=2.7.19-1.el6 \
ksmeta: "puppet_version=3.0.1-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=2.7.19-1puppetlabs2 \
# ksmeta: "puppet_version=3.0.1-1puppetlabs1 \
# for Centos
ksmeta: "puppet_version=2.7.19-1.el6 \
ksmeta: "puppet_version=3.0.1-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=2.7.19-1puppetlabs2 \
# ksmeta: "puppet_version=3.0.1-1puppetlabs1 \
# for Centos
ksmeta: "puppet_version=2.7.19-1.el6 \
ksmeta: "puppet_version=3.0.1-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=2.7.19-1puppetlabs2 \
# ksmeta: "puppet_version=3.0.1-1puppetlabs1 \
# for Centos
ksmeta: "puppet_version=2.7.19-1.el6 \
ksmeta: "puppet_version=3.0.1-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=2.7.19-1puppetlabs2 \
# ksmeta: "puppet_version=3.0.1-1puppetlabs1 \
# for Centos
ksmeta: "puppet_version=2.7.19-1.el6 \
ksmeta: "puppet_version=3.0.1-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=2.7.19-1puppetlabs2 \
# ksmeta: "puppet_version=3.0.1-1puppetlabs1 \
# for Centos
ksmeta: "puppet_version=2.7.19-1.el6 \
ksmeta: "puppet_version=3.0.1-1.el6 \
puppet_auto_setup=1 \
puppet_master=fuel-pm.localdomain \
puppet_enable=0 \

7
deployment/puppet/openstack/manifests/firewall.pp
View File

@@ -199,13 +199,6 @@ class openstack::firewall (
action => 'accept',
}
firewall {'199 gre-notrack':
chain => "PREROUTING",
table => 'raw',
proto => 'gre',
action => 'notrack',
}
firewall { '999 drop all other requests':
action => 'drop',
}

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

@@ -5,7 +5,7 @@ class puppet::params
case $::osfamily {
'RedHat': {
$puppet_master_version = "2.7.19-1.el6"
$puppet_master_version = "3.0.1-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 = "2.7.19-1puppetlabs1"
$puppet_master_version = "3.0.1-1puppetlabs1"
$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=2.7.19-1puppetlabs2 \
# ksmeta: "puppet_version=3.0.1-1puppetlabs1 \
# 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=2.7.19-1puppetlabs2 \
ksmeta: "puppet_version=3.0.1-1puppetlabs1 \
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=2.7.19-1puppetlabs2 \
# ksmeta: "puppet_version=3.0.1-1puppetlabs1 \
# for Centos
name-servers: "10.0.0.100"
name-servers-search: "local"
gateway: "10.0.0.100"
ksmeta: "puppet_version=2.7.19-1.el6 \
ksmeta: "puppet_version=3.0.1-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=2.7.19-1puppetlabs2 \
ksmeta: "puppet_version=3.0.1-1puppetlabs1 \
puppet_auto_setup=1 \
puppet_master=fuel-pm.local \
puppet_enable=0 \

8
fuel_test/cobbler/vm_test_case.py
View File

@@ -30,7 +30,7 @@ class CobblerTestCase(BaseTestCase):
write_config(self.remote(), "/root/fuel.defaults",
iso_master.get_config(
hostname="master",
domain="your-domain-name.com",
domain="localdomain",
management_interface=INTERFACES["internal"],
management_ip=self.nodes().masters[
0].get_ip_address_by_network_name("internal"),
@@ -67,7 +67,7 @@ class CobblerTestCase(BaseTestCase):
# Manifest().write_cobbler_manifest(self.remote(), self.ci(), nodes)
# self.validate(nodes, 'puppet agent --test --server master.your-domain-name.com')
# self.validate(nodes, 'puppet agent --test --server master.localdomain')
for node in nodes:
self.assert_cobbler_ports(
@@ -115,12 +115,12 @@ class CobblerTestCase(BaseTestCase):
system_id = client.new_system(token)
profile = CURRENT_PROFILE
client.modify_system_args(system_id, token,
ks_meta=Config().get_ks_meta('master.your-domain-name.com',
ks_meta=Config().get_ks_meta('master.localdomain',
stomp_name),
name=node_name,
hostname=node_name,
name_servers=cobbler.get_ip_address_by_network_name('internal'),
name_servers_search="your-domain-name.com",
name_servers_search="localdomain",
profile=profile,
gateway=gateway,
netboot_enabled="1")

2
fuel_test/config.py
View File

@@ -83,7 +83,7 @@ class Config():
def cobbler_common(self, ci):
config = {"gateway": str(ci.nodes().masters[0].get_ip_address_by_network_name('internal')),
"name-servers": str(ci.nodes().masters[0].get_ip_address_by_network_name('internal')),
"name-servers-search": "your-domain-name.com",
"name-servers-search": "localdomain",
"profile": CURRENT_PROFILE}
ksmeta = self.get_ks_meta(ci.nodes().masters[0].name + DOMAIN_NAME, ci.nodes().masters[0].name)

10
fuel_test/settings.py
View File

@@ -16,8 +16,8 @@ PUPPET_VERSIONS = {
"3": '3.0.1-1.el6',
},
'ubuntu': {
"2": '2.7.19-1puppetlabs1',
"3": '3.1.0-1puppetlabs1'
"2": '2.7.19-1puppetlabs2',
"3": '3.0.1-1puppetlabs1'
},
}
@@ -29,8 +29,8 @@ PUPPET_CLIENT_PACKAGES = {
"3": 'puppet-3.0.1-1.el6',
},
'ubuntu': {
"2": 'puppet=2.7.19-1puppetlabs1 puppet-common=2.7.19-1puppetlabs1',
"3": 'puppet=3.1.0-1puppetlabs1 puppet-common=3.1.0-1puppetlabs1'
"2": 'puppet=2.7.19-1puppetlabs2 puppet-common=2.7.19-1puppetlabs2',
"3": 'puppet=3.0.1-1puppetlabs1 puppet-common=3.0.1-1puppetlabs1'
},
}
@@ -124,4 +124,4 @@ PROFILES_COBBLER_COMMON = {
CURRENT_PROFILE = PROFILES_COBBLER_COMMON.get(OS_FAMILY)
ASTUTE_USE = os.environ.get('ASTUTE_USE', 'true') == 'true'
DOMAIN_NAME = os.environ.get('DOMAIN_NAME', '.your-domain-name.com')
DOMAIN_NAME = os.environ.get('DOMAIN_NAME', '.localdomain')

2
iso/Makefile
View File

@@ -47,7 +47,7 @@ ISOROOT:=$(BUILD_DIR)/iso/isoroot
#endif
ISOBASENAME:=fuel-centos-$(CENTOS_RELEASE)-$(CENTOS_ARCH)-$(FUEL_VERSION)
[ -z "$$ISOSUFFIX" ] || ISOBASENAME:=$(ISOBASENAME)-$(ISOSUFFIX)
#[ -z "$$ISOSUFFIX" ] || ISOBASENAME:=$(ISOBASENAME)-$(ISOSUFFIX)
#ISOBASENAME:=fuel-centos-$(CENTOS_RELEASE)-$(CENTOS_ARCH)_$(BUILD_ID)
ISONAME:=$(BUILD_DIR)/iso/$(ISOBASENAME).iso

2
iso/bootstrap_admin_node.sh
View File

@@ -28,7 +28,7 @@ chown root:puppet /var/lib/puppet/ssh_keys/openstack*
chmod g+r /var/lib/puppet/ssh_keys/openstack*
puppet apply -e "
class {openstack::mirantis_repos: enable_epel => false } ->
class {puppet: } -> class {puppet::thin:} -> class {puppet::nginx: puppet_master_hostname => \"$hostname.$domain\"}
class {puppet: puppet_master_version => \"$puppet_master_version\"} -> class {puppet::thin:} -> class {puppet::nginx: puppet_master_hostname => \"$hostname.$domain\"}
"
puppet apply -e "
class {puppet::fileserver_config: } "

1
iso/functions.sh
View File

@@ -89,6 +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"
# Read settings from file
[ -f $FUELCONF ] && source $FUELCONF

2
iso/ks.cfg
View File

@@ -80,7 +80,7 @@ wget
curl
crontabs
cronie
puppet-2.7.19
puppet
python-argparse
mcollective
mcollective-client

4
maintenance/functions.sh
View File

@@ -15,14 +15,14 @@ function sync_repo_osci {
make_yum_conf "$binrepo" "$srcrepo"
reposync -c "$YUMCONF" --repo "$(get_repo_name "$binrepo")" --norepopath -p .
reposync -c "$YUMCONF" --source --repo "$(get_repo_name "$srcrepo")" --norepopath -p .
get_puppet27
#get_puppet27
mv *.x86_64.rpm x86_64
mv *.noarch.rpm noarch
mv *.src.rpm SRPMS
createrepo .
}
function get_puppet27 {
puppetver="2.7.19-1.el6"
puppetver="3.0.1-1.el6"
kojitag="puppet27"
mkdir -p noarch/ SRPMS/
wget "$REPOTOPDIR/$kojitag/$BINARYDIR/puppet-$puppetver.noarch.rpm" -O noarch/puppet-$puppetver.noarch.rpm