diff options
Diffstat (limited to 'manifests/profile/base/neutron')
| -rw-r--r-- | manifests/profile/base/neutron/agents/midonet.pp | 56 | ||||
| -rw-r--r-- | manifests/profile/base/neutron/agents/nuage.pp | 62 | ||||
| -rw-r--r-- | manifests/profile/base/neutron/dhcp.pp | 13 | ||||
| -rw-r--r-- | manifests/profile/base/neutron/midonet.pp | 9 |
4 files changed, 119 insertions, 21 deletions
diff --git a/manifests/profile/base/neutron/agents/midonet.pp b/manifests/profile/base/neutron/agents/midonet.pp new file mode 100644 index 0000000..52cafa9 --- /dev/null +++ b/manifests/profile/base/neutron/agents/midonet.pp @@ -0,0 +1,56 @@ +# Copyright 2016 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# == Class: tripleo::profile::base::neutron::agents::midonet +# +# Midonet Neutron agent profile +# +# === Parameters +# +# [*neutron_api_node_ips*] +# (Optional) The IPs of the Neutron API hosts +# Defaults to hiera('neutron_api_node_ips') +# +# [*midonet_libvirt_qemu_data*] +# (Optional) qemu.conf data for midonet. +# Defaults to hiera('midonet_libvirt_qemu_data') +# +# [*step*] +# (Optional) The current step of the deployment +# Defaults to hiera('step') +# +class tripleo::profile::base::neutron::agents::midonet ( + $neutron_api_node_ips = hiera('neutron_api_node_ips', ''), + $midonet_libvirt_qemu_data = hiera('midonet_libvirt_qemu_data', ''), + $step = hiera('step'), +) { + + if $step >= 4 { + + # TODO(devvesa) provide non-controller ips for these services + class { '::tripleo::network::midonet::agent': + zookeeper_servers => $neutron_api_node_ips, + cassandra_seeds => $neutron_api_node_ips + } + + if defined(Service['libvirt']) { + file { '/etc/libvirt/qemu.conf': + ensure => present, + content => hiera('midonet_libvirt_qemu_data') + } + } + + } + +} diff --git a/manifests/profile/base/neutron/agents/nuage.pp b/manifests/profile/base/neutron/agents/nuage.pp new file mode 100644 index 0000000..c50feb2 --- /dev/null +++ b/manifests/profile/base/neutron/agents/nuage.pp @@ -0,0 +1,62 @@ +# Copyright 2016 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# == Class: tripleo::profile::base::neutron::agents::nuage +# +# Nuage Neutron agent profile +# +# === Parameters +# +# [*nova_os_tenant_name*] +# (Optional) Nova tenant name +# Defaults to hiera('nova_os_tenant_name') +# +# [*nova_os_password*] +# (Optional) Nova password +# Defaults to hiera('nova_password') +# +# [*nova_metadata_ip*] +# (Optional) Nova metadata node IPs +# Defaults to hiera('nova_metadata_node_ips') +# +# [*nova_auth_ip*] +# (Optional) Nova auth IP +# Defaults to hiera('keystone_public_api_virtual_ip') +# +# [*step*] +# (Optional) The current step of the deployment +# Defaults to hiera('step') +# +class tripleo::profile::base::neutron::agents::nuage ( + $nova_os_tenant_name = hiera('nova::api::admin_tenant_name', ''), + $nova_os_password = hiera('nova_password', ''), + $nova_metadata_ip = hiera('nova_metadata_node_ips', ''), + $nova_auth_ip = hiera('keystone_public_api_virtual_ip', ''), + $step = hiera('step'), +) { + + if $step >= 4 { + + include ::nuage::vrs + + class { '::nuage::metadataagent': + nova_os_tenant_name => $nova_os_tenant_name, + nova_os_password => $nova_os_password, + nova_metadata_ip => $nova_metadata_ip, + nova_auth_ip => $nova_auth_ip, + } + + } + +} diff --git a/manifests/profile/base/neutron/dhcp.pp b/manifests/profile/base/neutron/dhcp.pp index 180fd37..a313478 100644 --- a/manifests/profile/base/neutron/dhcp.pp +++ b/manifests/profile/base/neutron/dhcp.pp @@ -18,31 +18,18 @@ # # === Parameters # -# [*neutron_dnsmasq_options*] -# (Optional) -# Defaults to hiera('neutron_dnsmasq_options') -# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # class tripleo::profile::base::neutron::dhcp ( - $neutron_dnsmasq_options = hiera('neutron_dnsmasq_options', ''), $step = hiera('step'), ) { if $step >= 4 { include ::tripleo::profile::base::neutron include ::neutron::agents::dhcp - file { '/etc/neutron/dnsmasq-neutron.conf': - content => $neutron_dnsmasq_options, - owner => 'neutron', - group => 'neutron', - notify => Service['neutron-dhcp-service'], - require => Package['neutron'], - } - Service<| title == 'neutron-server' |> -> Service <| title == 'neutron-dhcp' |> } } diff --git a/manifests/profile/base/neutron/midonet.pp b/manifests/profile/base/neutron/midonet.pp index 972856f..3276b82 100644 --- a/manifests/profile/base/neutron/midonet.pp +++ b/manifests/profile/base/neutron/midonet.pp @@ -82,11 +82,9 @@ class tripleo::profile::base::neutron::midonet ( ) { include ::tripleo::profile::base::neutron + include ::tripleo::profile::base::neutron::agents::midonet if $step >= 4 { - class { '::neutron': - service_plugins => [] - } # Run zookeeper in the controller if configured if zk_on_controller { @@ -106,11 +104,6 @@ class tripleo::profile::base::neutron::midonet ( } } - class {'::tripleo::network::midonet::agent': - zookeeper_servers => $neutron_api_node_ips, - cassandra_seeds => $neutron_api_node_ips - } - class {'::tripleo::network::midonet::api': zookeeper_servers => $neutron_api_node_ips, vip => $vip, |