aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-19 03:11:07 +0000
committerGerrit Code Review <review@openstack.org>2017-04-19 03:11:07 +0000
commit97aac6a58c30d044cc04f67829d74c98f56d28ba (patch)
tree6cc3249e071f72c301a03126fc5b6571b3a48b66
parenta14f2ce5065745b290304a9c0c8e7a4b2922bcb1 (diff)
parentb51734442340d051e66df57aec3c7853b98ba8d6 (diff)
Merge "Create bigswitch agent profile"
-rw-r--r--manifests/profile/base/neutron/agents/bigswitch.pp31
-rw-r--r--releasenotes/notes/neutron-bigswitch-agent-profile-1250bb1518199a67.yaml5
-rw-r--r--spec/classes/tripleo_profile_base_neutron_agents_bigswitch_spec.rb48
3 files changed, 84 insertions, 0 deletions
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
+ }
+}
diff --git a/releasenotes/notes/neutron-bigswitch-agent-profile-1250bb1518199a67.yaml b/releasenotes/notes/neutron-bigswitch-agent-profile-1250bb1518199a67.yaml
new file mode 100644
index 0000000..daaf6f4
--- /dev/null
+++ b/releasenotes/notes/neutron-bigswitch-agent-profile-1250bb1518199a67.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+ - |
+ Moves bigswitch neutron agent configuration to a new tripleo profile
+ tripleo::profile::base::neutron::agents::bigswitch
diff --git a/spec/classes/tripleo_profile_base_neutron_agents_bigswitch_spec.rb b/spec/classes/tripleo_profile_base_neutron_agents_bigswitch_spec.rb
new file mode 100644
index 0000000..228b2f8
--- /dev/null
+++ b/spec/classes/tripleo_profile_base_neutron_agents_bigswitch_spec.rb
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 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.
+#
+
+require 'spec_helper'
+
+describe 'tripleo::profile::base::neutron::agents::bigswitch' do
+
+ shared_examples_for 'tripleo::profile::base::neutron::agents::bigswitch' do
+
+ context 'when step less than 4' do
+ let(:params) { { :step => 3 } }
+ it {
+ is_expected.to_not contain_class('neutron::agents::bigswitch')
+ }
+ end
+
+ context 'when step 4' do
+ let(:params) { { :step => 4 } }
+ it {
+ is_expected.to contain_class('neutron::agents::bigswitch')
+ }
+ 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::neutron::agents::bigswitch'
+ end
+ end
+end