openstack/fuel-library
Code Issues Proposed changes

Merge pull request #123 from Mirantis/fuel-2.2

Browse Source 
Sync latest Fuel 2.2 with master with working ISO
This commit is contained in:
Miroslav Anashkin 2013-05-15 11:44:13 -07:00
commit 377dad7909
6 changed files with 119 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ common:
quantum_netnode_on_cnt: true
use_syslog: true
syslog_server: 10.49.63.12
mirror_type: custom
mirror_type: default
quantum: true
internal_interface: eth0
public_interface: eth1

9
deployment/puppet/openstack/manifests/mirantis_repos.pp
View File

@ -178,14 +178,19 @@ class openstack::mirantis_repos (
baseurl => "http://archive.kernel.org/centos/6.3/os/x86_64/",
mirrorlist => absent
}
yumrepo { 'centos-updates':
descr => 'Local updates mirror repository',
baseurl => "http://archive.kernel.org/centos/6.3/updates/x86_64/",
mirrorlist => absent,
name => 'updates'
}
yumrepo { 'vault6.3-base':
descr => 'Vault 6.3 base mirror repository',
name => 'v6.3-base',
baseurl => "http://vault.centos.org/6.3/os/x86_64/",
mirrorlist => absent
}
}
if $type == 'custom' {

7
docs/pages/introduction/release-notes/v2-2-folsom.rst
View File

@ -8,9 +8,10 @@ v2.2-folsom
* New firewall (iptables) module
* One-pass swift deployment
* User choice on where to store Cinder volumes
* Ability to plug in custom services in HA mode under HAProxy
* Add controller and compute nodes without downtime
* Remove controller and compute nodes without downtime *(caveat with Cinder on controllers)*
* Improvements
* Fixed defects in ISO bootstrap script
* Updated a url to CentOS 6.3 package repository
* Fixes in documentation
* CentOS 6.3 package repository moved to Mirantis mirror

5
iso/Makefile
View File

@ -1,5 +1,5 @@
COMMIT_SHA:=$(shell git rev-parse --verify HEAD)
FUEL_VERSION:=2.2
FUEL_VERSION:=2.2-folsom
CENTOS_MAJOR:=6
CENTOS_MINOR:=3
@ -47,6 +47,7 @@ ISOROOT:=$(BUILD_DIR)/iso/isoroot
#endif
ISOBASENAME:=fuel-centos-$(CENTOS_RELEASE)-$(CENTOS_ARCH)-$(FUEL_VERSION)
[ -z "$$ISOSUFFIX" ] || ISOBASENAME:=$(ISOBASENAME)-$(ISOSUFFIX)
#ISOBASENAME:=fuel-centos-$(CENTOS_RELEASE)-$(CENTOS_ARCH)_$(BUILD_ID)
ISONAME:=$(BUILD_DIR)/iso/$(ISOBASENAME).iso
@ -131,7 +132,7 @@ $(ISONAME): $(BUILD_DIR)/iso/isoroot.done
rm -f $@
mkdir -p $(BUILD_DIR)/iso/isoroot-mkisofs
rsync -a --delete $(ISOROOT)/ $(BUILD_DIR)/iso/isoroot-mkisofs
mkisofs -r -V "Mirantis Fuel-$(FUEL_VERSION)" -p "Mirantis Inc." \
mkisofs -r -V "Mirantis Fuel $(FUEL_VERSION)" -p "Mirantis Inc." \
-J -T -R -b isolinux/isolinux.bin \
-no-emul-boot \
-boot-load-size 4 -boot-info-table \

1
iso/bootstrap_admin_node.sh
View File

@ -1,5 +1,6 @@
#!/bin/bash
FUELCONF=/etc/fuel.conf
source /usr/local/lib/functions.sh
log="/var/log/firstboot-puppet.log"

153
iso/functions.sh
View File

@ -2,16 +2,33 @@
function set_if_conf {
echo
echo -n "Should we use DHCP for that interface (Y/n)?";read -n 1 dhcpsw
echo -n "Should we use DHCP for the ${intf} interface (Y/n)?";read -n 1 dhcpsw
if [[ $dhcpsw == "n" || $dhcpsw == "N" ]]; then
echo
echo -n "Enter ip: "; read ${intf}_ip;
echo -n "Enter netmask: "; read ${intf}_mask
echo -n "Enter default gw: "; read ${intf}_gw
echo -n "Enter First DNS server: "; read ${intf}_dns1
echo -n "Enter Second DNS server: "; read ${intf}_dns2
eval "ip=\${${intf}_ip}"
echo -n "Enter IP address [$ip]: "; read val
[ -z "$val" ] || ip=$val
[ -z "$ip" ] && echo "No IP entered - will use DHCP" && return
eval ${intf}_ip="$ip"
eval "mask=\${${intf}_mask}"
[ -z "$mask" ] && mask="255.255.255.0"
echo -n "Enter netmask [$mask]: "; read val
[ -z "$val" ] || mask=$val
eval ${intf}_mask="$mask"
eval "gw=\${${intf}_gw}"
echo -n "Enter default gateway [$gw]: "; read val
[ -z "$val" ] || gw=$val
eval ${intf}_gw="$gw"
eval "dns1=\${${intf}_dns1}"
echo -n "Enter the 1st DNS server [$dns1]: "; read val
[ -z "$val" ] || dns1=$val
eval ${intf}_dns1="$dns1"
eval "dns2=\${${intf}_dns2}"
echo -n "Enter the 2nd DNS server [$dns2]: "; read val
[ -z "$val" ] || dns2=$val
eval ${intf}_dns2="$dns2"
else
eval ${intf}_ip="";eval ${intf}_mask="";eval ${intf}_gw="";eval ${intf}_dns1="";eval ${intf}_dns2=""
eval ${intf}_ip=""; eval ${intf}_mask=""; eval ${intf}_gw=""; eval ${intf}_dns1=""; eval ${intf}_dns2=""
fi
echo
}
@ -37,6 +54,7 @@ function save_if_cfg {
}
function default_settings {
hostname="fuel-pm"
domain="your-domain-name.com"
mgmt_if="eth0"
@ -46,11 +64,35 @@ function default_settings {
dhcp_start_address="10.0.0.201"
dhcp_end_address="10.0.0.254"
mirror_type="default"
# Read settings from file
[ -f $FUELCONF ] && source $FUELCONF
}
function apply_settings {
echo;echo "Applying settings ..."
# Let's save settings in rc file for future use
echo "hostname=$hostname" > $FUELCONF
echo "domain=$domain" >> $FUELCONF
echo "dhcp_start_address=${dhcp_start_address}" >> $FUELCONF
echo "dhcp_end_address=${dhcp_end_address}" >> $FUELCONF
echo "mirror_type=${mirror_type}" >> $FUELCONF
echo "parent_proxy=${parent_proxy}" >> $FUELCONF
echo "mgmt_if=$mgmt_if" >> $FUELCONF
echo "mgmt_ip=${mgmt_ip}" >> $FUELCONF
echo "mgmt_mask=${mgmt_mask}" >> $FUELCONF
echo "mgmt_gw=$mgmt_gw" >> $FUELCONF
echo "mgmt_dns1=$mgmt_dns1" >> $FUELCONF
echo "mgmt_dns2=$mgmt_dns2" >> $FUELCONF
echo "ext_if=$ext_if" >> $FUELCONF
echo "ext_ip=${ext_ip}" >> $FUELCONF
echo "ext_mask=${ext_mask}" >> $FUELCONF
echo "ext_gw=$ext_gw" >> $FUELCONF
echo "ext_dns1=$ext_dns1" >> $FUELCONF
echo "ext_dns2=$ext_dns2" >> $FUELCONF
# Network interfaces settings apply
for iftype in ext mgmt
do
@ -65,7 +107,7 @@ function apply_settings {
done
# Cobbler settings apply
: ${server:=$mgmt_ip}
: ${server=$mgmt_ip}
: ${domain_name=$domain}
: ${name_server=$mgmt_ip}
: ${next_server=$mgmt_ip}
@ -92,38 +134,39 @@ function apply_settings {
}
function show_top {
clear
echo "Domain: $domain"
echo "Hostname: $hostname"
echo "PXE range: $dhcp_start_address - $dhcp_end_address"
echo "Mirror set to use: $mirror_type"
echo -n "Parent proxy: "
if [ -z "$parent_proxy" ];then echo "none (direct access)"
else
echo $parent_proxy
fi
column -t -s% <(
echo "Management interface: $mgmt_if%External interface: $ext_if"
echo "IP address: ${mgmt_ip:="DHCP"}%IP address: ${ext_ip:="DHCP"}"
echo "Netmask: $mgmt_mask%Netmask: $ext_mask"
echo "Gateway: $mgmt_gw%Gateway:$ext_gw"
echo "DNS Server 1: $mgmt_dns1%DNS Server 1: $ext_dns1"
echo "DNS Server 2: $mgmt_dns2%DNS Server 2: $ext_dns2"
echo
)
echo
clear
echo "Hostname: $hostname"
echo "Domain: $domain"
echo "PXE dhcp range: ${dhcp_start_address} - ${dhcp_end_address}"
echo "Mirror set to use: ${mirror_type}"
echo -n "Parent proxy: "
if [ -z "${parent_proxy}" ];then
echo "none (direct access)"
else
echo $parent_proxy
fi
column -t -s% <(
echo "Management interface: $mgmt_if%External interface: $ext_if"
echo "IP address: ${mgmt_ip:-"DHCP"}%IP address: ${ext_ip:-"DHCP"}"
echo "Netmask: $mgmt_mask%Netmask: $ext_mask"
echo "Gateway: $mgmt_gw%Gateway:$ext_gw"
echo "DNS Server 1: $mgmt_dns1%DNS Server 1: $ext_dns1"
echo "DNS Server 2: $mgmt_dns2%DNS Server 2: $ext_dns2"
echo
)
echo
}
function show_msg {
echo "Menu:"
echo "1. Change masternode hostname and domain"
echo "2. Configure OpenStack cloud management interface"
echo "3. Configure external interface with repositories/internet access"
echo "4. Change IP range to use for baremetal provisioning via PXE"
echo "5. Choose a set of mirror to use (default/custom)"
echo "6. Configure to use parent proxy"
echo "9. Quit"
echo -n "Please, select an action to do:"
echo "Menu:"
echo "1. Change MasterNode hostname and domain"
echo "2. Configure OpenStack cloud management interface"
echo "3. Configure external interface to access package repositories and Internet"
echo "4. Change dhcp IP range to use for baremetal provisioning via PXE"
echo "5. Choose a set of mirrors to use ('default' or 'custom')"
echo "6. Configure MasterNode to use a parent proxy"
echo "9. Quit"
echo -n "Please select an action to do:"
}
function menu_conf {
@ -139,44 +182,54 @@ function menu_conf {
case $answer in
1)
show_top
echo "WARNING! Changing MasterNode hostname or domain name will make you existing puppet"
echo "keys and configuration files invalid!!!"
echo "WARNING! Changing MasterNode hostname or domain name will make your existing"
echo "puppet keys and configuration files invalid!!!"
echo "If you have already deployed any nodes using current hostname or domain name"
echo "you have either to re-deploy existing nodes including operating system"
echo "installation or manually remove puppet cache and keys on every deployed node"
echo "with 'rm -rf /var/lib/puppet' and manually change all affected puppet and"
echo "mcollective configuration files!"
echo "If there is no deployed nodes in your current installation - then it is safe"
echo "If there are no deployed nodes in your current installation - then it is safe"
echo "to change MasterNode hostname and domain name."
echo "This script will remove current puppet master key automatically."
echo
echo -n "Please enter hostname for this puppetmaster/cobbler MasterNode: "; read hostname
echo -n "Please enter domain name for this cloud: "; read domain
echo -n "Please enter hostname for this puppetmaster/cobbler MasterNode [$hostname]: "; read val
[ -z "$val" ] || hostname=$val
echo -n "Please enter domain name for this OpenStack cloud [$domain]: "; read val
[ -z "$val" ] || domain=$val
;;
2)
show_top
echo -n "Please specify the network interface to use for management network: "; read mgmt_if
echo -n "Please specify the network interface to use for management network [${mgmt_if}]: "; read val
[ -z "$val" ] || mgmt_if=$val
intf="mgmt"
set_if_conf
;;
3)
show_top
echo -n "Please specify the network interface to access repositories/internet: "; read ext_if
echo -n "Please specify the network interface to access package repositories and Internet [${ext_if}]: "; read val
[ -z "$val" ] || ext_if=$val
intf="ext"
set_if_conf
;;
;;
4)
show_top
echo -n "Please enter DHCP start address: "; read dhcp_start_address
echo -n "Please enter DHCP end address: "; read dhcp_end_address
echo -n "Please enter PXE dhcp start address [${dhcp_start_address}]: "; read val
[ -z "$val" ] || dhcp_start_address=$val
echo -n "Please enter PXE dhcp end address [${dhcp_end_address}]: "; read val
[ -z "$val" ] || dhcp_end_address=$val
;;
5)
show_top
echo -n "Please select a set of mirrors to use(default/custom): "; read mirror_type
echo -n "Please type a set of mirrors to use ('default' or 'custom') [${mirror_type}]: "; read val
if [ -n "$val" ]; then
[[ "$val" == "default" || "$val" == "custom" ]] && mirror_type=$val
fi
;;
6)
show_top
echo -n "Please specify parent proxy address to be used (ex: 11.12.13.14:3128 ): "; read parent_proxy
show_top
echo -n "Please specify MasterNode parent proxy address and port to be used (ex: 11.12.13.14:3128 ) [${parent_proxy}]: "; read val
[ -z "$val" ] || parent_proxy=$val
;;
9)
echo;echo "ATTENTION! The changes are permanent!"