openstack/fuel-library
Code Issues Proposed changes

Switched to external repos.

Browse Source
This commit is contained in:
ashaposhnikov 2013-03-10 18:29:58 +00:00
parent d1b55f889e
commit b90eff505b
3 changed files with 73 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
iso/bootstrap_admin_node.sh
View File

@ -21,37 +21,68 @@ apply_settings
# Installing puppetmaster/cobbler node role # Installing puppetmaster/cobbler node role
echo;echo "Provisioning masternode role ..." echo;echo "Provisioning masternode role ..."
( (
puppet apply -e "class {openstack::mirantis_repos: enable_epel => true }" puppet apply -e "
puppet apply -e "class {puppet: } -> class {puppet::thin:} -> class {puppet::nginx: puppet_master_hostname => \"$hstname.$domain\"}" class {openstack::mirantis_repos: enable_epel => true }
puppet apply -e 'class {puppetdb: }' class {puppet: } -> class {puppet::thin:} -> class {puppet::nginx: puppet_master_hostname => \"$hstname.$domain\"}
puppet apply -e 'class {puppet::master_config: }' class {puppetdb: }"
puppet apply -e "
class {puppet::master_config: } "
# Walking aroung nginx's default server config # Walking aroung nginx's default server config
rm -f /etc/nginx/conf.d/default.conf rm -f /etc/nginx/conf.d/default.conf
service nginx restart service nginx restart
puppet apply --debug -e "class {cobbler: server => \"$server\", domain_name => \"$domain_name\", name_server => \"$name_server\", \ puppet apply -e "
next_server => \"$next_server\", dhcp_start_address => \"$dhcp_start_address\" , dhcp_end_address => \"$dhcp_end_address\", \ class { cobbler:
dhcp_netmask => \"$dhcp_netmask\", dhcp_gateway => \"$dhcp_gateway\" , cobbler_user => \"$cobbler_user\", cobbler_password =>\"$cobbler_password\", \ server => \"$server\",
pxetimeout => \"$pxetimeout\", dhcp_interface => \"$dhcp_interface\" }" domain_name => \"$domain_name\",
name_server => \"$name_server\",
next_server => \"$next_server\",
dhcp_start_address => \"$dhcp_start_address\",
dhcp_end_address => \"$dhcp_end_address\",
dhcp_netmask => \"$dhcp_netmask\",
dhcp_gateway => \"$dhcp_gateway\",
cobbler_user => \"$cobbler_user\",
cobbler_password =>\"$cobbler_password\",
pxetimeout => \"$pxetimeout\",
dhcp_interface => \"$dhcp_interface\" }"
puppet apply -e " \ puppet apply -e "
class { 'cobbler::nat': nat_range => \"$mgmt_ip/$mgmt_mask\" } class { 'cobbler::nat': nat_range => \"$mgmt_ip/$mgmt_mask\" }
cobbler_distro {'ubuntu_1204_x86_64': cobbler_distro {'ubuntu_1204_x86_64':
kernel => '/var/www/ubuntu/netboot/linux', kernel => '/var/www/ubuntu/netboot/linux',
initrd => '/var/www/ubuntu/netboot/initrd.gz', initrd => '/var/www/ubuntu/netboot/initrd.gz',
breed => 'ubuntu', breed => 'ubuntu',
arch => 'x86_64', arch => 'x86_64',
osversion => 'precise', osversion => 'precise',
ksmeta => 'tree_host=172.18.67.168 tree_url=/ubuntu-repo/mirror.yandex.ru/ubuntu/', } ksmeta => 'tree_host=us.archive.ubuntu.com tree_url=/ubuntu', }
class { 'cobbler::profile::ubuntu_1204_x86_64': } class { 'cobbler::profile::ubuntu_1204_x86_64': }
cobbler_distro {'centos63_x86_64': cobbler_distro {'centos63_x86_64':
kernel => '/var/www/centos/6.3/os/x86_64/isolinux/vmlinuz', kernel => '/var/www/centos/6.3/os/x86_64/isolinux/vmlinuz',
initrd => '/var/www/centos/6.3/os/x86_64/isolinux/initrd.img', initrd => '/var/www/centos/6.3/os/x86_64/isolinux/initrd.img',
arch => 'x86_64', arch => 'x86_64',
breed => 'redhat', breed => 'redhat',
osversion => 'rhel6', osversion => 'rhel6',
ksmeta => 'tree=http://172.18.67.168/centos-repo/centos-6.3', } ksmeta => 'tree=http://mirror.stanford.edu/yum/pub/centos', }
class { 'cobbler::profile::centos63_x86_64': } class { 'cobbler::profile::centos63_x86_64': }"
class { 'mcollective::rabbitmq': } class { 'mcollective::client': }"
puppet apply -e '
$stompuser="mcollective"
$stomppassword="AeN5mi5thahz2Aiveexo"
$pskey="un0aez2ei9eiGaequaey4loocohjuch4Ievu3shaeweeg5Uthi"
$stomphost="127.0.0.1"
$stompport="61613"
class { mcollective::rabbitmq:
stompuser => $stompuser,
stomppassword => $stomppassword,
}
class { mcollective::client:
pskey => $pskey,
stompuser => $stompuser,
stomppassword => $stomppassword,
stomphost => $stomphost,
stompport => $stompport
} '
) >> $log ) >> $log

4
iso/functions.sh
View File

@ -40,7 +40,7 @@ function default_settings {
hostname="fuel-pm" hostname="fuel-pm"
domain="local" domain="local"
mgmt_if="eth0" mgmt_if="eth0"
mgmt_ip="10.0.0.1" mgmt_ip="10.0.0.100"
mgmt_mask="255.255.0.0" mgmt_mask="255.255.0.0"
ext_if="eth1" ext_if="eth1"
dhcp_start_address="10.0.0.201" dhcp_start_address="10.0.0.201"
@ -78,6 +78,8 @@ function apply_settings {
# Domain/Hostname apply # Domain/Hostname apply
sed -i -e 's#^\(HOSTNAME=\).*$#\1'"$hostname"'#' /etc/sysconfig/network sed -i -e 's#^\(HOSTNAME=\).*$#\1'"$hostname"'#' /etc/sysconfig/network
[ -z $mgmt_ip ] && echo "prepend domain-name-servers 127.0.0.1;" >> /etc/dhclient-$mgmt_if.conf
[ -z $ext_ip ] && echo "prepend domain-name-servers 127.0.0.1;" >> /etc/dhclient-$ext_if.conf
[ -z $mgmt_ip ] || grep -q "^\s*$mgmt_ip\s+$hostname" /etc/hosts || echo "$mgmt_ip $hostname.$domain $hostname" >> /etc/hosts [ -z $mgmt_ip ] || grep -q "^\s*$mgmt_ip\s+$hostname" /etc/hosts || echo "$mgmt_ip $hostname.$domain $hostname" >> /etc/hosts
service network restart service network restart
sed -i "s%\(^.*address is:\).*$%\1 `ip address show $ext_if | awk '/inet / {print \$2}' | cut -d/ -f1 -`%" /etc/issue sed -i "s%\(^.*address is:\).*$%\1 `ip address show $ext_if | awk '/inet / {print \$2}' | cut -d/ -f1 -`%" /etc/issue

22
iso/ks.cfg
View File

@ -4,11 +4,11 @@ text
reboot --eject reboot --eject
lang en_US.UTF-8 lang en_US.UTF-8
selinux --disabled selinux --disabled
url --url http://172.18.67.168/centos-repo/centos-6.3 #url --url http://172.18.67.168/centos-repo/centos-6.3
#url --url http://mirror.stanford.edu/yum/pub/centos/6.3/os/x86_64/ url --url http://mirror.stanford.edu/yum/pub/centos/6.3/os/x86_64/
network --bootproto=dhcp network --bootproto=dhcp
#repo --name=Base --mirrorlist=http://mirrorlist.centos.org/?release=6.3&arch=x86_64&repo=os repo --name=Base --mirrorlist=http://mirrorlist.centos.org/?release=6.3&arch=x86_64&repo=os
repo --name=Base --baseurl=http://172.18.67.168/centos-repo/centos-6.3 #repo --name=Base --baseurl=http://172.18.67.168/centos-repo/centos-6.3
repo --name=Updates --mirrorlist=http://mirrorlist.centos.org/?release=6.3&arch=x86_64&repo=updates repo --name=Updates --mirrorlist=http://mirrorlist.centos.org/?release=6.3&arch=x86_64&repo=updates
repo --name=Mirantis --mirrorlist=http://download.mirantis.com/epel-fuel-folsom/mirror.internal.list repo --name=Mirantis --mirrorlist=http://download.mirantis.com/epel-fuel-folsom/mirror.internal.list
repo --name=PuppetLabs --baseurl=http://yum.puppetlabs.com/el/6/products/x86_64/ repo --name=PuppetLabs --baseurl=http://yum.puppetlabs.com/el/6/products/x86_64/
@ -87,10 +87,10 @@ puppetdb
python-argparse python-argparse
mcollective mcollective
mcollective-client mcollective-client
rubygem-astute #rubygem-astute
#ruby-devel ruby-devel
#gcc gcc
#make make
man man
yum yum
openssh-clients openssh-clients
@ -132,7 +132,7 @@ baseurl=http://yum.puppetlabs.com/el/6/products/x86_64/
gpgcheck=0 gpgcheck=0
EOF EOF
mkdir -p /etc/httpd/conf.d #mkdir -p /etc/httpd/conf.d
#cat > /etc/httpd/conf.d/distr.conf << EOF #cat > /etc/httpd/conf.d/distr.conf << EOF
#Alias /ubuntu /var/www/ubuntu #Alias /ubuntu /var/www/ubuntu
#Alias /centos /var/www/centos #Alias /centos /var/www/centos
@ -155,11 +155,13 @@ chmod 0777 /usr/local/sbin/bootstrap_admin_node.sh
cp ${SOURCE}/bootstrap_admin_node.conf /etc/init/bootstrap_admin_node.conf cp ${SOURCE}/bootstrap_admin_node.conf /etc/init/bootstrap_admin_node.conf
echo "ENABLED=1" > /etc/sysconfig/bootstrap_admin_node echo "ENABLED=1" > /etc/sysconfig/bootstrap_admin_node
# Copying cobbler system script to sbin folder
cp /etc/puppet/modules/cobbler/examples/cobbler_system.py /usr/local/sbin
# Copying version.yaml file. It contains COMMIT_SHA of last commit. # Copying version.yaml file. It contains COMMIT_SHA of last commit.
mkdir -p /etc/fuel mkdir -p /etc/fuel
cp ${SOURCE}/version.yaml /etc/fuel/version.yaml cp ${SOURCE}/version.yaml /etc/fuel/version.yaml
# Prepare custom /etc/issue logon banner and script for changing IP in it # Prepare custom /etc/issue logon banner and script for changing IP in it
cat > /etc/issue << EOF cat > /etc/issue << EOF
################################################### ###################################################