6 files changed, 94 insertions, 13 deletions
diff --git a/manifests/profile/base/docker_registry.pp b/manifests/profile/base/docker_registry.pp
index ebe84bf..0452575 100644
--- a/manifests/profile/base/docker_registry.pp
+++ b/manifests/profile/base/docker_registry.pp
@@ -38,7 +38,8 @@ class tripleo::profile::base::docker_registry (
 ) {
   # We want a v2 registry
   package{'docker-registry':
-    ensure => absent,
+    ensure        => absent,
+    allow_virtual => false,
   }
   package{'docker-distribution': }
   package{'docker': }
diff --git a/manifests/profile/base/horizon.pp b/manifests/profile/base/horizon.pp
index 1849435..278c25c 100644
--- a/manifests/profile/base/horizon.pp
+++ b/manifests/profile/base/horizon.pp
@@ -25,11 +25,11 @@
 #
 # [*neutron_options*]
 #   (Optional) A hash of parameters to enable features specific to Neutron
-#   Defaults to hiera('horizon::neutron_options', undef)
+#   Defaults to hiera('horizon::neutron_options', {})
 #
 class tripleo::profile::base::horizon (
   $step            = hiera('step'),
-  $neutron_options = hiera('horizon::neutron_options', undef),
+  $neutron_options = hiera('horizon::neutron_options', {}),
 ) {
   if $step >= 4 {
     # Horizon
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 {
diff --git a/manifests/profile/base/vpp.pp b/manifests/profile/base/vpp.pp
new file mode 100644
index 0000000..05f52f9
--- /dev/null
+++ b/manifests/profile/base/vpp.pp
@@ -0,0 +1,32 @@
+# 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::vpp
+#
+# vpp 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::vpp (
+  $step        = hiera('step'),
+) {
+  if $step >= 1 {
+    include ::fdio
+  }
+}