Remove Congress
Depends-On: Idca6b12f1c0ca3bc15bedf6469d4063a4dac31fa Change-Id: I2489581b040f4798aad752b50cfd1a53b4c3d4fd
This commit is contained in:
Emilien Macchi
parent
73b547b958
commit
00818969cf
@ -184,10 +184,6 @@
|
||||
# (optional) Enable or not Cinder API binding
|
||||
# Defaults to hiera('cinder_api_enabled', false)
|
||||
#
|
||||
# [*congress*]
|
||||
# (optional) Enable or not Congress API binding
|
||||
# Defaults to hiera('congress_enabled', false)
|
||||
#
|
||||
# [*manila*]
|
||||
# (optional) Enable or not Manila API binding
|
||||
# Defaults to hiera('manila_api_enabled', false)
|
||||
@ -382,10 +378,6 @@
|
||||
# (optional) Specify the network cinder is running on.
|
||||
# Defaults to hiera('cinder_api_network', undef)
|
||||
#
|
||||
# [*congress_network*]
|
||||
# (optional) Specify the network congress is running on.
|
||||
# Defaults to hiera('congress_api_network', undef)
|
||||
#
|
||||
# [*designate_network*]
|
||||
# (optional) Specify the network designate is running on.
|
||||
# Defaults to hiera('designate_api_network', undef)
|
||||
@ -626,7 +618,6 @@ class tripleo::haproxy (
|
||||
$keystone_public = hiera('keystone_enabled', false),
|
||||
$neutron = hiera('neutron_api_enabled', false),
|
||||
$cinder = hiera('cinder_api_enabled', false),
|
||||
$congress = hiera('congress_enabled', false),
|
||||
$manila = hiera('manila_api_enabled', false),
|
||||
$sahara = hiera('sahara_api_enabled', false),
|
||||
$tacker = hiera('tacker_enabled', false),
|
||||
@ -675,7 +666,6 @@ class tripleo::haproxy (
|
||||
$barbican_network = hiera('barbican_api_network', false),
|
||||
$ceph_rgw_network = hiera('ceph_rgw_network', undef),
|
||||
$cinder_network = hiera('cinder_api_network', undef),
|
||||
$congress_network = hiera('congress_api_network', undef),
|
||||
$designate_network = hiera('designate_api_network', undef),
|
||||
$docker_registry_network = hiera('docker_registry_network', undef),
|
||||
$glance_api_network = hiera('glance_api_network', undef),
|
||||
@ -719,8 +709,6 @@ class tripleo::haproxy (
|
||||
barbican_api_ssl_port => 13311,
|
||||
cinder_api_port => 8776,
|
||||
cinder_api_ssl_port => 13776,
|
||||
congress_api_port => 1789,
|
||||
congress_api_ssl_port => 13789,
|
||||
designate_api_port => 9001,
|
||||
designate_api_ssl_port => 13001,
|
||||
docker_registry_port => 8787,
|
||||
@ -972,19 +960,6 @@ class tripleo::haproxy (
|
||||
}
|
||||
}
|
||||
|
||||
if $congress {
|
||||
::tripleo::haproxy::endpoint { 'congress':
|
||||
public_virtual_ip => $public_virtual_ip,
|
||||
internal_ip => hiera('congress_api_vip', $controller_virtual_ip),
|
||||
service_port => $ports[congress_api_port],
|
||||
ip_addresses => hiera('congress_node_ips', $controller_hosts_real),
|
||||
server_names => hiera('congress_api_node_names', $controller_hosts_names_real),
|
||||
mode => 'http',
|
||||
public_ssl_port => $ports[congress_api_ssl_port],
|
||||
service_network => $congress_network,
|
||||
}
|
||||
}
|
||||
|
||||
if $manila {
|
||||
::tripleo::haproxy::endpoint { 'manila':
|
||||
public_virtual_ip => $public_virtual_ip,
|
||||
|
||||
@ -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::congress
|
||||
#
|
||||
# Congress server profile for tripleo
|
||||
#
|
||||
# === Parameters
|
||||
#
|
||||
# [*bootstrap_node*]
|
||||
# (Optional) The hostname of the node responsible for bootstrapping tasks
|
||||
# Defaults to hiera('congress_short_bootstrap_node_name')
|
||||
#
|
||||
# [*step*]
|
||||
# (Optional) The current step of the deployment
|
||||
# Defaults to hiera('step')
|
||||
#
|
||||
# [*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')
|
||||
|
||||
class tripleo::profile::base::congress (
|
||||
$bootstrap_node = hiera('congress_short_bootstrap_node_name', undef),
|
||||
$step = Integer(hiera('step')),
|
||||
$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'),
|
||||
) {
|
||||
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 { '::congress':
|
||||
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 ::congress::server
|
||||
include ::congress::db
|
||||
include ::congress::config
|
||||
include ::congress::logging
|
||||
}
|
||||
}
|
||||
@ -208,9 +208,6 @@ class tripleo::profile::base::database::mysql (
|
||||
if hiera('barbican_api_enabled', false) {
|
||||
include ::barbican::db::mysql
|
||||
}
|
||||
if hiera('congress_enabled', false) {
|
||||
include ::congress::db::mysql
|
||||
}
|
||||
if hiera('designate_api_enabled', false) {
|
||||
include ::designate::db::mysql
|
||||
}
|
||||
|
||||
@ -347,9 +347,6 @@ class tripleo::profile::base::keystone (
|
||||
if hiera('cinder_api_enabled', false) {
|
||||
include ::cinder::keystone::auth
|
||||
}
|
||||
if hiera('congress_enabled', false) {
|
||||
include ::congress::keystone::auth
|
||||
}
|
||||
if hiera('designate_api_enabled', false) {
|
||||
include ::designate::keystone::auth
|
||||
}
|
||||
|
||||
@ -29,7 +29,6 @@
|
||||
- ^manifests/profile/(base|pacemaker)/neutron/plugins/ml2/ovn.*$
|
||||
- ^manifests/profile/(base|pacemaker)/neutron/agents/ovn.*$
|
||||
- ^manifests/profile/(base|pacemaker)/neutron/ovn.*$
|
||||
- ^manifests/profile/(base|pacemaker)/congress.*$
|
||||
- ^manifests/profile/(base|pacemaker)/tacker.*$
|
||||
- tripleo-ci-centos-7-scenario008-multinode-oooq-container:
|
||||
files:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user