diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp index 4d5f5b010..ecc248fb0 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -198,10 +198,6 @@ # (optional) Enable or not Sahara API binding # defaults to hiera('sahara_api_enabled', false) # -# [*trove*] -# (optional) Enable or not Trove API binding -# defaults to hiera('trove_api_enabled', false) -# # [*glance_api*] # (optional) Enable or not Glance API binding # Defaults to hiera('glance_api_enabled', false) @@ -513,10 +509,6 @@ # (optional) Specify the network swift_proxy_server is running on. # Defaults to hiera('swift_proxy_network', undef) # -# [*trove_network*] -# (optional) Specify the network trove is running on. -# Defaults to hiera('trove_api_network', undef) -# # [*zaqar_api_network*] # (optional) Specify the network zaqar_api is running on. # Defaults to hiera('zaqar_api_network', undef) @@ -574,8 +566,6 @@ # 'sahara_api_ssl_port' (Defaults to 13386) # 'swift_proxy_port' (Defaults to 8080) # 'swift_proxy_ssl_port' (Defaults to 13808) -# 'trove_api_port' (Defaults to 8779) -# 'trove_api_ssl_port' (Defaults to 13779) # 'zaqar_api_port' (Defaults to 8888) # 'zaqar_api_ssl_port' (Defaults to 13888) # 'ceph_rgw_port' (Defaults to 8080) @@ -628,7 +618,6 @@ class tripleo::haproxy ( $cinder = hiera('cinder_api_enabled', false), $manila = hiera('manila_api_enabled', false), $sahara = hiera('sahara_api_enabled', false), - $trove = hiera('trove_api_enabled', false), $glance_api = hiera('glance_api_enabled', false), $nova_osapi = hiera('nova_api_enabled', false), $placement = hiera('placement_enabled', false), @@ -706,7 +695,6 @@ class tripleo::haproxy ( $etcd_network = hiera('etcd_network', undef), $sahara_network = hiera('sahara_api_network', undef), $swift_proxy_server_network = hiera('swift_proxy_network', undef), - $trove_network = hiera('trove_api_network', undef), $zaqar_api_network = hiera('zaqar_api_network', undef), $service_ports = {} ) { @@ -768,8 +756,6 @@ class tripleo::haproxy ( sahara_api_ssl_port => 13386, swift_proxy_port => 8080, swift_proxy_ssl_port => 13808, - trove_api_port => 8779, - trove_api_ssl_port => 13779, ui_port => 3000, ui_ssl_port => 443, zaqar_api_port => 8888, @@ -992,19 +978,6 @@ class tripleo::haproxy ( } } - if $trove { - ::tripleo::haproxy::endpoint { 'trove': - public_virtual_ip => $public_virtual_ip, - internal_ip => hiera('trove_api_vip', $controller_virtual_ip), - service_port => $ports[trove_api_port], - ip_addresses => hiera('trove_api_node_ips', $controller_hosts_real), - server_names => hiera('trove_api_node_names', $controller_hosts_names_real), - mode => 'http', - public_ssl_port => $ports[trove_api_ssl_port], - service_network => $trove_network, - } - } - if $glance_api { ::tripleo::haproxy::endpoint { 'glance_api': public_virtual_ip => $public_virtual_ip, diff --git a/manifests/profile/base/database/mysql.pp b/manifests/profile/base/database/mysql.pp index 86cd6f3a6..a505341e2 100644 --- a/manifests/profile/base/database/mysql.pp +++ b/manifests/profile/base/database/mysql.pp @@ -288,9 +288,6 @@ class tripleo::profile::base::database::mysql ( if hiera('sahara_api_enabled', false) { tripleo::profile::base::database::mysql::include_and_check_auth{'sahara::db::mysql':} } - if hiera('trove_api_enabled', false) { - tripleo::profile::base::database::mysql::include_and_check_auth{'trove::db::mysql':} - } if hiera('panko_api_enabled', false) { tripleo::profile::base::database::mysql::include_and_check_auth{'panko::db::mysql':} } diff --git a/manifests/profile/base/trove/api.pp b/manifests/profile/base/trove/api.pp deleted file mode 100644 index 71dfee409..000000000 --- a/manifests/profile/base/trove/api.pp +++ /dev/null @@ -1,46 +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::trove::api -# -# Trove API profile for tripleo -# -# === Parameters -# -# [*bootstrap_node*] -# (Optional) The hostname of the node responsible for bootstrapping tasks -# Defaults to hiera('trove_api_short_bootstrap_node_name') -# -# [*step*] -# (Optional) The current step in deployment. See tripleo-heat-templates -# for more details. -# Defaults to hiera('step') -# -class tripleo::profile::base::trove::api ( - $bootstrap_node = hiera('trove_api_short_bootstrap_node_name', undef), - $step = Integer(hiera('step')), -) { - if $bootstrap_node and $::hostname == downcase($bootstrap_node) { - $sync_db = true - } else { - $sync_db = false - } - - if $step >= 4 or ($step >= 3 and $sync_db) { - include trove - include trove::config - include trove::api - } - -} diff --git a/manifests/profile/base/trove/conductor.pp b/manifests/profile/base/trove/conductor.pp deleted file mode 100644 index cc4b410c8..000000000 --- a/manifests/profile/base/trove/conductor.pp +++ /dev/null @@ -1,36 +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::trove::conductor -# -# Trove Conductor profile for tripleo -# -# === Parameters -# -# [*step*] -# (Optional) The current step in deployment. See tripleo-heat-templates -# for more details. -# Defaults to hiera('step') -# -class tripleo::profile::base::trove::conductor ( - $step = Integer(hiera('step')), -) { - - if $step >= 4 { - include trove - include trove::config - include trove::conductor - } - -} diff --git a/manifests/profile/base/trove/taskmanager.pp b/manifests/profile/base/trove/taskmanager.pp deleted file mode 100644 index 72a8614d2..000000000 --- a/manifests/profile/base/trove/taskmanager.pp +++ /dev/null @@ -1,36 +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::trove::taskmanager -# -# Trove Taskmanager profile for tripleo -# -# === Parameters -# -# [*step*] -# (Optional) The current step in deployment. See tripleo-heat-templates -# for more details. -# Defaults to hiera('step') -# -class tripleo::profile::base::trove::taskmanager ( - $step = Integer(hiera('step')), -) { - - if $step >= 4 { - include trove - include trove::config - include trove::taskmanager - } - -}