Merge "Remove Panko support"
This commit is contained in:
commit
e52e8f1c48
manifests
spec
@ -230,10 +230,6 @@
|
||||
# (optional) Enable or not Aodh API binding
|
||||
# Defaults to hiera('aodh_api_enabled', false)
|
||||
#
|
||||
# [*panko*]
|
||||
# (optional) Enable or not Panko API binding
|
||||
# Defaults to hiera('panko_api_enabled', false)
|
||||
#
|
||||
# [*barbican*]
|
||||
# (optional) Enable or not Barbican API binding
|
||||
# Defaults to hiera('barbican_api_enabled', false)
|
||||
@ -481,10 +477,6 @@
|
||||
# (optional) Specify the network octavia is running on.
|
||||
# Defaults to hiera('octavia_api_network', undef)
|
||||
#
|
||||
# [*panko_network*]
|
||||
# (optional) Specify the network panko is running on.
|
||||
# Defaults to hiera('panko_api_network', undef)
|
||||
#
|
||||
# [*ovn_dbs_network*]
|
||||
# (optional) Specify the network ovn_dbs is running on.
|
||||
# Defaults to hiera('ovn_dbs_network', undef)
|
||||
@ -541,8 +533,6 @@
|
||||
# 'nova_novnc_ssl_port' (Defaults to 13080)
|
||||
# 'octavia_api_port' (Defaults to 9876)
|
||||
# 'octavia_api_ssl_port' (Defaults to 13876)
|
||||
# 'panko_api_port' (Defaults to 8977)
|
||||
# 'panko_api_ssl_port' (Defaults to 13977)
|
||||
# 'placement_port' (Defaults to 8778)
|
||||
# 'placement_ssl_port' (Defaults to 13778)
|
||||
# 'ovn_nbdb_port' (Defaults to 6641)
|
||||
@ -613,7 +603,6 @@ class tripleo::haproxy (
|
||||
$ec2_api = hiera('ec2_api_enabled', false),
|
||||
$ec2_api_metadata = hiera('ec2_api_enabled', false),
|
||||
$aodh = hiera('aodh_api_enabled', false),
|
||||
$panko = hiera('panko_api_enabled', false),
|
||||
$barbican = hiera('barbican_api_enabled', false),
|
||||
$ceph_grafana = hiera('ceph_grafana_enabled', false),
|
||||
$ceph_dashboard = hiera('ceph_mgr_enabled', false),
|
||||
@ -671,7 +660,6 @@ class tripleo::haproxy (
|
||||
$nova_osapi_network = hiera('nova_api_network', undef),
|
||||
$placement_network = hiera('placement_network', undef),
|
||||
$octavia_network = hiera('octavia_api_network', undef),
|
||||
$panko_network = hiera('panko_api_network', undef),
|
||||
$ovn_dbs_network = hiera('ovn_dbs_network', undef),
|
||||
$ec2_api_network = hiera('ec2_api_network', undef),
|
||||
$ec2_api_metadata_network = hiera('ec2_api_network', undef),
|
||||
@ -722,8 +710,6 @@ class tripleo::haproxy (
|
||||
nova_novnc_ssl_port => 13080,
|
||||
octavia_api_port => 9876,
|
||||
octavia_api_ssl_port => 13876,
|
||||
panko_api_port => 8977,
|
||||
panko_api_ssl_port => 13977,
|
||||
placement_port => 8778,
|
||||
placement_ssl_port => 13778,
|
||||
ovn_nbdb_port => 6641,
|
||||
@ -1129,20 +1115,6 @@ class tripleo::haproxy (
|
||||
}
|
||||
}
|
||||
|
||||
if $panko {
|
||||
::tripleo::haproxy::endpoint { 'panko':
|
||||
public_virtual_ip => $public_virtual_ip,
|
||||
internal_ip => hiera('panko_api_vip', $controller_virtual_ip),
|
||||
service_port => $ports[panko_api_port],
|
||||
ip_addresses => hiera('panko_api_node_ips', $controller_hosts_real),
|
||||
server_names => hiera('panko_api_node_names', $controller_hosts_names_real),
|
||||
public_ssl_port => $ports[panko_api_ssl_port],
|
||||
mode => 'http',
|
||||
service_network => $panko_network,
|
||||
member_options => union($haproxy_member_options, $internal_tls_member_options),
|
||||
}
|
||||
}
|
||||
|
||||
if $barbican {
|
||||
::tripleo::haproxy::endpoint { 'barbican':
|
||||
public_virtual_ip => $public_virtual_ip,
|
||||
|
@ -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('panko_api_enabled', false) {
|
||||
tripleo::profile::base::database::mysql::include_and_check_auth{'panko::db::mysql':}
|
||||
}
|
||||
if hiera('ec2_api_enabled', false) {
|
||||
tripleo::profile::base::database::mysql::include_and_check_auth{'ec2api::db::mysql':}
|
||||
}
|
||||
|
@ -1,35 +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::panko
|
||||
#
|
||||
# panko 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::panko (
|
||||
$step = Integer(hiera('step')),
|
||||
) {
|
||||
if $step >= 3 {
|
||||
include panko
|
||||
include panko::config
|
||||
include panko::logging
|
||||
}
|
||||
}
|
@ -1,97 +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::panko::api
|
||||
#
|
||||
# Panko API profile for tripleo
|
||||
#
|
||||
# === Parameters
|
||||
#
|
||||
# [*bootstrap_node*]
|
||||
# (Optional) The hostname of the node responsible for bootstrapping tasks
|
||||
# Defaults to hiera('panko_api_short_bootstrap_node_name')
|
||||
#
|
||||
# [*certificates_specs*]
|
||||
# (Optional) The specifications to give to certmonger for the certificate(s)
|
||||
# it will create.
|
||||
# Example with hiera:
|
||||
# apache_certificates_specs:
|
||||
# httpd-internal_api:
|
||||
# hostname: <overcloud controller fqdn>
|
||||
# service_certificate: <service certificate path>
|
||||
# service_key: <service key path>
|
||||
# principal: "haproxy/<overcloud controller fqdn>"
|
||||
# Defaults to hiera('apache_certificate_specs', {}).
|
||||
#
|
||||
# [*enable_internal_tls*]
|
||||
# (Optional) Whether TLS in the internal network is enabled or not.
|
||||
# Defaults to hiera('enable_internal_tls', false)
|
||||
#
|
||||
# [*panko_network*]
|
||||
# (Optional) The network name where the panko endpoint is listening on.
|
||||
# This is set by t-h-t.
|
||||
# Defaults to hiera('panko_api_network', undef)
|
||||
#
|
||||
# [*enable_panko_expirer*]
|
||||
# (Optional) Whether panko expirer should be configured
|
||||
# Defaults to hiera('enable_panko_expirer', true)
|
||||
#
|
||||
# [*step*]
|
||||
# (Optional) The current step in deployment. See tripleo-heat-templates
|
||||
# for more details.
|
||||
# Defaults to hiera('step')
|
||||
#
|
||||
class tripleo::profile::base::panko::api (
|
||||
$bootstrap_node = hiera('panko_api_short_bootstrap_node_name', undef),
|
||||
$certificates_specs = hiera('apache_certificates_specs', {}),
|
||||
$enable_internal_tls = hiera('enable_internal_tls', false),
|
||||
$panko_network = hiera('panko_api_network', undef),
|
||||
$enable_panko_expirer = hiera('enable_panko_expirer', true),
|
||||
$step = Integer(hiera('step')),
|
||||
) {
|
||||
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
|
||||
$sync_db = true
|
||||
} else {
|
||||
$sync_db = false
|
||||
}
|
||||
|
||||
include tripleo::profile::base::panko
|
||||
include tripleo::profile::base::panko::authtoken
|
||||
|
||||
if $enable_internal_tls {
|
||||
if !$panko_network {
|
||||
fail('panko_api_network is not set in the hieradata.')
|
||||
}
|
||||
$tls_certfile = $certificates_specs["httpd-${panko_network}"]['service_certificate']
|
||||
$tls_keyfile = $certificates_specs["httpd-${panko_network}"]['service_key']
|
||||
} else {
|
||||
$tls_certfile = undef
|
||||
$tls_keyfile = undef
|
||||
}
|
||||
|
||||
if $step >= 4 or ( $step >= 3 and $sync_db ) {
|
||||
include panko::db
|
||||
class { 'panko::api':
|
||||
sync_db => $sync_db,
|
||||
}
|
||||
if $enable_panko_expirer {
|
||||
include panko::expirer
|
||||
}
|
||||
include tripleo::profile::base::apache
|
||||
class { 'panko::wsgi::apache':
|
||||
ssl_cert => $tls_certfile,
|
||||
ssl_key => $tls_keyfile,
|
||||
}
|
||||
}
|
||||
}
|
@ -1,44 +0,0 @@
|
||||
# Copyright 2019 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::panko::authtoken
|
||||
#
|
||||
# Panko authtoken profile for TripleO
|
||||
#
|
||||
# [*step*]
|
||||
# (Optional) The current step in deployment. See tripleo-heat-templates
|
||||
# for more details.
|
||||
# Defaults to hiera('step')
|
||||
#
|
||||
# [*memcached_ips*]
|
||||
# (Optional) Array of ipv4 or ipv6 addresses for memcache.
|
||||
# Defaults to hiera('memcached_node_ips')
|
||||
#
|
||||
class tripleo::profile::base::panko::authtoken (
|
||||
$step = Integer(hiera('step')),
|
||||
$memcached_ips = hiera('memcached_node_ips'),
|
||||
) {
|
||||
|
||||
if $step >= 3 {
|
||||
if is_ipv6_address($memcached_ips[0]) {
|
||||
$memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211'), 'inet6:')
|
||||
} else {
|
||||
$memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
|
||||
}
|
||||
|
||||
class { 'panko::keystone::authtoken':
|
||||
memcached_servers => $memcache_servers
|
||||
}
|
||||
}
|
||||
}
|
@ -1,70 +0,0 @@
|
||||
#
|
||||
# Copyright (C) 2019 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.
|
||||
#
|
||||
|
||||
require 'spec_helper'
|
||||
|
||||
describe 'tripleo::profile::base::panko::authtoken' do
|
||||
shared_examples_for 'tripleo::profile::base::panko::authtoken' do
|
||||
context 'with step less than 3' do
|
||||
let(:params) { {
|
||||
:step => 1,
|
||||
} }
|
||||
|
||||
it {
|
||||
is_expected.to contain_class('tripleo::profile::base::panko::authtoken')
|
||||
is_expected.to_not contain_class('panko::keystone::authtoken')
|
||||
}
|
||||
end
|
||||
|
||||
context 'with step 3' do
|
||||
let(:params) { {
|
||||
:step => 3,
|
||||
:memcached_ips => '127.0.0.1',
|
||||
} }
|
||||
|
||||
it {
|
||||
is_expected.to contain_class('tripleo::profile::base::panko::authtoken')
|
||||
is_expected.to contain_class('panko::keystone::authtoken').with(
|
||||
:memcached_servers => ['127.0.0.1:11211'])
|
||||
}
|
||||
end
|
||||
|
||||
context 'with step 3 with ipv6' do
|
||||
let(:params) { {
|
||||
:step => 3,
|
||||
:memcached_ips => '::1',
|
||||
} }
|
||||
|
||||
it {
|
||||
is_expected.to contain_class('tripleo::profile::base::panko::authtoken')
|
||||
is_expected.to contain_class('panko::keystone::authtoken').with(
|
||||
:memcached_servers => ['[::1]:11211'])
|
||||
}
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
|
||||
on_supported_os.each do |os, facts|
|
||||
context "on #{os}" do
|
||||
let(:facts) do
|
||||
facts.merge({ :hostname => 'node.example.com' })
|
||||
end
|
||||
|
||||
it_behaves_like 'tripleo::profile::base::panko::authtoken'
|
||||
end
|
||||
end
|
||||
end
|
2
spec/fixtures/hieradata/default.yaml
vendored
2
spec/fixtures/hieradata/default.yaml
vendored
@ -88,8 +88,6 @@ nova::rabbit_password: 'password'
|
||||
nova::keystone::authtoken::password: 'password'
|
||||
nova::network::neutron::password: 'password'
|
||||
nova::metadata::novajoin::authtoken::password: 'password'
|
||||
# panko related items
|
||||
panko::keystone::authtoken::password: 'password'
|
||||
# placement related items
|
||||
placement_api_short_bootstrap_node_name: node
|
||||
placement_short_bootstrap_node_name: node
|
||||
|
Loading…
x
Reference in New Issue
Block a user