summaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/nova
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2017-02-13 10:07:24 -0500
committerAlex Schultz <aschultz@redhat.com>2017-02-21 14:40:43 -0700
commitfb6965116d567a061a42d077d51c3ca2d220f46d (patch)
tree4c5894fbb32b2ea4820374a7233d0d41eb15eea0 /manifests/profile/base/nova
parent71f655326be5eee7e030946fb6dd6cd4ba03b640 (diff)
Configure authtoken in Nova Placement
The Nova Placement API's configuration currently relies on the nova-api profile for its keystone authtoken configuration. This means that Nova Placement would fail if it got installed on an isolated node or docker container (this currently breaks TripleO's deployment of placement via docker). This patch creates a new authtoken profile and calls it via the api and placement roles. Change-Id: I7b38ab6ba5cae41689ac500d97dec4d09c73d387 Co-Authored-By: Alex Schultz <aschultz@redhat.com>
Diffstat (limited to 'manifests/profile/base/nova')
-rw-r--r--manifests/profile/base/nova/api.pp11
-rw-r--r--manifests/profile/base/nova/authtoken.pp56
-rw-r--r--manifests/profile/base/nova/placement.pp1
3 files changed, 58 insertions, 10 deletions
diff --git a/manifests/profile/base/nova/api.pp b/manifests/profile/base/nova/api.pp
index 287d14c..cda2b66 100644
--- a/manifests/profile/base/nova/api.pp
+++ b/manifests/profile/base/nova/api.pp
@@ -75,6 +75,7 @@ class tripleo::profile::base::nova::api (
}
include ::tripleo::profile::base::nova
+ include ::tripleo::profile::base::nova::authtoken
if $step >= 3 and $sync_db {
include ::nova::cell_v2::simple_setup
@@ -82,16 +83,6 @@ class tripleo::profile::base::nova::api (
if $step >= 4 or ($step >= 3 and $sync_db) {
- if hiera('nova::use_ipv6', false) {
- $memcache_servers = suffix(any2array(normalize_ip_for_uri(hiera('memcached_node_ips_v6'))), ':11211')
- } else {
- $memcache_servers = suffix(any2array(normalize_ip_for_uri(hiera('memcached_node_ips'))), ':11211')
- }
-
- class { '::nova::keystone::authtoken':
- memcached_servers => $memcache_servers
- }
-
class { '::nova::api':
sync_db => $sync_db,
sync_db_api => $sync_db,
diff --git a/manifests/profile/base/nova/authtoken.pp b/manifests/profile/base/nova/authtoken.pp
new file mode 100644
index 0000000..ee6c331
--- /dev/null
+++ b/manifests/profile/base/nova/authtoken.pp
@@ -0,0 +1,56 @@
+# Copyright 2017 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::authtoken
+#
+# Nova authtoken profile for TripleO
+#
+# [*step*]
+# (Optional) The current step in deployment. See tripleo-heat-templates
+# for more details.
+# Defaults to hiera('step')
+#
+# [*use_ipv6*]
+# (Optional) Flag indicating if ipv6 should be used for caching
+# Defaults to hiera('nova::use_ipv6', false)
+#
+# [*memcache_nodes_ipv6*]
+# (Optional) Array of ipv6 addresses for memcache. Used if use_ipv6 is true.
+# Defaults to hiera('memcached_node_ipvs_v6', ['::1'])
+#
+# [*memcache_nodes_ipv4*]
+# (Optional) Array of ipv4 addresses for memcache. Used by default unless
+# use_ipv6 is set to true.
+# Defaults to hiera('memcached_node_ips', ['127.0.0.1'])
+#
+class tripleo::profile::base::nova::authtoken (
+ $step = hiera('step'),
+ $use_ipv6 = hiera('nova::use_ipv6', false),
+ $memcache_nodes_ipv6 = hiera('memcached_node_ips_v6', ['::1']),
+ $memcache_nodes_ipv4 = hiera('memcached_node_ips', ['127.0.0.1']),
+) {
+
+ if $step >= 3 {
+ $memcached_ips = $use_ipv6 ? {
+ true => $memcache_nodes_ipv6,
+ default => $memcache_nodes_ipv4
+ }
+
+ $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
+
+ class { '::nova::keystone::authtoken':
+ memcached_servers => $memcache_servers
+ }
+ }
+}
diff --git a/manifests/profile/base/nova/placement.pp b/manifests/profile/base/nova/placement.pp
index c429373..46658b8 100644
--- a/manifests/profile/base/nova/placement.pp
+++ b/manifests/profile/base/nova/placement.pp
@@ -69,6 +69,7 @@ class tripleo::profile::base::nova::placement (
}
include ::tripleo::profile::base::nova
+ include ::tripleo::profile::base::nova::authtoken
if $enable_internal_tls {
if $generate_service_certificates {