Implement Nova Placement API profile
Allow TripleO to deploy Nova Placement API with a new profile. Change-Id: I5e25a50f3d7a9b39f4146a61cb528963ee09e90c
This commit is contained in:
Emilien Macchi
parent
d67e94a7e1
commit
858b220cc3
@ -167,6 +167,10 @@
|
||||
# (optional) Enable or not Nova API binding
|
||||
# Defaults to hiera('nova_api_enabled', false)
|
||||
#
|
||||
# [*nova_placement*]
|
||||
# (optional) Enable or not Nova Placement API binding
|
||||
# Defaults to hiera('nova_placement_enabled', false)
|
||||
#
|
||||
# [*nova_metadata*]
|
||||
# (optional) Enable or not Nova metadata binding
|
||||
# Defaults to hiera('nova_api_enabled', false)
|
||||
@ -444,6 +448,8 @@
|
||||
# 'neutron_api_ssl_port' (Defaults to 13696)
|
||||
# 'nova_api_port' (Defaults to 8774)
|
||||
# 'nova_api_ssl_port' (Defaults to 13774)
|
||||
# 'nova_placement_port' (Defaults to 8778)
|
||||
# 'nova_placement_ssl_port' (Defaults to 13778)
|
||||
# 'nova_metadata_port' (Defaults to 8775)
|
||||
# 'nova_novnc_port' (Defaults to 6080)
|
||||
# 'nova_novnc_ssl_port' (Defaults to 13080)
|
||||
@ -500,6 +506,7 @@ class tripleo::haproxy (
|
||||
$glance_api = hiera('glance_api_enabled', false),
|
||||
$glance_registry = hiera('glance_registry_enabled', false),
|
||||
$nova_osapi = hiera('nova_api_enabled', false),
|
||||
$nova_placement = hiera('nova_placement_enabled', false),
|
||||
$nova_metadata = hiera('nova_api_enabled', false),
|
||||
$nova_novncproxy = hiera('nova_vnc_proxy_enabled', false),
|
||||
$ceilometer = hiera('ceilometer_api_enabled', false),
|
||||
@ -598,6 +605,8 @@ class tripleo::haproxy (
|
||||
neutron_api_ssl_port => 13696,
|
||||
nova_api_port => 8774,
|
||||
nova_api_ssl_port => 13774,
|
||||
nova_placement_port => 8778,
|
||||
nova_placement_ssl_port => 13778,
|
||||
nova_metadata_port => 8775,
|
||||
nova_novnc_port => 6080,
|
||||
nova_novnc_ssl_port => 13080,
|
||||
@ -928,6 +937,26 @@ class tripleo::haproxy (
|
||||
}
|
||||
}
|
||||
|
||||
$nova_placement_vip = hiera('nova_placement_vip', $controller_virtual_ip)
|
||||
if $nova_placement {
|
||||
::tripleo::haproxy::endpoint { 'nova_placement':
|
||||
public_virtual_ip => $public_virtual_ip,
|
||||
internal_ip => $nova_placement_vip,
|
||||
service_port => $ports[nova_placement_port],
|
||||
ip_addresses => hiera('nova_placement_node_ips', $controller_hosts_real),
|
||||
server_names => hiera('nova_placement_node_names', $controller_hosts_names_real),
|
||||
mode => 'http',
|
||||
listen_options => {
|
||||
'http-request' => [
|
||||
'set-header X-Forwarded-Proto https if { ssl_fc }',
|
||||
'set-header X-Forwarded-Proto http if !{ ssl_fc }'],
|
||||
},
|
||||
public_ssl_port => $ports[nova_placement_ssl_port],
|
||||
service_network => $nova_osapi_network,
|
||||
member_options => union($haproxy_member_options, $internal_tls_member_options),
|
||||
}
|
||||
}
|
||||
|
||||
if $nova_metadata {
|
||||
::tripleo::haproxy::endpoint { 'nova_metadata':
|
||||
internal_ip => hiera('nova_metadata_vip', $controller_virtual_ip),
|
||||
|
||||
@ -179,6 +179,9 @@ class tripleo::profile::base::database::mysql (
|
||||
include ::nova::db::mysql
|
||||
include ::nova::db::mysql_api
|
||||
}
|
||||
if hiera('nova_placement_enabled', false) {
|
||||
include ::nova::db::mysql_placement
|
||||
}
|
||||
if hiera('sahara_api_enabled', false) {
|
||||
include ::sahara::db::mysql
|
||||
}
|
||||
|
||||
@ -236,6 +236,9 @@ class tripleo::profile::base::keystone (
|
||||
if hiera('nova_api_enabled', false) {
|
||||
include ::nova::keystone::auth
|
||||
}
|
||||
if hiera('nova_placement_enabled', false) {
|
||||
include ::nova::keystone::auth_placement
|
||||
}
|
||||
if hiera('panko_api_enabled', false) {
|
||||
include ::panko::keystone::auth
|
||||
}
|
||||
|
||||
98
manifests/profile/base/nova/placement.pp
Normal file
98
manifests/profile/base/nova/placement.pp
Normal file
@ -0,0 +1,98 @@
|
||||
# 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::nova::placement
|
||||
#
|
||||
# Nova Placement API profile for tripleo
|
||||
#
|
||||
# [*bootstrap_node*]
|
||||
# (Optional) The hostname of the node responsible for bootstrapping tasks
|
||||
# Defaults to hiera('bootstrap_nodeid')
|
||||
#
|
||||
# [*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)
|
||||
#
|
||||
# [*generate_service_certificates*]
|
||||
# (Optional) Whether or not certmonger will generate certificates for
|
||||
# HAProxy. This could be as many as specified by the $certificates_specs
|
||||
# variable.
|
||||
# Note that this doesn't configure the certificates in haproxy, it merely
|
||||
# creates the certificates.
|
||||
# Defaults to hiera('generate_service_certificate', false).
|
||||
#
|
||||
# [*nova_placement_network*]
|
||||
# (Optional) The network name where the nova placement endpoint is listening on.
|
||||
# This is set by t-h-t.
|
||||
# Defaults to hiera('nova_placement_network', undef)
|
||||
#
|
||||
# [*step*]
|
||||
# (Optional) The current step in deployment. See tripleo-heat-templates
|
||||
# for more details.
|
||||
# Defaults to hiera('step')
|
||||
#
|
||||
class tripleo::profile::base::nova::placement (
|
||||
$bootstrap_node = hiera('bootstrap_nodeid', undef),
|
||||
$certificates_specs = hiera('apache_certificates_specs', {}),
|
||||
$enable_internal_tls = hiera('enable_internal_tls', false),
|
||||
$generate_service_certificates = hiera('generate_service_certificates', false),
|
||||
$nova_placement_network = hiera('nova_placement_network', undef),
|
||||
$step = hiera('step'),
|
||||
) {
|
||||
if $::hostname == downcase($bootstrap_node) {
|
||||
$sync_db = true
|
||||
} else {
|
||||
$sync_db = false
|
||||
}
|
||||
|
||||
include ::tripleo::profile::base::nova
|
||||
|
||||
if $enable_internal_tls {
|
||||
if $generate_service_certificates {
|
||||
ensure_resources('tripleo::certmonger::httpd', $certificates_specs)
|
||||
}
|
||||
|
||||
if !$nova_placement_network {
|
||||
fail('nova_placement_network is not set in the hieradata.')
|
||||
}
|
||||
$tls_certfile = $certificates_specs["httpd-${nova_placement_network}"]['service_certificate']
|
||||
$tls_keyfile = $certificates_specs["httpd-${nova_placement_network}"]['service_key']
|
||||
} else {
|
||||
$tls_certfile = undef
|
||||
$tls_keyfile = undef
|
||||
}
|
||||
|
||||
if $step >= 4 {
|
||||
include ::nova::placement
|
||||
|
||||
class { '::nova::wsgi::apache_placement':
|
||||
ssl_cert => $tls_certfile,
|
||||
ssl_key => $tls_keyfile,
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user