diff options
25 files changed, 1222 insertions, 221 deletions
diff --git a/manifests/profile/base/database/schemas.pp b/manifests/profile/base/database/schemas.pp deleted file mode 100644 index 472a0f4..0000000 --- a/manifests/profile/base/database/schemas.pp +++ /dev/null @@ -1,132 +0,0 @@ -# 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::database::schemas -# -# OpenStack Database Schema profile for tripleo -# -# === Parameters -# -# [*step*] -# (Optional) The current deployment step -# Defaults to hiera('step') -# -# [*ceilometer_backend*] -# (Optional) The backend used by ceilometer, usually either 'mysql' -# or 'mongodb' -# Defaults to hiera('ceilometer_backend') -# -# [*enable_aodh*] -# (Optional) Whether to create schemas for Aodh -# Defaults to true -# -# [*enable_ceilometer*] -# (Optional) Whether to create schemas for Ceilometer -# Defaults to true -# -# [*enable_cinder*] -# (Optional) Whether to create schemas for Cinder -# Defaults to true -# -# [*enable_heat*] -# (Optional) Whether to create schemas for Heat -# Defaults to true -# -# [*enable_keystone*] -# (Optional) Whether to create schemas for Keystone -# Defaults to true -# -# [*enable_glance*] -# (Optional) Whether to create schemas for Glance -# Defaults to true -# -# [*enable_gnocchi*] -# (Optional) Whether to create schemas for Gnocchi -# Defaults to true -# -# [*enable_nova*] -# (Optional) Whether to create schemas for Nova -# Defaults to true -# -# [*enable_neutron*] -# (Optional) Whether to create schemas for Neutron -# Defaults to true -# -# [*enable_sahara*] -# (Optional) Whether to create schemas for Sahara -# Defaults to true -# -# [*gnocchi_indexer_backend*] -# (Optional) Type of backend used as Gnocchi indexer -# Defaults to hiera('gnocchi_indexer_backend') -# -class tripleo::profile::base::database::schemas ( - $step = hiera('step'), - $ceilometer_backend = hiera('ceilometer_backend'), - $enable_aodh = true, - $enable_ceilometer = true, - $enable_cinder = true, - $enable_heat = true, - $enable_keystone = true, - $enable_glance = true, - $enable_gnocchi = true, - $enable_nova = true, - $enable_neutron = true, - $enable_sahara = true, - $gnocchi_indexer_backend = hiera('gnocchi_indexer_backend'), -) { - if $step >= 2 { - if downcase($ceilometer_backend) == 'mysql' { - if $enable_ceilometer { - include ::ceilometer::db::mysql - } - if $enable_aodh { - include ::aodh::db::mysql - } - } - - if $enable_gnocchi and downcase($gnocchi_indexer_backend) == 'mysql' { - include ::gnocchi::db::mysql - } - - if $enable_cinder { - include ::cinder::db::mysql - } - - if $enable_keystone { - include ::keystone::db::mysql - } - - if $enable_glance { - include ::glance::db::mysql - } - - if $enable_nova { - include ::nova::db::mysql - include ::nova::db::mysql_api - } - - if $enable_neutron { - include ::neutron::db::mysql - } - - if $enable_heat { - include ::heat::db::mysql - } - - if $enable_sahara { - include ::sahara::db::mysql - } - } -} diff --git a/manifests/profile/base/glance/registry.pp b/manifests/profile/base/glance/registry.pp index bed4a5e..b77b356 100644 --- a/manifests/profile/base/glance/registry.pp +++ b/manifests/profile/base/glance/registry.pp @@ -20,7 +20,7 @@ # # [*sync_db*] # (Optional) Whether to run db sync -# Defaults to undef +# Defaults to true # # [*manage_service*] # (Optional) Whether to manage the glance service @@ -40,14 +40,18 @@ # Defaults to downcase(hiera('glance_backend', 'swift')) # class tripleo::profile::base::glance::registry ( - $sync_db = undef, + $sync_db = true, $manage_service = undef, $enabled = undef, $step = hiera('step'), $glance_backend = downcase(hiera('glance_backend', 'swift')), ) { - if $step >= 4 { + if $step >= 3 and $sync_db { + include ::glance::db::mysql + } + + if $step >= 4 or ( $step >= 3 and $sync_db ) { # TODO: notifications, scrubber, etc. include ::glance include ::glance::config diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp index f17bf30..2f7a27a 100644 --- a/manifests/profile/base/keystone.pp +++ b/manifests/profile/base/keystone.pp @@ -20,7 +20,7 @@ # # [*sync_db*] # (Optional) Whether to run db sync -# Defaults to undef +# Defaults to true # # [*manage_service*] # (Optional) Whether to manage the keystone service @@ -52,7 +52,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::keystone ( - $sync_db = undef, + $sync_db = true, $manage_service = undef, $enabled = undef, $bootstrap_master = undef, @@ -62,7 +62,11 @@ class tripleo::profile::base::keystone ( $step = hiera('step'), ) { - if $step >= 4 { + if $step >= 3 and $sync_db { + include ::keystone::db::mysql + } + + if $step >= 4 or ( $step >= 3 and $sync_db ) { class { '::keystone': sync_db => $sync_db, manage_service => $manage_service, diff --git a/manifests/profile/base/neutron.pp b/manifests/profile/base/neutron.pp new file mode 100644 index 0000000..2958170 --- /dev/null +++ b/manifests/profile/base/neutron.pp @@ -0,0 +1,32 @@ +# 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 +# +# Neutron server profile for tripleo +# +# === Parameters +# +# [*step*] +# (Optional) The current step of the deployment +# Defaults to hiera('step') +# +class tripleo::profile::base::neutron ( + $step = hiera('step'), +) { + if $step >= 4 { + include ::neutron + include ::neutron::config + } +} diff --git a/manifests/profile/base/neutron/dhcp.pp b/manifests/profile/base/neutron/dhcp.pp new file mode 100644 index 0000000..1d7cc10 --- /dev/null +++ b/manifests/profile/base/neutron/dhcp.pp @@ -0,0 +1,53 @@ +# 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::dhcp +# +# Neutron DHCP Agent profile for tripleo +# +# === Parameters +# +# [*neutron_dnsmasq_options*] +# (Optional) +# Defaults to hiera('neutron_dnsmasq_options') +# +# [*enabled*] +# (Optional) Whether to enable the Neutron DHCP Agent service +# Defaults to undef +# +# [*manage_service*] +# (Optional) Whether to manage the Neutron DHCP Agent service +# Defaults to undef +# +# [*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', ''), + $enabled = undef, + $manage_service = undef, + $step = hiera('step'), +) { + if $step >= 4 { + include ::tripleo::profile::base::neutron + class { '::neutron::agents::dhcp': + manage_service => $manage_service, + enabled => $enabled + } + + Service<| title == 'neutron-server' |> -> Service <| title == 'neutron-dhcp' |> + } +} diff --git a/manifests/profile/base/neutron/l3.pp b/manifests/profile/base/neutron/l3.pp new file mode 100644 index 0000000..f96833a --- /dev/null +++ b/manifests/profile/base/neutron/l3.pp @@ -0,0 +1,52 @@ +# 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::l3 +# +# Neutron L3 Agent server profile for tripleo +# +# === Parameters +# +# [*neutron_ovs_use_veth*] +# (Optional) Whether to set ovs_use_veth (for older kernel support) +# Defaults to hiera('neutron_ovs_use_veth', false) +# +# [*enabled*] +# (Optional) Whether to enable the Neutron L3 Agent service +# Defaults to undef +# +# [*manage_service*] +# (Optional) Whether to manage the Neutron L3 Agent service +# Defaults to undef +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +class tripleo::profile::base::neutron::l3 ( + $enabled = undef, + $manage_service = undef, + $step = hiera('step'), +) { + if $step >= 4 { + include ::tripleo::profile::base::neutron + class { '::neutron::agents::l3': + manage_service => $manage_service, + enabled => $enabled + } + + Service<| title == 'neutron-server' |> -> Service <| title == 'neutron-l3' |> + } +} diff --git a/manifests/profile/base/neutron/metadata.pp b/manifests/profile/base/neutron/metadata.pp new file mode 100644 index 0000000..bdad751 --- /dev/null +++ b/manifests/profile/base/neutron/metadata.pp @@ -0,0 +1,48 @@ +# 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::metadata +# +# Neutron Metadata Agent profile for tripleo +# +# === Parameters +# +# [*enabled*] +# (Optional) Whether to enable the Neutron Metadata Agent service +# Defaults to undef +# +# [*manage_service*] +# (Optional) Whether to manage the Neutron Metadata Agent service +# Defaults to undef +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +class tripleo::profile::base::neutron::metadata ( + $enabled = undef, + $manage_service = undef, + $step = hiera('step'), +) { + if $step >= 4 { + include ::tripleo::profile::base::neutron + class { '::neutron::agents::metadata': + manage_service => $manage_service, + enabled => $enabled + } + + Service<| title == 'neutron-server' |> -> Service<| title == 'neutron-metadata' |> + } +} diff --git a/manifests/profile/base/neutron/midonet.pp b/manifests/profile/base/neutron/midonet.pp new file mode 100644 index 0000000..7374c57 --- /dev/null +++ b/manifests/profile/base/neutron/midonet.pp @@ -0,0 +1,129 @@ +# 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::midonet +# +# Midonet Neutron profile for tripleo +# +# === Parameters +# +# [*vip*] +# (Optional) Public Virtual IP Address for this cloud +# Defaults to hiera('tripleo::loadbalancer::public_virtual_ip') +# +# [*keystone_admin_token*] +# (Optional) The Keystone Admin Token +# Defaults to hiera('keystone::admin_token') +# +# [*zookeeper_client_ip*] +# (Optional) The IP of the Zookeeper Client +# Defaults to hiera('neutron::bind_host') +# +# [*zookeeper_hostnames*] +# (Optional) The IPs of the Zookeeper Servers +# Defaults to hiera('controller_node_names') +# +# [*neutron_api_node_ips*] +# (Optional) The IPs of the Neutron API hosts +# Defaults to hiera('neutron_api_node_ips') +# +# [*bind_address*] +# (Optional) The address to bind Cassandra and Midonet API to +# Defaults to hiera('neutron::bind_host') +# +# [*admin_password*] +# (Optional) Admin Password for Midonet API +# Defaults to hiera('admin_password') +# +# [*zk_on_controller*] +# (Optional) Whether to put zookeeper on the controllers +# Defaults to hiera('enable_zookeeper_on_controller') +# +# [*neutron_auth_tenant*] +# (Optional) Tenant to use for Neutron authentication +# Defaults to hiera('neutron::server::auth_tenant') +# +# [*neutron_auth_password*] +# (Optional) Password to use for Neutron authentication +# Defaults to hiera('neutron::server::auth_password') +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +# [*step*] +# (Optional) The current step of the deployment +# Defaults to hiera('step') +# +class tripleo::profile::base::neutron::midonet ( + $vip = hiera('tripleo::loadbalancer::public_virtual_ip', ''), + $keystone_admin_token = hiera('keystone::admin_token', ''), + $zookeeper_client_ip = hiera('neutron::bind_host', ''), + $zookeeper_hostnames = hiera('controller_node_names', ''), + $neutron_api_node_ips = hiera('neutron_api_node_ips', ''), + $bind_address = hiera('neutron::bind_host', ''), + $admin_password = hiera('admin_password', ''), + $zk_on_controller = hiera('enable_zookeeper_on_controller', ''), + $neutron_auth_tenant = hiera('neutron::server::auth_tenant', ''), + $neutron_auth_password = hiera('neutron::server::auth_password', ''), + $step = hiera('step'), +) { + + include ::tripleo::profile::base::neutron + + if $step >= 4 { + class { '::neutron': + service_plugins => [] + } + + # Run zookeeper in the controller if configured + if zk_on_controller { + class {'::tripleo::cluster::zookeeper': + zookeeper_server_ips => $neutron_api_node_ips, + # TODO: create a 'bind' hiera key for zookeeper + zookeeper_client_ip => $zookeeper_client_ip, + zookeeper_hostnames => split($zookeeper_hostnames, ',') + } + } + + # Run cassandra in the controller if configured + if hiera('enable_cassandra_on_controller') { + class {'::tripleo::cluster::cassandra': + cassandra_servers => $neutron_api_node_ips, + cassandra_ip => $bind_address, + } + } + + 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, + keystone_ip => $vip, + keystone_admin_token => $keystone_admin_token, + bind_address => $bind_address, + admin_password => $admin_password, + } + + class {'::neutron::plugins::midonet': + midonet_api_ip => $vip, + keystone_tenant => $neutron_auth_tenant, + keystone_password => $neutron_auth_password + } + } +} diff --git a/manifests/profile/base/neutron/ml2.pp b/manifests/profile/base/neutron/ml2.pp new file mode 100644 index 0000000..47b1b3c --- /dev/null +++ b/manifests/profile/base/neutron/ml2.pp @@ -0,0 +1,57 @@ +# 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::ml2 +# +# Neutron ML2 driver profile for tripleo +# +# === Parameters +# +# [*mechanism_drivers*] +# (Optional) The mechanism drivers to use with the Ml2 plugin +# Defaults to hiera('neutron::plugins::ml2::mechanism_drivers') +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +class tripleo::profile::base::neutron::ml2 ( + $mechanism_drivers = hiera('neutron::plugins::ml2::mechanism_drivers'), + $step = hiera('step'), +) { + + if $step >= 4 { + include ::neutron::plugins::ml2 + include ::tripleo::profile::base::neutron + + if 'cisco_n1kv' in $mechanism_drivers { + include ::tripleo::profile::base::neutron::n1k + } + + if 'cisco_ucsm' in $mechanism_drivers { + include ::neutron::plugins::ml2::cisco::ucsm + } + + if 'cisco_nexus' in $mechanism_drivers { + include ::neutron::plugins::ml2::cisco::nexus + include ::neutron::plugins::ml2::cisco::type_nexus_vxlan + } + + if 'bsn_ml2' in $mechanism_drivers { + include ::neutron::plugins::ml2::bigswitch::restproxy + include ::neutron::agents::bigswitch + } + } +} diff --git a/manifests/profile/base/neutron/n1k.pp b/manifests/profile/base/neutron/n1k.pp new file mode 100644 index 0000000..8c8cfbd --- /dev/null +++ b/manifests/profile/base/neutron/n1k.pp @@ -0,0 +1,54 @@ +# 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::n1k +# +# Neutron N1k Mechanism Driver profile for tripleo +# +# === Parameters +# +# [*n1kv_source*] +# (Optional) The source location for the N1Kv +# Defaults to hiera('n1kv_vem_source', undef) +# +# [*n1kv_version*] +# (Optional) The version of N1Kv to use +# Defaults to hiera('n1kv_vem_version', undef) +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +class tripleo::profile::base::neutron::n1k ( + $n1kv_source = hiera('n1kv_vem_source', undef), + $n1kv_version = hiera('n1kv_vem_version', undef), + $step = hiera('step'), +) { + include ::neutron::plugins::ml2::cisco::nexus1000v + include ::tripleo::profile::base::neutron + + if $step >= 4 { + class { '::neutron::agents::n1kv_vem': + n1kv_source => $n1kv_source, + n1kv_version => $n1kv_version, + } + + class { '::n1k_vsm': + n1kv_source => $n1kv_source, + n1kv_version => $n1kv_version, + pacemaker_control => false, + } + } +} diff --git a/manifests/profile/base/neutron/nuage.pp b/manifests/profile/base/neutron/nuage.pp new file mode 100644 index 0000000..62e6c4f --- /dev/null +++ b/manifests/profile/base/neutron/nuage.pp @@ -0,0 +1,31 @@ +# Copyright 2014 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:nuage: +# +# Nuage Neutron profile for tripleo +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +class tripleo::profile::base::neutron::nuage ( + $step = hiera('step'), +) { + include ::tripleo::profile::base::neutron::server + if $step >= 4 { + include ::neutron::plugins::nuage + } +} diff --git a/manifests/profile/base/neutron/ovs.pp b/manifests/profile/base/neutron/ovs.pp new file mode 100644 index 0000000..783952b --- /dev/null +++ b/manifests/profile/base/neutron/ovs.pp @@ -0,0 +1,52 @@ +# 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::ovs +# +# Neutron OVS Agent profile for tripleo +# +# === Parameters +# +# [*manage_service*] +# (Optional) Whether to manage the Neutron OVS Agent service +# Defaults to undef +# +# [*enabled*] +# (Optional) Whether to enable the Neutron OVS Agent service +# Defaults to undef +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +class tripleo::profile::base::neutron::ovs( + $manage_service = undef, + $enabled = undef, + $step = hiera('step'), +) { + + include ::tripleo::profile::base::neutron + + if $step >= 4 { + class { '::neutron::agents::ml2::ovs': + manage_service => $manage_service, + enabled => $enabled + } + + # Optional since manage_service may be false and neutron server may not be colocated. + Service<| title == 'neutron-server' |> -> Service<| title == 'neutron-ovs-agent-service' |> + } + +} diff --git a/manifests/profile/base/neutron/server.pp b/manifests/profile/base/neutron/server.pp new file mode 100644 index 0000000..20127ed --- /dev/null +++ b/manifests/profile/base/neutron/server.pp @@ -0,0 +1,60 @@ +# Copyright 2014 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::server +# +# Neutron server profile for tripleo +# +# === Parameters +# +# [*sync_db*] +# (Optional) Whether to run Neutron DB sync operations +# Defaults to undef +# +# [*manage_service*] +# (Optional) Whether to manage the Neutron Server service +# Defaults to undef +# +# [*enabled*] +# (Optional) Whether to enable the Neutron Server service +# Defaults to undef +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +class tripleo::profile::base::neutron::server ( + $sync_db = true, + $manage_service = undef, + $enabled = undef, + $step = hiera('step'), +) { + + include ::tripleo::profile::base::neutron + + if $step >= 3 and $sync_db { + include ::neutron::db::mysql + } + + if $step >= 4 or ($step >=3 and $sync_db) { + include ::neutron::server::notifications + + class { '::neutron::server': + sync_db => $sync_db, + manage_service => $manage_service, + enabled => $enabled + } + } +} diff --git a/manifests/profile/pacemaker/database/schemas.pp b/manifests/profile/pacemaker/database/schemas.pp deleted file mode 100644 index 489e75b..0000000 --- a/manifests/profile/pacemaker/database/schemas.pp +++ /dev/null @@ -1,65 +0,0 @@ -# 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::pacemaker::schemas -# -# OpenStack Database Schema Pacemaker HA profile for tripleo -# -# === Parameters -# -# [*step*] -# (Optional) The current deployment step -# Defaults to hiera('step') -# -# [*ceilometer_backend*] -# (Optional) The backend used by ceilometer, usually either 'mysql' -# or 'mongodb' -# Defaults to hiera('ceilometer_backend') -# -# [*gnocchi_indexer_backend*] -# (Optional) Type of backend used as Gnocchi indexer -# Defaults to hiera('gnocchi_indexer_backend') -# -# [*pacemaker_master*] -# (Optional) The hostname of the pacemaker master in this cluster -# Defaults to hiera('bootstrap_nodeid') -# -class tripleo::profile::pacemaker::database::schemas ( - $step = hiera('step'), - $ceilometer_backend = hiera('ceilometer_backend'), - $gnocchi_indexer_backend = hiera('gnocchi_indexer_backend'), - $pacemaker_master = hiera('bootstrap_nodeid') -) { - if downcase($pacemaker_master) == $::hostname and $step >= 2 { - include ::tripleo::profile::base::database::schemas - - if downcase($ceilometer_backend) == 'mysql' { - Exec['galera-ready'] -> Class['::ceilometer::db::mysql'] - Exec['galera-ready'] -> Class['::aodh::db::mysql'] - } - - if downcase($gnocchi_indexer_backend) == 'mysql' { - Exec['galera-ready'] -> Class['::gnocchi::db::mysql'] - } - - Exec['galera-ready'] -> Class['::cinder::db::mysql'] - Exec['galera-ready'] -> Class['::glance::db::mysql'] - Exec['galera-ready'] -> Class['::keystone::db::mysql'] - Exec['galera-ready'] -> Class['::nova::db::mysql'] - Exec['galera-ready'] -> Class['::nova::db::mysql_api'] - Exec['galera-ready'] -> Class['::neutron::db::mysql'] - Exec['galera-ready'] -> Class['::heat::db::mysql'] - Exec['galera-ready'] -> Class['::sahara::db::mysql'] - } -} diff --git a/manifests/profile/pacemaker/glance.pp b/manifests/profile/pacemaker/glance.pp index 5727622..4dca67e 100644 --- a/manifests/profile/pacemaker/glance.pp +++ b/manifests/profile/pacemaker/glance.pp @@ -62,22 +62,30 @@ class tripleo::profile::pacemaker::glance ( $glance_file_pcmk_options = hiera('glance_file_pcmk_options', ''), ) { + Service <| tag == 'glance-service' |> { + hasrestart => true, + restart => '/bin/true', + start => '/bin/true', + stop => '/bin/true', + } + if $::hostname == downcase($bootstrap_node) { $pacemaker_master = true } else { $pacemaker_master = false } + class { '::tripleo::profile::base::glance::api': + manage_service => false, + enabled => false, + } + class { '::tripleo::profile::base::glance::registry': + sync_db => $pacemaker_master, + manage_service => false, + enabled => false, + } + if $step >= 4 { - class { '::tripleo::profile::base::glance::api': - manage_service => false, - enabled => false, - } - class { '::tripleo::profile::base::glance::registry': - sync_db => $pacemaker_master, - manage_service => false, - enabled => false, - } if $glance_backend == 'file' and $glance_file_pcmk_manage { $secontext = 'context="system_u:object_r:glance_var_lib_t:s0"' pacemaker::resource::filesystem { 'glance-fs': diff --git a/manifests/profile/pacemaker/keystone.pp b/manifests/profile/pacemaker/keystone.pp index 0f007a5..fb625e5 100644 --- a/manifests/profile/pacemaker/keystone.pp +++ b/manifests/profile/pacemaker/keystone.pp @@ -37,6 +37,13 @@ class tripleo::profile::pacemaker::keystone ( $enable_load_balancer = hiera('enable_load_balancer', true) ) { + Service <| tag == 'keystone-service' |> { + hasrestart => true, + restart => '/bin/true', + start => '/bin/true', + stop => '/bin/true', + } + if $::hostname == downcase($bootstrap_node) { $pacemaker_master = true } else { @@ -51,15 +58,13 @@ class tripleo::profile::pacemaker::keystone ( $manage_roles = false } - if $step >= 4 { - class { '::tripleo::profile::base::keystone': - sync_db => $pacemaker_master, - manage_service => false, - enabled => false, - bootstrap_master => $pacemaker_master, - manage_roles => $manage_roles, - manage_endpoint => $manage_roles - } + class { '::tripleo::profile::base::keystone': + sync_db => $pacemaker_master, + manage_service => false, + enabled => false, + bootstrap_master => $pacemaker_master, + manage_roles => $manage_roles, + manage_endpoint => $manage_roles } if $step >= 5 and $pacemaker_master and $enable_load_balancer { @@ -85,4 +90,5 @@ class tripleo::profile::pacemaker::keystone ( Pacemaker::Resource::Ocf['openstack-core']], } } + } diff --git a/manifests/profile/pacemaker/neutron.pp b/manifests/profile/pacemaker/neutron.pp new file mode 100644 index 0000000..03ccbc3 --- /dev/null +++ b/manifests/profile/pacemaker/neutron.pp @@ -0,0 +1,184 @@ +# 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::pacemaker::neutron +# +# Neutron server profile for tripleo +# +# === Parameters +# +# [*step*] +# (Optional) The step in the deployment +# Defaults to hiera('step') +# +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid') +# +# [*enable_l3*] +# (Optional) Whether to include the Neutron L3 agent pacemaker profile +# Defaults to hiera('neutron::enable_l3_agent', false) +# +# [*enable_dhcp*] +# (Optional) Whether to include the Neutron DHCP agent pacemaker profile +# Defaults to hiera('neutron::enable_dhcp_agent', false) +# +# [*enable_metadata*] +# (Optional) Whether to include the Neutron Metadata agent pacemaker profile +# Defaults to hiera('neutron::enable_metadata_agent', false) +# +# [*enable_ovs*] +# (Optional) Whether to include the Neutron OVS agent pacemaker profile +# Defaults to hiera('neutron::enable_ovs_agent', false) +# +class tripleo::profile::pacemaker::neutron ( + $step = hiera('step'), + $pacemaker_master = hiera('bootstrap_nodeid'), + # We can drop the hiera defaults once the neutron roles are decomposed + $enable_l3 = hiera('neutron::enable_l3_agent', false), + $enable_dhcp = hiera('neutron::enable_dhcp_agent', false), + $enable_metadata = hiera('neutron::enable_metadata_agent', false), + $enable_ovs = hiera('neutron::enable_ovs_agent', false), +) { + + Service <| + tag == 'neutron-service' + |> { + hasrestart => true, + restart => '/bin/true', + start => '/bin/true', + stop => '/bin/true', + } + + if $step >= 4 { + include ::neutron::params + include ::tripleo::profile::base::neutron + + # To be removed when puppet-oslo comes into service + neutron_config { + 'DEFAULT/notification_driver': value => 'messaging'; + } + } + + if $step >= 5 and $pacemaker_master == downcase($::hostname) { + if $step == 5 { + # Neutron + # NOTE(gfidente): Neutron will try to populate the database with some data + # as soon as neutron-server is started; to avoid races we want to make this + # happen only on one node, before normal Pacemaker initialization + # https://bugzilla.redhat.com/show_bug.cgi?id=1233061 + # NOTE(emilien): we need to run this Exec only at Step 4 otherwise this exec + # will try to start the service while it's already started by Pacemaker + # It would result to a deployment failure since systemd would return 1 to Puppet + # and the overcloud would fail to deploy (6 would be returned). + # This conditional prevents from a race condition during the deployment. + # https://bugzilla.redhat.com/show_bug.cgi?id=1290582 + exec { 'neutron-server-systemd-start-sleep' : + command => 'systemctl start neutron-server && /usr/bin/sleep 5', + path => '/usr/bin', + unless => '/sbin/pcs resource show neutron-server', + } -> + pacemaker::resource::service { $::neutron::params::server_service: + clone_params => 'interleave=true', + require => Pacemaker::Resource::Ocf['openstack-core'] + } + } else { + pacemaker::resource::service { $::neutron::params::server_service: + clone_params => 'interleave=true', + require => Pacemaker::Resource::Ocf['openstack-core'] + } + } + + pacemaker::constraint::base { 'keystone-to-neutron-server-constraint': + constraint_type => 'order', + first_resource => 'openstack-core-clone', + second_resource => "${::neutron::params::server_service}-clone", + first_action => 'start', + second_action => 'start', + require => [Pacemaker::Resource::Ocf['openstack-core'], + Pacemaker::Resource::Service[$::neutron::params::server_service]], + } + + if $enable_ovs { + pacemaker::constraint::base { 'neutron-openvswitch-agent-to-dhcp-agent-constraint': + constraint_type => 'order', + first_resource => "${::neutron::params::ovs_agent_service}-clone", + second_resource => "${::neutron::params::dhcp_agent_service}-clone", + first_action => 'start', + second_action => 'start', + require => [Pacemaker::Resource::Service[$::neutron::params::ovs_agent_service], + Pacemaker::Resource::Service[$::neutron::params::dhcp_agent_service]], + } + } + + if $enable_dhcp and $enable_ovs { + pacemaker::constraint::base { 'neutron-server-to-openvswitch-agent-constraint': + constraint_type => 'order', + first_resource => "${::neutron::params::server_service}-clone", + second_resource => "${::neutron::params::ovs_agent_service}-clone", + first_action => 'start', + second_action => 'start', + require => [Pacemaker::Resource::Service[$::neutron::params::server_service], + Pacemaker::Resource::Service[$::neutron::params::ovs_agent_service]], + } + + pacemaker::constraint::colocation { 'neutron-openvswitch-agent-to-dhcp-agent-colocation': + source => "${::neutron::params::dhcp_agent_service}-clone", + target => "${::neutron::params::ovs_agent_service}-clone", + score => 'INFINITY', + require => [Pacemaker::Resource::Service[$::neutron::params::ovs_agent_service], + Pacemaker::Resource::Service[$::neutron::params::dhcp_agent_service]], + } + } + + if $enable_dhcp and $enable_l3 { + pacemaker::constraint::base { 'neutron-dhcp-agent-to-l3-agent-constraint': + constraint_type => 'order', + first_resource => "${::neutron::params::dhcp_agent_service}-clone", + second_resource => "${::neutron::params::l3_agent_service}-clone", + first_action => 'start', + second_action => 'start', + require => [Pacemaker::Resource::Service[$::neutron::params::dhcp_agent_service], + Pacemaker::Resource::Service[$::neutron::params::l3_agent_service]] + } + + pacemaker::constraint::colocation { 'neutron-dhcp-agent-to-l3-agent-colocation': + source => "${::neutron::params::l3_agent_service}-clone", + target => "${::neutron::params::dhcp_agent_service}-clone", + score => 'INFINITY', + require => [Pacemaker::Resource::Service[$::neutron::params::dhcp_agent_service], + Pacemaker::Resource::Service[$::neutron::params::l3_agent_service]] + } + } + + if $enable_l3 and $enable_metadata { + pacemaker::constraint::base { 'neutron-l3-agent-to-metadata-agent-constraint': + constraint_type => 'order', + first_resource => "${::neutron::params::l3_agent_service}-clone", + second_resource => "${::neutron::params::metadata_agent_service}-clone", + first_action => 'start', + second_action => 'start', + require => [Pacemaker::Resource::Service[$::neutron::params::l3_agent_service], + Pacemaker::Resource::Service[$::neutron::params::metadata_agent_service]] + } + pacemaker::constraint::colocation { 'neutron-l3-agent-to-metadata-agent-colocation': + source => "${::neutron::params::metadata_agent_service}-clone", + target => "${::neutron::params::l3_agent_service}-clone", + score => 'INFINITY', + require => [Pacemaker::Resource::Service[$::neutron::params::l3_agent_service], + Pacemaker::Resource::Service[$::neutron::params::metadata_agent_service]] + } + } + } +} diff --git a/manifests/profile/pacemaker/neutron/dhcp.pp b/manifests/profile/pacemaker/neutron/dhcp.pp new file mode 100644 index 0000000..841d225 --- /dev/null +++ b/manifests/profile/pacemaker/neutron/dhcp.pp @@ -0,0 +1,47 @@ +# 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::pacemaker::neutron::dhcp +# +# Neutron DHCP Agent server profile for tripleo +# +# === Parameters +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid') +# +class tripleo::profile::pacemaker::neutron::dhcp ( + $step = hiera('step'), + $pacemaker_master = hiera('bootstrap_nodeid'), +) { + + include ::neutron::params + include ::tripleo::profile::pacemaker::neutron + + class { '::tripleo::profile::base::neutron::dhcp': + manage_service => false, + enabled => false, + } + if $step >= 5 and downcase($::hostname) == $pacemaker_master { + pacemaker::resource::service { $::neutron::params::dhcp_agent_service: + clone_params => 'interleave=true', + } + } +} diff --git a/manifests/profile/pacemaker/neutron/l3.pp b/manifests/profile/pacemaker/neutron/l3.pp new file mode 100644 index 0000000..a900016 --- /dev/null +++ b/manifests/profile/pacemaker/neutron/l3.pp @@ -0,0 +1,47 @@ +# 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::pacemaker::neutron::l3 +# +# Neutron L3 Agent server profile for tripleo +# +# === Parameters +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid') +# +class tripleo::profile::pacemaker::neutron::l3 ( + $step = hiera('step'), + $pacemaker_master = hiera('bootstrap_nodeid'), +) { + + include ::neutron::params + include ::tripleo::profile::pacemaker::neutron + + class { '::tripleo::profile::base::neutron::l3': + manage_service => false, + enabled => false, + } + if $step >= 5 and downcase($::hostname) == $pacemaker_master { + pacemaker::resource::service { $::neutron::params::l3_agent_service: + clone_params => 'interleave=true', + } + } +} diff --git a/manifests/profile/pacemaker/neutron/metadata.pp b/manifests/profile/pacemaker/neutron/metadata.pp new file mode 100644 index 0000000..4030bb2 --- /dev/null +++ b/manifests/profile/pacemaker/neutron/metadata.pp @@ -0,0 +1,47 @@ +# 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::pacemaker::neutron::metadata +# +# Neutron Metadata Agent server profile for tripleo +# +# === Parameters +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid') +# +class tripleo::profile::pacemaker::neutron::metadata ( + $step = hiera('step'), + $pacemaker_master = hiera('bootstrap_nodeid'), +) { + + include ::neutron::params + include ::tripleo::profile::pacemaker::neutron + + class { '::tripleo::profile::base::neutron::metadata': + manage_service => false, + enabled => false, + } + if $step >= 5 and downcase($::hostname) == $pacemaker_master { + pacemaker::resource::service { $::neutron::params::metadata_agent_service: + clone_params => 'interleave=true', + } + } +} diff --git a/manifests/profile/pacemaker/neutron/midonet.pp b/manifests/profile/pacemaker/neutron/midonet.pp new file mode 100644 index 0000000..a4ec831 --- /dev/null +++ b/manifests/profile/pacemaker/neutron/midonet.pp @@ -0,0 +1,80 @@ +# 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::pacemaker::neutron::midonet +# +# Neutron Midonet driver Pacemaker HA profile for tripleo +# +# === Parameters +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid') +# +class tripleo::profile::pacemaker::neutron::midonet ( + $step = hiera('step'), + $pacemaker_master = hiera('bootstrap_nodeid'), +) { + include ::neutron::params + include ::tripleo::profile::pacemaker::neutron + include ::tripleo::profile::base::neutron::midonet + + if $step >= 5 and downcase($::hostname) == $pacemaker_master { + + pacemaker::resource::service {'tomcat': + clone_params => 'interleave=true', + } + + #midonet-chain chain keystone-->neutron-server-->dhcp-->metadata->tomcat + pacemaker::constraint::base { 'neutron-server-to-dhcp-agent-constraint': + constraint_type => 'order', + first_resource => "${::neutron::params::server_service}-clone", + second_resource => "${::neutron::params::dhcp_agent_service}-clone", + first_action => 'start', + second_action => 'start', + require => [Pacemaker::Resource::Service[$::neutron::params::server_service], + Pacemaker::Resource::Service[$::neutron::params::dhcp_agent_service]], + } + pacemaker::constraint::base { 'neutron-dhcp-agent-to-metadata-agent-constraint': + constraint_type => 'order', + first_resource => "${::neutron::params::dhcp_agent_service}-clone", + second_resource => "${::neutron::params::metadata_agent_service}-clone", + first_action => 'start', + second_action => 'start', + require => [Pacemaker::Resource::Service[$::neutron::params::dhcp_agent_service], + Pacemaker::Resource::Service[$::neutron::params::metadata_agent_service]], + } + pacemaker::constraint::base { 'neutron-metadata-agent-to-tomcat-constraint': + constraint_type => 'order', + first_resource => "${::neutron::params::metadata_agent_service}-clone", + second_resource => 'tomcat-clone', + first_action => 'start', + second_action => 'start', + require => [Pacemaker::Resource::Service[$::neutron::params::metadata_agent_service], + Pacemaker::Resource::Service['tomcat']], + } + pacemaker::constraint::colocation { 'neutron-dhcp-agent-to-metadata-agent-colocation': + source => "${::neutron::params::metadata_agent_service}-clone", + target => "${::neutron::params::dhcp_agent_service}-clone", + score => 'INFINITY', + require => [Pacemaker::Resource::Service[$::neutron::params::dhcp_agent_service], + Pacemaker::Resource::Service[$::neutron::params::metadata_agent_service]], + } + } +} diff --git a/manifests/profile/pacemaker/neutron/ml2.pp b/manifests/profile/pacemaker/neutron/ml2.pp new file mode 100644 index 0000000..6c6e580 --- /dev/null +++ b/manifests/profile/pacemaker/neutron/ml2.pp @@ -0,0 +1,25 @@ +# 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::pacemaker::neutron::ml2 +# +# Neutron ML2 driver Pacemaker HA profile for tripleo +# +# === Parameters +# +class tripleo::profile::pacemaker::neutron::ml2 { + include ::neutron::params + include ::tripleo::profile::pacemaker::neutron + include ::tripleo::profile::base::neutron::ml2 +} diff --git a/manifests/profile/pacemaker/neutron/ovs.pp b/manifests/profile/pacemaker/neutron/ovs.pp new file mode 100644 index 0000000..c3ce36e --- /dev/null +++ b/manifests/profile/pacemaker/neutron/ovs.pp @@ -0,0 +1,92 @@ +# 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::pacemaker::neutron::ovs +# +# Neutron OVS Agent Pacemaker HA profile for tripleo +# +# === Parameters +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid') +# +class tripleo::profile::pacemaker::neutron::ovs ( + $step = hiera('step'), + $pacemaker_master = hiera('bootstrap_nodeid'), +) { + + include ::neutron::params + include ::tripleo::profile::pacemaker::neutron + + class { '::tripleo::profile::base::neutron::ovs': + manage_service => false, + enabled => false, + } + + if $step >= 5 and downcase($::hostname) == $pacemaker_master { + + pacemaker::resource::service { $::neutron::params::ovs_agent_service: + clone_params => 'interleave=true', + } + + pacemaker::resource::ocf { $::neutron::params::ovs_cleanup_service: + ocf_agent_name => 'neutron:OVSCleanup', + clone_params => 'interleave=true', + } + pacemaker::resource::ocf { 'neutron-netns-cleanup': + ocf_agent_name => 'neutron:NetnsCleanup', + clone_params => 'interleave=true', + } + + # neutron - one chain ovs-cleanup-->netns-cleanup-->ovs-agent + pacemaker::constraint::base { 'neutron-ovs-cleanup-to-netns-cleanup-constraint': + constraint_type => 'order', + first_resource => "${::neutron::params::ovs_cleanup_service}-clone", + second_resource => 'neutron-netns-cleanup-clone', + first_action => 'start', + second_action => 'start', + require => [Pacemaker::Resource::Ocf[$::neutron::params::ovs_cleanup_service], + Pacemaker::Resource::Ocf['neutron-netns-cleanup']], + } + pacemaker::constraint::colocation { 'neutron-ovs-cleanup-to-netns-cleanup-colocation': + source => 'neutron-netns-cleanup-clone', + target => "${::neutron::params::ovs_cleanup_service}-clone", + score => 'INFINITY', + require => [Pacemaker::Resource::Ocf[$::neutron::params::ovs_cleanup_service], + Pacemaker::Resource::Ocf['neutron-netns-cleanup']], + } + pacemaker::constraint::base { 'neutron-netns-cleanup-to-openvswitch-agent-constraint': + constraint_type => 'order', + first_resource => 'neutron-netns-cleanup-clone', + second_resource => "${::neutron::params::ovs_agent_service}-clone", + first_action => 'start', + second_action => 'start', + require => [Pacemaker::Resource::Ocf['neutron-netns-cleanup'], + Pacemaker::Resource::Service[$::neutron::params::ovs_agent_service]], + } + pacemaker::constraint::colocation { 'neutron-netns-cleanup-to-openvswitch-agent-colocation': + source => "${::neutron::params::ovs_agent_service}-clone", + target => 'neutron-netns-cleanup-clone', + score => 'INFINITY', + require => [Pacemaker::Resource::Ocf['neutron-netns-cleanup'], + Pacemaker::Resource::Service[$::neutron::params::ovs_agent_service]], + } + } +} diff --git a/manifests/profile/pacemaker/neutron/server.pp b/manifests/profile/pacemaker/neutron/server.pp new file mode 100644 index 0000000..4ff2e88 --- /dev/null +++ b/manifests/profile/pacemaker/neutron/server.pp @@ -0,0 +1,58 @@ +# 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::pacemaker::neutron::server +# +# Neutron Server Pacemaker profile for tripleo +# +# === Parameters +# +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid') +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +class tripleo::profile::pacemaker::neutron::server ( + $pacemaker_master = hiera('bootstrap_nodeid'), + $step = hiera('step'), +) { + include ::neutron::params + include ::tripleo::profile::pacemaker::neutron + + if $step >= 5 { + + class { '::tripleo::profile::base::neutron::server': + sync_db => ($::hostname == downcase($pacemaker_master)), + manage_service => false, + enabled => false, + } + + if ($::hostname == downcase($pacemaker_master)) { + pacemaker::constraint::base { 'keystone-to-neutron-server-constraint': + constraint_type => 'order', + first_resource => 'openstack-core-clone', + second_resource => "${::neutron::params::server_service}-clone", + first_action => 'start', + second_action => 'start', + require => [Pacemaker::Resource::Ocf['openstack-core'], + Pacemaker::Resource::Service[$::neutron::params::server_service]], + } + } + + } +} diff --git a/metadata.json b/metadata.json new file mode 100644 index 0000000..457f86e --- /dev/null +++ b/metadata.json @@ -0,0 +1,28 @@ +{ + "name": "openstack-tripleo", + "version": "1.0.0", + "author": "OpenStack Contributors", + "summary": "Puppet module for TripleO", + "license": "Apache-2.0", + "source": "git://github.com/openstack/puppet-tripleo.git", + "project_page": "https://launchpad.net/puppet-tripleo", + "issues_url": "https://bugs.launchpad.net/puppet-tripleo", + "description": "Installs and configures Tripleo.", + "requirements": [ + { "name": "pe","version_requirement": "3.x" }, + { "name": "puppet","version_requirement": "3.x" } + ], + "operatingsystem_support": [ + { + "operatingsystem": "Fedora", + "operatingsystemrelease": ["20"] + }, + { + "operatingsystem": "RedHat", + "operatingsystemrelease": ["7"] + } + ], + "dependencies": [ + { "name": "puppetlabs/stdlib", "version_requirement": ">= 3.2.0 < 5.0.0" } + ] +} |