Remove Tacker service
Cleaning up the puppet tacker code since we're removing the service definitions. Change-Id: Iee2e75c1afd836b08132823ffe26cccdd6ef0002 Depends-On: https://review.opendev.org/#/c/682463/ Related-Bug: #1714270
This commit is contained in:
parent
cff98c4f60
commit
4fa490f03f
|
@ -198,10 +198,6 @@
|
|||
# (optional) Enable or not Sahara API binding
|
||||
# defaults to hiera('sahara_api_enabled', false)
|
||||
#
|
||||
# [*tacker*]
|
||||
# (optional) Enable or not Tacker API binding
|
||||
# Defaults to hiera('tacker_enabled', false)
|
||||
#
|
||||
# [*trove*]
|
||||
# (optional) Enable or not Trove API binding
|
||||
# defaults to hiera('trove_api_enabled', false)
|
||||
|
@ -513,10 +509,6 @@
|
|||
# (optional) Specify the network swift_proxy_server is running on.
|
||||
# Defaults to hiera('swift_proxy_network', undef)
|
||||
#
|
||||
# [*tacker_network*]
|
||||
# (optional) Specify the network tacker is running on.
|
||||
# Defaults to hiera('tacker_api_network', undef)
|
||||
#
|
||||
# [*trove_network*]
|
||||
# (optional) Specify the network trove is running on.
|
||||
# Defaults to hiera('trove_api_network', undef)
|
||||
|
@ -633,7 +625,6 @@ class tripleo::haproxy (
|
|||
$cinder = hiera('cinder_api_enabled', false),
|
||||
$manila = hiera('manila_api_enabled', false),
|
||||
$sahara = hiera('sahara_api_enabled', false),
|
||||
$tacker = hiera('tacker_enabled', false),
|
||||
$trove = hiera('trove_api_enabled', false),
|
||||
$glance_api = hiera('glance_api_enabled', false),
|
||||
$nova_osapi = hiera('nova_api_enabled', false),
|
||||
|
@ -711,7 +702,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),
|
||||
$tacker_network = hiera('tacker_api_network', undef),
|
||||
$trove_network = hiera('trove_api_network', undef),
|
||||
$zaqar_api_network = hiera('zaqar_api_network', undef),
|
||||
$service_ports = {}
|
||||
|
@ -777,8 +767,6 @@ class tripleo::haproxy (
|
|||
sahara_api_ssl_port => 13386,
|
||||
swift_proxy_port => 8080,
|
||||
swift_proxy_ssl_port => 13808,
|
||||
tacker_api_port => 9890,
|
||||
tacker_api_ssl_port => 13989,
|
||||
trove_api_port => 8779,
|
||||
trove_api_ssl_port => 13779,
|
||||
ui_port => 3000,
|
||||
|
@ -1001,19 +989,6 @@ class tripleo::haproxy (
|
|||
}
|
||||
}
|
||||
|
||||
if $tacker {
|
||||
::tripleo::haproxy::endpoint { 'tacker':
|
||||
public_virtual_ip => $public_virtual_ip,
|
||||
internal_ip => hiera('tacker_api_vip', $controller_virtual_ip),
|
||||
service_port => $ports[tacker_api_port],
|
||||
ip_addresses => hiera('tacker_node_ips', $controller_hosts_real),
|
||||
server_names => hiera('tacker_api_node_names', $controller_hosts_names_real),
|
||||
mode => 'http',
|
||||
public_ssl_port => $ports[tacker_api_ssl_port],
|
||||
service_network => $tacker_network,
|
||||
}
|
||||
}
|
||||
|
||||
if $trove {
|
||||
::tripleo::haproxy::endpoint { 'trove':
|
||||
public_virtual_ip => $public_virtual_ip,
|
||||
|
|
|
@ -262,9 +262,6 @@ class tripleo::profile::base::database::mysql (
|
|||
if hiera('sahara_api_enabled', false) {
|
||||
include ::sahara::db::mysql
|
||||
}
|
||||
if hiera('tacker_enabled', false) {
|
||||
include ::tacker::db::mysql
|
||||
}
|
||||
if hiera('trove_api_enabled', false) {
|
||||
include ::trove::db::mysql
|
||||
}
|
||||
|
|
|
@ -408,9 +408,6 @@ class tripleo::profile::base::keystone (
|
|||
if hiera('swift_proxy_enabled', false) or hiera('external_swift_proxy_enabled',false) {
|
||||
include ::swift::keystone::auth
|
||||
}
|
||||
if hiera('tacker_enabled', false) {
|
||||
include ::tacker::keystone::auth
|
||||
}
|
||||
if hiera('trove_api_enabled', false) {
|
||||
include ::trove::keystone::auth
|
||||
}
|
||||
|
|
|
@ -1,88 +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::tacker
|
||||
#
|
||||
# Tacker server profile for tripleo
|
||||
#
|
||||
# === Parameters
|
||||
#
|
||||
# [*bootstrap_node*]
|
||||
# (Optional) The hostname of the node responsible for bootstrapping tasks
|
||||
# Defaults to hiera('tacker_short_bootstrap_node_name')
|
||||
#
|
||||
# [*oslomsg_rpc_proto*]
|
||||
# Protocol driver for the oslo messaging rpc service
|
||||
# Defaults to hiera('oslo_messaging_rpc_scheme', rabbit)
|
||||
#
|
||||
# [*oslomsg_rpc_hosts*]
|
||||
# list of the oslo messaging rpc host fqdns
|
||||
# Defaults to hiera('oslo_messaging_rpc_node_names')
|
||||
#
|
||||
# [*oslomsg_rpc_port*]
|
||||
# IP port for oslo messaging rpc service
|
||||
# Defaults to hiera('oslo_messaging_rpc_port', 5672)
|
||||
#
|
||||
# [*oslomsg_rpc_username*]
|
||||
# Username for oslo messaging rpc service
|
||||
# Defaults to hiera('oslo_messaging_rpc_user_name', 'guest')
|
||||
#
|
||||
# [*oslomsg_rpc_password*]
|
||||
# Password for oslo messaging rpc service
|
||||
# Defaults to hiera('oslo_messaging_rpc_password')
|
||||
#
|
||||
# [*oslomsg_rpc_use_ssl*]
|
||||
# Enable ssl oslo messaging services
|
||||
# Defaults to hiera('oslo_messaging_rpc_use_ssl', '0')
|
||||
#
|
||||
# [*step*]
|
||||
# (Optional) The current step of the deployment
|
||||
# Defaults to hiera('step')
|
||||
|
||||
class tripleo::profile::base::tacker (
|
||||
$bootstrap_node = hiera('tacker_short_bootstrap_node_name', undef),
|
||||
$oslomsg_rpc_proto = hiera('oslo_messaging_rpc_scheme', 'rabbit'),
|
||||
$oslomsg_rpc_hosts = any2array(hiera('oslo_messaging_rpc_node_names', undef)),
|
||||
$oslomsg_rpc_password = hiera('oslo_messaging_rpc_password'),
|
||||
$oslomsg_rpc_port = hiera('oslo_messaging_rpc_port', '5672'),
|
||||
$oslomsg_rpc_username = hiera('oslo_messaging_rpc_user_name', 'guest'),
|
||||
$oslomsg_rpc_use_ssl = hiera('oslo_messaging_rpc_use_ssl', '0'),
|
||||
$step = Integer(hiera('step')),
|
||||
) {
|
||||
if $::hostname == downcase($bootstrap_node) {
|
||||
$sync_db = true
|
||||
} else {
|
||||
$sync_db = false
|
||||
}
|
||||
|
||||
if $step >= 4 or ($step >= 3 and $sync_db){
|
||||
$oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl)))
|
||||
class { '::tacker':
|
||||
sync_db => $sync_db,
|
||||
default_transport_url => os_transport_url({
|
||||
'transport' => $oslomsg_rpc_proto,
|
||||
'hosts' => $oslomsg_rpc_hosts,
|
||||
'port' => sprintf('%s', $oslomsg_rpc_port),
|
||||
'username' => $oslomsg_rpc_username,
|
||||
'password' => $oslomsg_rpc_password,
|
||||
'ssl' => $oslomsg_rpc_use_ssl_real,
|
||||
}),
|
||||
}
|
||||
|
||||
include ::tacker::server
|
||||
include ::tacker::db
|
||||
include ::tacker::config
|
||||
include ::tacker::logging
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue