Remove CentOS based bootstrap image support
Related-bug: #1536658 Implements: blueprint remove-centos-bootstrap-from-fuel Change-Id: I78eeecebebdd18de12745160ce85270528eea99b
This commit is contained in:
Sergey Kulanov
Vladimir Kozhukalov
parent
efaf8beb7b
commit
3e1320bfcf
|
|
@ -3,13 +3,11 @@ notice('MODULAR: astute.pp')
|
|||
$fuel_settings = parseyaml($astute_settings_yaml)
|
||||
|
||||
$bootstrap_settings = pick($::fuel_settings['BOOTSTRAP'], {})
|
||||
$bootstrap_flavor = pick($bootstrap_settings['flavor'], 'centos')
|
||||
|
||||
class { 'fuel::astute':
|
||||
rabbitmq_host => $::fuel_settings['ADMIN_NETWORK']['ipaddress'],
|
||||
rabbitmq_astute_user => $::fuel_settings['astute']['user'],
|
||||
rabbitmq_astute_password => $::fuel_settings['astute']['password'],
|
||||
bootstrap_flavor => $bootstrap_flavor,
|
||||
}
|
||||
|
||||
fuel::systemd { 'astute':
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ else {
|
|||
class { "fuel::cobbler":
|
||||
cobbler_user => $::fuel_settings['cobbler']['user'],
|
||||
cobbler_password => $::fuel_settings['cobbler']['password'],
|
||||
bootstrap_flavor => pick($bootstrap_settings['flavor'], 'centos'),
|
||||
bootstrap_path => pick($bootstrap_settings['path'], '/var/www/nailgun/bootstraps/active_bootstrap'),
|
||||
bootstrap_meta => pick(loadyaml("${bootstrap_path}/metadata.yaml"), {}),
|
||||
server => $::fuel_settings['ADMIN_NETWORK']['ipaddress'],
|
||||
|
|
@ -31,10 +30,6 @@ class { "fuel::cobbler":
|
|||
dhcp_interface => $::fuel_settings['ADMIN_NETWORK']['interface'],
|
||||
nailgun_api_url => $nailgun_api_url,
|
||||
bootstrap_ethdevice_timeout => pick($bootstrap_settings['ethdevice_timeout'], '120'),
|
||||
# dhcp_start_address => $::fuel_settings['ADMIN_NETWORK']['dhcp_pool_start'],
|
||||
# dhcp_end_address => $::fuel_settings['ADMIN_NETWORK']['dhcp_pool_end'],
|
||||
# dhcp_netmask => $::fuel_settings['ADMIN_NETWORK']['netmask'],
|
||||
# dhcp_gateway => $dhcp_gateway,
|
||||
}
|
||||
|
||||
fuel::systemd {['httpd', 'cobblerd', 'dnsmasq', 'xinetd']:
|
||||
|
|
|
|||
|
|
@ -2,15 +2,9 @@ class fuel::astute(
|
|||
$rabbitmq_host = $::fuel::params::rabbitmq_host,
|
||||
$rabbitmq_astute_user = $::fuel::params::rabbitmq_astute_user,
|
||||
$rabbitmq_astute_password = $::fuel::params::rabbitmq_astute_password,
|
||||
$bootstrap_flavor = 'centos',
|
||||
$bootstrap_profile = $::fuel::params::bootstrap_profile,
|
||||
) inherits fuel::params {
|
||||
|
||||
$bootstrap_profile = $bootstrap_flavor ? {
|
||||
/(?i)centos/ => 'bootstrap',
|
||||
/(?i)ubuntu/ => 'ubuntu_bootstrap',
|
||||
default => 'bootstrap',
|
||||
}
|
||||
|
||||
$packages = [
|
||||
"psmisc",
|
||||
"python-editor",
|
||||
|
|
|
|||
|
|
@ -2,12 +2,11 @@ class fuel::cobbler(
|
|||
$repo_root = $::fuel::params::repo_root,
|
||||
$cobbler_user = $::fuel::params::cobbler_user,
|
||||
$cobbler_password = $::fuel::params::cobbler_password,
|
||||
# NOTE(kozhukalov): to be deprecated
|
||||
$bootstrap_flavor = $::fuel::params::bootstrap_flavor,
|
||||
$bootstrap_path,
|
||||
$bootstrap_meta,
|
||||
# network interface configuration timeout (in seconds)
|
||||
$bootstrap_ethdevice_timeout = $::fuel::params::bootstrap_ethdevice_timeout,
|
||||
$bootstrap_profile = $::fuel::params::bootstrap_profile,
|
||||
$centos_repos = $::fuel::params::centos_repos,
|
||||
$ks_system_timezone = $::fuel::params::ks_system_timezone,
|
||||
$server = $::fuel::params::cobbler_host,
|
||||
|
|
@ -18,10 +17,6 @@ class fuel::cobbler(
|
|||
$dns_search = $::fuel::params::dns_search,
|
||||
$mco_user = $::fuel::params::mco_user,
|
||||
$mco_pass = $::fuel::params::mco_password,
|
||||
# $dhcp_start_address,
|
||||
# $dhcp_end_address,
|
||||
# $dhcp_netmask,
|
||||
# $dhcp_gateway = $::ipaddress,
|
||||
$dhcp_interface = $::fuel::params::dhcp_interface,
|
||||
$nailgun_api_url = "http://${::fuel::params::nailgun_host}:${::fuel::params::nailgun_port}/api",
|
||||
# default password is 'r00tme'
|
||||
|
|
@ -38,12 +33,6 @@ class fuel::cobbler(
|
|||
#Set real_server so Cobbler identifies its own IP correctly in Docker
|
||||
$real_server = $next_server
|
||||
|
||||
$bootstrap_profile = $bootstrap_flavor ? {
|
||||
/(?i)centos/ => 'bootstrap',
|
||||
/(?i)ubuntu/ => 'ubuntu_bootstrap',
|
||||
default => 'bootstrap',
|
||||
}
|
||||
|
||||
if $::osfamily == 'RedHat' {
|
||||
case $operatingsystemmajrelease {
|
||||
'6': {
|
||||
|
|
@ -163,16 +152,6 @@ class fuel::cobbler(
|
|||
require => Cobbler_distro['ubuntu_1404_x86_64'],
|
||||
}
|
||||
|
||||
cobbler_distro { 'bootstrap':
|
||||
kernel => "${repo_root}/bootstrap/linux",
|
||||
initrd => "${repo_root}/bootstrap/initramfs.img",
|
||||
arch => 'x86_64',
|
||||
breed => 'redhat',
|
||||
osversion => 'rhel6',
|
||||
ksmeta => '',
|
||||
require => Class['::cobbler::server'],
|
||||
}
|
||||
|
||||
cobbler_distro { 'ubuntu_bootstrap':
|
||||
kernel => "${bootstrap_path}/vmlinuz",
|
||||
initrd => "${bootstrap_path}/initrd.img",
|
||||
|
|
@ -183,16 +162,6 @@ class fuel::cobbler(
|
|||
require => Class['::cobbler::server'],
|
||||
}
|
||||
|
||||
cobbler_profile { 'bootstrap':
|
||||
distro => 'bootstrap',
|
||||
menu => true,
|
||||
kickstart => '',
|
||||
kopts => "intel_pstate=disable console=ttyS0,9600 console=tty0 biosdevname=0 url=${nailgun_api_url} mco_user=${mco_user} mco_pass=${mco_pass}",
|
||||
ksmeta => '',
|
||||
server => $real_server,
|
||||
require => Cobbler_distro['bootstrap'],
|
||||
}
|
||||
|
||||
cobbler_profile { 'ubuntu_bootstrap':
|
||||
distro => 'ubuntu_bootstrap',
|
||||
menu => true,
|
||||
|
|
@ -215,7 +184,7 @@ class fuel::cobbler(
|
|||
exec { 'cobbler_system_edit_default':
|
||||
command => "cobbler system edit --name=default \
|
||||
--profile=${bootstrap_profile} --netboot-enabled=True",
|
||||
unless => "cobbler system report --name default 2>/dev/null | grep -q -E '^Profile\\s*:\\s*${bootstrap_profile}'",
|
||||
unless => "cobbler system report --name default 2>/dev/null | grep -q -E '^Profile\\s*:\\s*${bootstrap_profile}'",
|
||||
require => Cobbler_profile[$bootstrap_profile],
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -30,12 +30,12 @@ class fuel::params {
|
|||
$keystone_monitord_password = 'monitord'
|
||||
$keystone_monitord_tenant = 'services'
|
||||
|
||||
$keystone_auth_version = 'v2.0'
|
||||
$keystone_admin_token = 'admin'
|
||||
$keystone_auth_version = 'v2.0'
|
||||
$keystone_admin_token = 'admin'
|
||||
|
||||
$bootstrap_flavor = 'centos'
|
||||
# network interface configuration timeout (in seconds)
|
||||
$bootstrap_ethdevice_timeout = '120'
|
||||
$bootstrap_profile = 'ubuntu_bootstrap'
|
||||
|
||||
$rabbitmq_host = '127.0.0.1'
|
||||
$rabbitmq_astute_user = 'naily'
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
Host *
|
||||
IdentityFile ~/.ssh/bootstrap.rsa
|
||||
IdentityFile ~/.ssh/id_rsa
|
||||
|
||||
Host *.<%= @dns_domain %> node-* controller-* compute-* storage-* 10.* 192.168.* 172.30.* 172.31.* 172.2?.* 172.1?.* <%= @admin_network %> <%
|
||||
|
|
|
|||
Loading…
Reference in New Issue