6 files changed, 48 insertions, 7 deletions
diff --git a/manifests/profile/base/ceilometer/api.pp b/manifests/profile/base/ceilometer/api.pp
index 1aa4285..0176380 100644
--- a/manifests/profile/base/ceilometer/api.pp
+++ b/manifests/profile/base/ceilometer/api.pp
@@ -63,7 +63,7 @@ class tripleo::profile::base::ceilometer::api (
     $tls_keyfile = undef
   }
 
-  if $step >= 4 {
+  if $step >= 3 {
     include ::ceilometer::api
     include ::apache::mod::ssl
     class { '::ceilometer::wsgi::apache':
diff --git a/manifests/profile/base/cinder/volume/dellsc.pp b/manifests/profile/base/cinder/volume/dellsc.pp
index 534bcb7..ab6bbeb 100644
--- a/manifests/profile/base/cinder/volume/dellsc.pp
+++ b/manifests/profile/base/cinder/volume/dellsc.pp
@@ -44,6 +44,7 @@ class tripleo::profile::base::cinder::volume::dellsc (
       dell_sc_api_port      => hiera('cinder::backend::dellsc_iscsi::dell_sc_api_port', undef),
       dell_sc_server_folder => hiera('cinder::backend::dellsc_iscsi::dell_sc_server_folder', undef),
       dell_sc_volume_folder => hiera('cinder::backend::dellsc_iscsi::dell_sc_volume_folder', undef),
+      excluded_domain_ip    => hiera('cinder::backend::dellsc_iscsi::excluded_domain_ip', undef),
     }
   }
 
diff --git a/manifests/profile/base/docker_registry.pp b/manifests/profile/base/docker_registry.pp
index 73fb6e0..cb262d9 100644
--- a/manifests/profile/base/docker_registry.pp
+++ b/manifests/profile/base/docker_registry.pp
@@ -31,10 +31,15 @@
 #  network
 #  Defaults to hiera('controller_admin_host')
 #
+# [*enable_container_images_build*]
+#  (Optional) Whether to install tools to build docker container images
+#  Defaults to hiera('enable_container_images_build', true)
+#
 class tripleo::profile::base::docker_registry (
-  $registry_host       = hiera('controller_host'),
-  $registry_port       = 8787,
-  $registry_admin_host = hiera('controller_admin_host'),
+  $registry_host                 = hiera('controller_host'),
+  $registry_port                 = 8787,
+  $registry_admin_host           = hiera('controller_admin_host'),
+  $enable_container_images_build = hiera('enable_container_images_build', true),
 ) {
 
   include ::tripleo::profile::base::docker
@@ -45,7 +50,9 @@ class tripleo::profile::base::docker_registry (
     allow_virtual => false,
   }
   package{'docker-distribution': }
-  package{'openstack-kolla': }
+  if str2bool($enable_container_images_build) {
+    package{'openstack-kolla': }
+  }
   file { '/etc/docker-distribution/registry/config.yml' :
     ensure  => file,
     content => template('tripleo/docker_distribution/registry_config.yml.erb'),
diff --git a/manifests/profile/base/gnocchi/api.pp b/manifests/profile/base/gnocchi/api.pp
index 852e3c7..4a47184 100644
--- a/manifests/profile/base/gnocchi/api.pp
+++ b/manifests/profile/base/gnocchi/api.pp
@@ -83,14 +83,16 @@ class tripleo::profile::base::gnocchi::api (
     include ::gnocchi::db::sync
   }
 
-  if $step >= 4 {
+  if $step >= 3 {
     include ::gnocchi::api
     include ::apache::mod::ssl
     class { '::gnocchi::wsgi::apache':
       ssl_cert => $tls_certfile,
       ssl_key  => $tls_keyfile,
     }
+  }
 
+  if $step >= 4 {
     class { '::gnocchi::storage':
       coordination_url => join(['redis://:', hiera('gnocchi_redis_password'), '@', normalize_ip_for_uri(hiera('redis_vip')), ':6379/']),
     }
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index 92eceb7..31f5c93 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -322,7 +322,7 @@ class tripleo::profile::base::keystone (
     if hiera('sahara_api_enabled', false) {
       include ::sahara::keystone::auth
     }
-    if hiera('swift_proxy_enabled', false) {
+    if hiera('swift_proxy_enabled', false) or hiera('external_swift_proxy_enabled',false) {
       include ::swift::keystone::auth
     }
     if hiera('tacker_enabled', false) {
diff --git a/manifests/profile/base/neutron/agents/bigswitch.pp b/manifests/profile/base/neutron/agents/bigswitch.pp
new file mode 100644
index 0000000..137dec0
--- /dev/null
+++ b/manifests/profile/base/neutron/agents/bigswitch.pp
@@ -0,0 +1,31 @@
+# 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::neutron::agents::bigswitch
+#
+# Bigswitch Neutron agent profile
+#
+# === Parameters
+#
+# [*step*]
+#   (Optional) The current step of the deployment
+#   Defaults to hiera('step')
+#
+class tripleo::profile::base::neutron::agents::bigswitch(
+  $step = hiera('step'),
+) {
+  if $step >= 4 {
+    include ::neutron::agents::bigswitch
+  }
+}