openstack/fuel-library
Code Issues Proposed changes

Merge "Create m1.micro nova flavor"

Browse Source
This commit is contained in:
Jenkins 2014-11-28 21:20:27 +00:00 committed by Gerrit Code Review
commit bbf26b499b
3 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deployment/puppet/openstack/manifests/nova/controller.pp
View File

@ -324,5 +324,4 @@ class openstack::nova::controller (
ensure_package => $ensure_package
}
}
}

36
deployment/puppet/osnailyfacter/manifests/cluster_ha.pp
View File

@ -569,19 +569,33 @@ class osnailyfacter::cluster_ha {
Class['keystone', 'openstack::ha::keystone']-> Exec<| title=='wait-for-haproxy-keystone-backend' |>
Class['keystone', 'openstack::ha::keystone']-> Exec<| title=='wait-for-haproxy-keystone-admin-backend' |>
}
if ! $::use_neutron {
if $primary_controller {
exec { 'wait-for-haproxy-nova-backend':
command => "echo show stat | socat unix-connect:///var/lib/haproxy/stats stdio | grep '^nova-api-2,' | egrep -v ',FRONTEND,|,BACKEND,' | grep -qv ',INI,' &&
echo show stat | socat unix-connect:///var/lib/haproxy/stats stdio | grep -q '^nova-api-2,BACKEND,.*,UP,'",
path => ['/usr/bin', '/usr/sbin', '/sbin', '/bin'],
try_sleep => 5,
tries => 60,
require => Package['socat'],
}
exec { 'wait-for-haproxy-nova-backend':
command => "echo show stat | socat unix-connect:///var/lib/haproxy/stats stdio | grep '^nova-api-2,' | egrep -v ',FRONTEND,|,BACKEND,' | grep -qv ',INI,' &&
echo show stat | socat unix-connect:///var/lib/haproxy/stats stdio | grep -q '^nova-api-2,BACKEND,.*,UP,'",
path => ['/usr/bin', '/usr/sbin', '/sbin', '/bin'],
try_sleep => 5,
tries => 60,
require => Package['socat'],
}
exec {'create-m1.micro-flavor':
command => "bash -c \"source /root/openrc; nova flavor-create --is-public true m1.micro auto 64 0 1\"",
path => '/sbin:/usr/sbin:/bin:/usr/bin',
unless => 'bash -c "source /root/openrc; nova flavor-list | grep -q m1.micro"',
require => [Class['nova'],Class['openstack::auth_file']],
}
Class['nova::api', 'openstack::ha::nova', 'nova::keystone::auth'] ->
Exec<| title=='create-m1.micro-flavor' |>
Class['keystone', 'openstack::ha::keystone']->
Exec<| title=='create-m1.micro-flavor' |>
Class['keystone', 'openstack::ha::keystone']->
Exec<| title=='create-m1.micro-flavor' |>
Openstack::Ha::Haproxy_service <| |> ->
Exec<| title=='create-m1.micro-flavor' |>
if ! $::use_neutron {
nova_floating_range { $floating_ips_range:
ensure => 'present',
pool => 'nova',

8
deployment/puppet/osnailyfacter/manifests/cluster_simple.pp
View File

@ -312,6 +312,14 @@ class osnailyfacter::cluster_simple {
nova_config { 'DEFAULT/use_cow_images': value => $::fuel_settings['use_cow_images'] }
nova_config { 'DEFAULT/compute_scheduler_driver': value => $::fuel_settings['compute_scheduler_driver'] }
exec {'create-m1.micro-flavor':
command => "bash -c \"source /root/openrc; nova flavor-create --is-public true m1.micro auto 64 0 1\"",
path => '/sbin:/usr/sbin:/bin:/usr/bin',
unless => 'bash -c "source /root/openrc; nova flavor-list | grep -q m1.micro"',
require => [Class['nova'],Class['openstack::auth_file']],
}
if !$::use_neutron {
$floating_ips_range = $::fuel_settings['floating_network_range']
if $floating_ips_range {