Add task to the deployment graph for the compute-vmware role.

Add manifest which will configure nova on compute-vmware nodes.

Change-Id: Ia28c3cb58db0dbc5e1c7d078c7a01240afb32e81
This commit is contained in:
Igor Gajsin 2015-12-01 13:29:03 +03:00
parent d6312efca9
commit 025d9975cc
2 changed files with 63 additions and 0 deletions

View File

@ -0,0 +1,54 @@
notice('MODULAR: fuel-plugin-vmware-dvs/compute-vmware')
include nova::params
$neutron_config = hiera_hash('neutron_config')
$nova_hash = hiera_hash('nova')
$management_vip = hiera('management_vip')
$service_endpoint = hiera('service_endpoint', $management_vip)
$neutron_endpoint = hiera('neutron_endpoint', $management_vip)
$admin_password = try_get_value($neutron_config, 'keystone/admin_password')
$admin_tenant_name = try_get_value($neutron_config,
'keystone/admin_tenant', 'services')
$admin_username = try_get_value($neutron_config,
'keystone/admin_user', 'neutron')
$region_name = hiera('region', 'RegionOne')
$auth_api_version = 'v2.0'
$admin_identity_uri = "http://${service_endpoint}:35357"
$admin_auth_url = "${admin_identity_uri}/${auth_api_version}"
$neutron_url = "http://${neutron_endpoint}:9696"
class {'nova::network::neutron':
neutron_admin_password => $admin_password,
neutron_admin_tenant_name => $admin_tenant_name,
neutron_region_name => $region_name,
neutron_admin_username => $admin_username,
neutron_admin_auth_url => $admin_auth_url,
neutron_url => $neutron_url,
}
augeas { 'sysctl-net.bridge.bridge-nf-call-arptables':
context => '/files/etc/sysctl.conf',
changes => "set net.bridge.bridge-nf-call-arptables '1'",
}
augeas { 'sysctl-net.bridge.bridge-nf-call-iptables':
context => '/files/etc/sysctl.conf',
changes => "set net.bridge.bridge-nf-call-iptables '1'",
}
augeas { 'sysctl-net.bridge.bridge-nf-call-ip6tables':
context => '/files/etc/sysctl.conf',
changes => "set net.bridge.bridge-nf-call-ip6tables '1'",
}
service { 'nova-compute':
ensure => 'running',
name => $::nova::params::compute_service_name,
}
Nova_config<| |> ~> Service['nova-compute']
if($::operatingsystem == 'Ubuntu') {
tweaks::ubuntu_service_override { 'nova-network':
package_name => 'nova-network',
}
}

View File

@ -26,3 +26,12 @@
puppet_manifest: puppet/manifests/site.pp
puppet_modules: puppet/modules:/etc/puppet/modules
timeout: 720
- id: vmware-dvs-compute-vmware
groups: ['compute-vmware']
requires: [top-role-compute-vmware]
type: puppet
parameters:
puppet_manifest: puppet/manifests/compute-vmware.pp
puppet_modules: puppet/modules:/etc/puppet/modules
timeout: 720