aboutsummaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
Diffstat (limited to 'spec')
-rw-r--r--spec/classes/tripleo_profile_base_aodh_api_spec.rb2
-rw-r--r--spec/classes/tripleo_profile_base_aodh_evaluator_spec.rb2
-rw-r--r--spec/classes/tripleo_profile_base_aodh_listener_spec.rb2
-rw-r--r--spec/classes/tripleo_profile_base_aodh_notifier_spec.rb2
-rw-r--r--spec/classes/tripleo_profile_base_aodh_spec.rb12
-rw-r--r--spec/classes/tripleo_profile_base_ceilometer_api_spec.rb2
-rw-r--r--spec/classes/tripleo_profile_base_ceilometer_collector_spec.rb2
-rw-r--r--spec/classes/tripleo_profile_base_ceilometer_expirer_spec.rb2
-rw-r--r--spec/classes/tripleo_profile_base_ceilometer_spec.rb6
-rw-r--r--spec/classes/tripleo_profile_base_cinder_api_spec.rb2
-rw-r--r--spec/classes/tripleo_profile_base_cinder_backup_ceph_spec.rb2
-rw-r--r--spec/classes/tripleo_profile_base_cinder_backup_spec.rb2
-rw-r--r--spec/classes/tripleo_profile_base_cinder_backup_swift_spec.rb2
-rw-r--r--spec/classes/tripleo_profile_base_cinder_scheduler_spec.rb2
-rw-r--r--spec/classes/tripleo_profile_base_cinder_spec.rb44
-rw-r--r--spec/classes/tripleo_profile_base_cinder_volume_spec.rb3
-rw-r--r--spec/classes/tripleo_profile_base_nova_api_spec.rb6
-rw-r--r--spec/classes/tripleo_profile_base_nova_compute_ironic_spec.rb2
-rw-r--r--spec/classes/tripleo_profile_base_nova_compute_libvirt_spec.rb2
-rw-r--r--spec/classes/tripleo_profile_base_nova_compute_spec.rb2
-rw-r--r--spec/classes/tripleo_profile_base_nova_conductor_spec.rb2
-rw-r--r--spec/classes/tripleo_profile_base_nova_consoleauth_spec.rb2
-rw-r--r--spec/classes/tripleo_profile_base_nova_libvirt_spec.rb2
-rw-r--r--spec/classes/tripleo_profile_base_nova_scheduler_spec.rb2
-rw-r--r--spec/classes/tripleo_profile_base_nova_spec.rb22
-rw-r--r--spec/classes/tripleo_profile_base_nova_vncproxy_spec.rb2
-rw-r--r--spec/classes/tripleo_profile_base_octavia_api_spec.rb6
-rw-r--r--spec/classes/tripleo_profile_base_octavia_spec.rb26
-rw-r--r--spec/fixtures/hieradata/default.yaml6
29 files changed, 96 insertions, 75 deletions
diff --git a/spec/classes/tripleo_profile_base_aodh_api_spec.rb b/spec/classes/tripleo_profile_base_aodh_api_spec.rb
index 22f26cf..f2a26bf 100644
--- a/spec/classes/tripleo_profile_base_aodh_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_aodh_api_spec.rb
@@ -19,7 +19,7 @@ require 'spec_helper'
describe 'tripleo::profile::base::aodh::api' do
shared_examples_for 'tripleo::profile::base::aodh::api' do
let(:pre_condition) do
- "class { '::tripleo::profile::base::aodh': step => #{params[:step]}, rabbit_hosts => ['localhost.localdomain'] }"
+ "class { '::tripleo::profile::base::aodh': step => #{params[:step]}, oslomsg_rpc_hosts => ['localhost.localdomain'] }"
end
context 'with step less than 4' do
diff --git a/spec/classes/tripleo_profile_base_aodh_evaluator_spec.rb b/spec/classes/tripleo_profile_base_aodh_evaluator_spec.rb
index 495794d..ce8869e 100644
--- a/spec/classes/tripleo_profile_base_aodh_evaluator_spec.rb
+++ b/spec/classes/tripleo_profile_base_aodh_evaluator_spec.rb
@@ -19,7 +19,7 @@ require 'spec_helper'
describe 'tripleo::profile::base::aodh::evaluator' do
shared_examples_for 'tripleo::profile::base::aodh::evaluator' do
let(:pre_condition) do
- "class { '::tripleo::profile::base::aodh': step => #{params[:step]}, rabbit_hosts => ['localhost.localdomain'] }"
+ "class { '::tripleo::profile::base::aodh': step => #{params[:step]}, oslomsg_rpc_hosts => ['localhost.localdomain'] }"
end
context 'with step less than 4' do
diff --git a/spec/classes/tripleo_profile_base_aodh_listener_spec.rb b/spec/classes/tripleo_profile_base_aodh_listener_spec.rb
index 022ee5c..47f363e 100644
--- a/spec/classes/tripleo_profile_base_aodh_listener_spec.rb
+++ b/spec/classes/tripleo_profile_base_aodh_listener_spec.rb
@@ -19,7 +19,7 @@ require 'spec_helper'
describe 'tripleo::profile::base::aodh::listener' do
shared_examples_for 'tripleo::profile::base::aodh::listener' do
let(:pre_condition) do
- "class { '::tripleo::profile::base::aodh': step => #{params[:step]}, rabbit_hosts => ['localhost.localdomain'] }"
+ "class { '::tripleo::profile::base::aodh': step => #{params[:step]}, oslomsg_rpc_hosts => ['localhost.localdomain'] }"
end
context 'with step less than 4' do
diff --git a/spec/classes/tripleo_profile_base_aodh_notifier_spec.rb b/spec/classes/tripleo_profile_base_aodh_notifier_spec.rb
index f2116ca..6c16615 100644
--- a/spec/classes/tripleo_profile_base_aodh_notifier_spec.rb
+++ b/spec/classes/tripleo_profile_base_aodh_notifier_spec.rb
@@ -19,7 +19,7 @@ require 'spec_helper'
describe 'tripleo::profile::base::aodh::notifier' do
shared_examples_for 'tripleo::profile::base::aodh::notifier' do
let(:pre_condition) do
- "class { '::tripleo::profile::base::aodh': step => #{params[:step]}, rabbit_hosts => ['localhost.localdomain'] }"
+ "class { '::tripleo::profile::base::aodh': step => #{params[:step]}, oslomsg_rpc_hosts => ['localhost.localdomain'] }"
end
context 'with step less than 4' do
diff --git a/spec/classes/tripleo_profile_base_aodh_spec.rb b/spec/classes/tripleo_profile_base_aodh_spec.rb
index 3befa23..7ef49ec 100644
--- a/spec/classes/tripleo_profile_base_aodh_spec.rb
+++ b/spec/classes/tripleo_profile_base_aodh_spec.rb
@@ -34,12 +34,14 @@ describe 'tripleo::profile::base::aodh' do
let(:params) { {
:step => 3,
:bootstrap_node => 'node.example.com',
- :rabbit_hosts => ['localhost1.localdomain', 'localhost2.localdomain']
+ :oslomsg_rpc_hosts => [ '127.0.0.1' ],
+ :oslomsg_rpc_username => 'aodh',
+ :oslomsg_rpc_password => 'foo',
} }
it 'should trigger complete configuration' do
is_expected.to contain_class('aodh').with(
- :rabbit_hosts => params[:rabbit_hosts].map { |h| h + ":5672" }
+ :default_transport_url => 'rabbit://aodh:foo@127.0.0.1:5672/?ssl=0'
)
is_expected.to contain_class('aodh::auth')
is_expected.to contain_class('aodh::config')
@@ -67,12 +69,14 @@ describe 'tripleo::profile::base::aodh' do
let(:params) { {
:step => 4,
:bootstrap_node => 'somethingelse.example.com',
- :rabbit_hosts => ['localhost1.localdomain', 'localhost2.localdomain']
+ :oslomsg_rpc_hosts => [ '127.0.0.1' ],
+ :oslomsg_rpc_username => 'aodh',
+ :oslomsg_rpc_password => 'foo',
} }
it 'should trigger aodh configuration without mysql grant' do
is_expected.to contain_class('aodh').with(
- :rabbit_hosts => params[:rabbit_hosts].map { |h| h + ":5672" }
+ :default_transport_url => 'rabbit://aodh:foo@127.0.0.1:5672/?ssl=0'
)
is_expected.to contain_class('aodh::auth')
is_expected.to contain_class('aodh::config')
diff --git a/spec/classes/tripleo_profile_base_ceilometer_api_spec.rb b/spec/classes/tripleo_profile_base_ceilometer_api_spec.rb
index acc9b51..936df4f 100644
--- a/spec/classes/tripleo_profile_base_ceilometer_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_ceilometer_api_spec.rb
@@ -19,7 +19,7 @@ require 'spec_helper'
describe 'tripleo::profile::base::ceilometer::api' do
shared_examples_for 'tripleo::profile::base::ceilometer::api' do
let(:pre_condition) do
- "class { '::tripleo::profile::base::ceilometer': step => #{params[:step]}, rabbit_hosts => ['localhost.localdomain'] }"
+ "class { '::tripleo::profile::base::ceilometer': step => #{params[:step]}, oslomsg_rpc_hosts => ['localhost.localdomain'] }"
end
context 'with step less than 4' do
diff --git a/spec/classes/tripleo_profile_base_ceilometer_collector_spec.rb b/spec/classes/tripleo_profile_base_ceilometer_collector_spec.rb
index 2e4b50a..23b198a 100644
--- a/spec/classes/tripleo_profile_base_ceilometer_collector_spec.rb
+++ b/spec/classes/tripleo_profile_base_ceilometer_collector_spec.rb
@@ -19,7 +19,7 @@ require 'spec_helper'
describe 'tripleo::profile::base::ceilometer::collector' do
shared_examples_for 'tripleo::profile::base::ceilometer::collector' do
let(:pre_condition) do
- "class { '::tripleo::profile::base::ceilometer': step => #{params[:step]}, rabbit_hosts => ['localhost.localdomain'] }"
+ "class { '::tripleo::profile::base::ceilometer': step => #{params[:step]}, oslomsg_rpc_hosts => ['localhost.localdomain'] }"
end
context 'with step 3 on bootstrap node with mongodb' do
diff --git a/spec/classes/tripleo_profile_base_ceilometer_expirer_spec.rb b/spec/classes/tripleo_profile_base_ceilometer_expirer_spec.rb
index c13f3c8..b1567d0 100644
--- a/spec/classes/tripleo_profile_base_ceilometer_expirer_spec.rb
+++ b/spec/classes/tripleo_profile_base_ceilometer_expirer_spec.rb
@@ -19,7 +19,7 @@ require 'spec_helper'
describe 'tripleo::profile::base::ceilometer::expirer' do
shared_examples_for 'tripleo::profile::base::ceilometer::expirer' do
let(:pre_condition) do
- "class { '::tripleo::profile::base::ceilometer': step => #{params[:step]}, rabbit_hosts => ['localhost.localdomain'] }"
+ "class { '::tripleo::profile::base::ceilometer': step => #{params[:step]}, oslomsg_rpc_hosts => ['localhost.localdomain'] }"
end
context 'with step less than 4' do
diff --git a/spec/classes/tripleo_profile_base_ceilometer_spec.rb b/spec/classes/tripleo_profile_base_ceilometer_spec.rb
index 075aff8..9173203 100644
--- a/spec/classes/tripleo_profile_base_ceilometer_spec.rb
+++ b/spec/classes/tripleo_profile_base_ceilometer_spec.rb
@@ -30,12 +30,14 @@ describe 'tripleo::profile::base::ceilometer' do
context 'with step 3' do
let(:params) { {
:step => 3,
- :rabbit_hosts => ['localhost1.localdomain', 'localhost2.localdomain']
+ :oslomsg_rpc_hosts => [ '127.0.0.1' ],
+ :oslomsg_rpc_username => 'ceilometer',
+ :oslomsg_rpc_password => 'foo',
} }
it 'should trigger complete configuration' do
is_expected.to contain_class('ceilometer').with(
- :rabbit_hosts => params[:rabbit_hosts].map{ |h| h + ':5672' }
+ :default_transport_url => 'rabbit://ceilometer:foo@127.0.0.1:5672/?ssl=0'
)
is_expected.to contain_class('ceilometer::config')
end
diff --git a/spec/classes/tripleo_profile_base_cinder_api_spec.rb b/spec/classes/tripleo_profile_base_cinder_api_spec.rb
index 6a36632..03e2fd0 100644
--- a/spec/classes/tripleo_profile_base_cinder_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_api_spec.rb
@@ -19,7 +19,7 @@ require 'spec_helper'
describe 'tripleo::profile::base::cinder::api' do
shared_examples_for 'tripleo::profile::base::cinder::api' do
let(:pre_condition) do
- "class { '::tripleo::profile::base::cinder': step => #{params[:step]}, rabbit_hosts => ['127.0.0.1'] }"
+ "class { '::tripleo::profile::base::cinder': step => #{params[:step]}, oslomsg_rpc_hosts => ['127.0.0.1'] }"
end
context 'with step less than 3' do
diff --git a/spec/classes/tripleo_profile_base_cinder_backup_ceph_spec.rb b/spec/classes/tripleo_profile_base_cinder_backup_ceph_spec.rb
index 46c3d15..2f90692 100644
--- a/spec/classes/tripleo_profile_base_cinder_backup_ceph_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_backup_ceph_spec.rb
@@ -20,7 +20,7 @@ describe 'tripleo::profile::base::cinder::backup::ceph' do
shared_examples_for 'tripleo::profile::base::cinder::backup::ceph' do
let(:pre_condition) do
<<-EOF
- class { '::tripleo::profile::base::cinder': step => #{params[:step]}, rabbit_hosts => ['127.0.0.1'] }
+ class { '::tripleo::profile::base::cinder': step => #{params[:step]}, oslomsg_rpc_hosts => ['127.0.0.1'] }
class { '::tripleo::profile::base::cinder::backup': step => #{params[:step]} }
EOF
end
diff --git a/spec/classes/tripleo_profile_base_cinder_backup_spec.rb b/spec/classes/tripleo_profile_base_cinder_backup_spec.rb
index 0e15c9a..ad5a277 100644
--- a/spec/classes/tripleo_profile_base_cinder_backup_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_backup_spec.rb
@@ -19,7 +19,7 @@ require 'spec_helper'
describe 'tripleo::profile::base::cinder::backup' do
shared_examples_for 'tripleo::profile::base::cinder::backup' do
let(:pre_condition) do
- "class { '::tripleo::profile::base::cinder': step => #{params[:step]}, rabbit_hosts => ['127.0.0.1'] }"
+ "class { '::tripleo::profile::base::cinder': step => #{params[:step]}, oslomsg_rpc_hosts => ['127.0.0.1'] }"
end
context 'with step less than 4' do
diff --git a/spec/classes/tripleo_profile_base_cinder_backup_swift_spec.rb b/spec/classes/tripleo_profile_base_cinder_backup_swift_spec.rb
index 2c9d71f..230d766 100644
--- a/spec/classes/tripleo_profile_base_cinder_backup_swift_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_backup_swift_spec.rb
@@ -20,7 +20,7 @@ describe 'tripleo::profile::base::cinder::backup::swift' do
shared_examples_for 'tripleo::profile::base::cinder::backup::swift' do
let(:pre_condition) do
<<-EOF
- class { '::tripleo::profile::base::cinder': step => #{params[:step]}, rabbit_hosts => ['127.0.0.1'] }
+ class { '::tripleo::profile::base::cinder': step => #{params[:step]}, oslomsg_rpc_hosts => ['127.0.0.1'] }
class { '::tripleo::profile::base::cinder::backup': step => #{params[:step]} }
EOF
end
diff --git a/spec/classes/tripleo_profile_base_cinder_scheduler_spec.rb b/spec/classes/tripleo_profile_base_cinder_scheduler_spec.rb
index cd044ee..0333b1f 100644
--- a/spec/classes/tripleo_profile_base_cinder_scheduler_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_scheduler_spec.rb
@@ -19,7 +19,7 @@ require 'spec_helper'
describe 'tripleo::profile::base::cinder::scheduler' do
shared_examples_for 'tripleo::profile::base::cinder::scheduler' do
let(:pre_condition) do
- "class { '::tripleo::profile::base::cinder': step => #{params[:step]}, rabbit_hosts => ['127.0.0.1'] }"
+ "class { '::tripleo::profile::base::cinder': step => #{params[:step]}, oslomsg_rpc_hosts => ['127.0.0.1'] }"
end
context 'with step less than 4' do
diff --git a/spec/classes/tripleo_profile_base_cinder_spec.rb b/spec/classes/tripleo_profile_base_cinder_spec.rb
index 81fa047..d22357d 100644
--- a/spec/classes/tripleo_profile_base_cinder_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_spec.rb
@@ -31,15 +31,17 @@ describe 'tripleo::profile::base::cinder' do
context 'with step 3 on bootstrap node' do
let(:params) { {
- :step => 3,
- :bootstrap_node => 'node.example.com',
- :rabbit_hosts => ['127.0.0.1', '127.0.0.2'],
- :rabbit_port => '1234'
+ :step => 3,
+ :bootstrap_node => 'node.example.com',
+ :oslomsg_rpc_hosts => [ '127.0.0.1' ],
+ :oslomsg_rpc_username => 'cinder',
+ :oslomsg_rpc_password => 'foo',
+ :oslomsg_rpc_port => '1234'
} }
it 'should trigger complete configuration' do
is_expected.to contain_class('cinder').with(
- :rabbit_hosts => params[:rabbit_hosts].map{ |h| "#{h}:#{params[:rabbit_port]}" }
+ :default_transport_url => 'rabbit://cinder:foo@127.0.0.1:1234/?ssl=0'
)
is_expected.to contain_class('cinder::config')
is_expected.to contain_class('cinder::glance')
@@ -63,15 +65,17 @@ describe 'tripleo::profile::base::cinder' do
context 'with step 4 on other node' do
let(:params) { {
- :step => 4,
- :bootstrap_node => 'somethingelse.example.com',
- :rabbit_hosts => ['127.0.0.1', '127.0.0.2'],
- :rabbit_port => '5672'
+ :step => 4,
+ :bootstrap_node => 'somethingelse.example.com',
+ :oslomsg_rpc_hosts => [ '127.0.0.1' ],
+ :oslomsg_rpc_username => 'cinder',
+ :oslomsg_rpc_password => 'foo',
+ :oslomsg_rpc_port => '5672',
} }
it 'should trigger cinder configuration without mysql grant' do
is_expected.to contain_class('cinder').with(
- :rabbit_hosts => params[:rabbit_hosts].map{ |h| "#{h}:#{params[:rabbit_port]}" }
+ :default_transport_url => 'rabbit://cinder:foo@127.0.0.1:5672/?ssl=0'
)
is_expected.to contain_class('cinder::config')
is_expected.to contain_class('cinder::glance')
@@ -81,14 +85,16 @@ describe 'tripleo::profile::base::cinder' do
context 'with step 5' do
let(:params) { {
- :step => 5,
- :bootstrap_node => 'node.example.com',
- :rabbit_hosts => ['127.0.0.1', '127.0.0.2']
+ :step => 5,
+ :bootstrap_node => 'node.example.com',
+ :oslomsg_rpc_hosts => [ '127.0.0.1' ],
+ :oslomsg_rpc_username => 'cinder',
+ :oslomsg_rpc_password => 'foo',
} }
it 'should trigger complete configuration' do
is_expected.to contain_class('cinder').with(
- :rabbit_hosts => params[:rabbit_hosts].map{ |h| "#{h}:5672" }
+ :default_transport_url => 'rabbit://cinder:foo@127.0.0.1:5672/?ssl=0'
)
is_expected.to contain_class('cinder::config')
is_expected.to contain_class('cinder::glance')
@@ -98,15 +104,17 @@ describe 'tripleo::profile::base::cinder' do
context 'with step 5 without db_purge' do
let(:params) { {
- :step => 5,
- :bootstrap_node => 'node.example.com',
- :rabbit_hosts => ['127.0.0.1', '127.0.0.2'],
+ :step => 5,
+ :bootstrap_node => 'node.example.com',
+ :oslomsg_rpc_hosts => [ '127.0.0.1' ],
+ :oslomsg_rpc_username => 'cinder',
+ :oslomsg_rpc_password => 'foo',
:cinder_enable_db_purge => false
} }
it 'should trigger complete configuration' do
is_expected.to contain_class('cinder').with(
- :rabbit_hosts => params[:rabbit_hosts].map{ |h| "#{h}:5672" }
+ :default_transport_url => 'rabbit://cinder:foo@127.0.0.1:5672/?ssl=0'
)
is_expected.to contain_class('cinder::config')
is_expected.to contain_class('cinder::glance')
diff --git a/spec/classes/tripleo_profile_base_cinder_volume_spec.rb b/spec/classes/tripleo_profile_base_cinder_volume_spec.rb
index f4501c8..1542a49 100644
--- a/spec/classes/tripleo_profile_base_cinder_volume_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_volume_spec.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
#
# Copyright (C) 2016 Red Hat, Inc.
#
@@ -27,7 +28,7 @@ describe 'tripleo::profile::base::cinder::volume' do
end
let(:pre_condition) do
- "class { '::tripleo::profile::base::cinder': step => #{params[:step]}, rabbit_hosts => ['127.0.0.1'] }"
+ "class { '::tripleo::profile::base::cinder': step => #{params[:step]}, oslomsg_rpc_hosts => ['127.0.0.1'] }"
end
context 'with step less than 4' do
diff --git a/spec/classes/tripleo_profile_base_nova_api_spec.rb b/spec/classes/tripleo_profile_base_nova_api_spec.rb
index 2072438..070a1f1 100644
--- a/spec/classes/tripleo_profile_base_nova_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_api_spec.rb
@@ -22,9 +22,9 @@ describe 'tripleo::profile::base::nova::api' do
<<-eos
class { '::tripleo::profile::base::nova':
step => #{params[:step]},
- messaging_hosts => [ 'localhost' ],
- messaging_username => 'nova',
- messaging_password => 'foo'
+ oslomsg_rpc_hosts => [ 'localhost' ],
+ oslomsg_rpc_username => 'nova',
+ oslomsg_rpc_password => 'foo'
}
eos
end
diff --git a/spec/classes/tripleo_profile_base_nova_compute_ironic_spec.rb b/spec/classes/tripleo_profile_base_nova_compute_ironic_spec.rb
index 2155695..e916b41 100644
--- a/spec/classes/tripleo_profile_base_nova_compute_ironic_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_compute_ironic_spec.rb
@@ -35,7 +35,7 @@ describe 'tripleo::profile::base::nova::compute::ironic' do
<<-eos
class { '::tripleo::profile::base::nova':
step => #{params[:step]},
- messaging_hosts => [ '127.0.0.1' ],
+ oslomsg_rpc_hosts => [ '127.0.0.1' ],
}
class { '::tripleo::profile::base::nova::compute':
step => #{params[:step]},
diff --git a/spec/classes/tripleo_profile_base_nova_compute_libvirt_spec.rb b/spec/classes/tripleo_profile_base_nova_compute_libvirt_spec.rb
index 0b33123..32482a9 100644
--- a/spec/classes/tripleo_profile_base_nova_compute_libvirt_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_compute_libvirt_spec.rb
@@ -36,7 +36,7 @@ describe 'tripleo::profile::base::nova::compute::libvirt' do
<<-eos
class { '::tripleo::profile::base::nova':
step => #{params[:step]},
- messaging_hosts => [ '127.0.0.1' ],
+ oslomsg_rpc_hosts => [ '127.0.0.1' ],
}
class { '::tripleo::profile::base::nova::compute':
step => #{params[:step]},
diff --git a/spec/classes/tripleo_profile_base_nova_compute_spec.rb b/spec/classes/tripleo_profile_base_nova_compute_spec.rb
index a6fdbd6..d052682 100644
--- a/spec/classes/tripleo_profile_base_nova_compute_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_compute_spec.rb
@@ -37,7 +37,7 @@ describe 'tripleo::profile::base::nova::compute' do
<<-eos
class { '::tripleo::profile::base::nova':
step => #{params[:step]},
- messaging_hosts => [ '127.0.0.1' ],
+ oslomsg_rpc_hosts => [ '127.0.0.1' ],
}
eos
end
diff --git a/spec/classes/tripleo_profile_base_nova_conductor_spec.rb b/spec/classes/tripleo_profile_base_nova_conductor_spec.rb
index 8cdf8b0..dbb1ef0 100644
--- a/spec/classes/tripleo_profile_base_nova_conductor_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_conductor_spec.rb
@@ -22,7 +22,7 @@ describe 'tripleo::profile::base::nova::conductor' do
<<-eos
class { '::tripleo::profile::base::nova':
step => #{params[:step]},
- messaging_hosts => [ '127.0.0.1' ],
+ oslomsg_rpc_hosts => [ '127.0.0.1' ],
}
eos
end
diff --git a/spec/classes/tripleo_profile_base_nova_consoleauth_spec.rb b/spec/classes/tripleo_profile_base_nova_consoleauth_spec.rb
index e8a2dff..29b9550 100644
--- a/spec/classes/tripleo_profile_base_nova_consoleauth_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_consoleauth_spec.rb
@@ -34,7 +34,7 @@ describe 'tripleo::profile::base::nova::consoleauth' do
<<-eos
class { '::tripleo::profile::base::nova':
step => #{params[:step]},
- messaging_hosts => [ '127.0.0.1' ],
+ oslomsg_rpc_hosts => [ '127.0.0.1' ],
}
eos
end
diff --git a/spec/classes/tripleo_profile_base_nova_libvirt_spec.rb b/spec/classes/tripleo_profile_base_nova_libvirt_spec.rb
index d263a74..36a6110 100644
--- a/spec/classes/tripleo_profile_base_nova_libvirt_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_libvirt_spec.rb
@@ -37,7 +37,7 @@ describe 'tripleo::profile::base::nova::libvirt' do
<<-eos
class { '::tripleo::profile::base::nova':
step => #{params[:step]},
- messaging_hosts => [ '127.0.0.1' ],
+ oslomsg_rpc_hosts => [ '127.0.0.1' ],
}
eos
end
diff --git a/spec/classes/tripleo_profile_base_nova_scheduler_spec.rb b/spec/classes/tripleo_profile_base_nova_scheduler_spec.rb
index 87783c1..eb2372f 100644
--- a/spec/classes/tripleo_profile_base_nova_scheduler_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_scheduler_spec.rb
@@ -35,7 +35,7 @@ describe 'tripleo::profile::base::nova::scheduler' do
<<-eos
class { '::tripleo::profile::base::nova':
step => #{params[:step]},
- messaging_hosts => [ '127.0.0.1' ],
+ oslomsg_rpc_hosts => [ '127.0.0.1' ],
}
eos
end
diff --git a/spec/classes/tripleo_profile_base_nova_spec.rb b/spec/classes/tripleo_profile_base_nova_spec.rb
index 68b01e9..b5677cc 100644
--- a/spec/classes/tripleo_profile_base_nova_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_spec.rb
@@ -22,8 +22,8 @@ describe 'tripleo::profile::base::nova' do
context 'with step less than 3' do
let(:params) { {
:step => 1,
- :messaging_hosts => [ 'localhost' ],
- :messaging_password => 'foo'
+ :oslomsg_rpc_hosts => [ 'localhost' ],
+ :oslomsg_rpc_password => 'foo'
} }
it {
@@ -38,9 +38,9 @@ describe 'tripleo::profile::base::nova' do
let(:params) { {
:step => 3,
:bootstrap_node => 'node.example.com',
- :messaging_hosts => [ 'localhost' ],
- :messaging_username => 'nova',
- :messaging_password => 'foo',
+ :oslomsg_rpc_hosts => [ 'localhost' ],
+ :oslomsg_rpc_username => 'nova',
+ :oslomsg_rpc_password => 'foo',
} }
it {
@@ -62,8 +62,8 @@ describe 'tripleo::profile::base::nova' do
let(:params) { {
:step => 3,
:bootstrap_node => 'other.example.com',
- :messaging_hosts => [ 'localhost' ],
- :messaging_password => 'foo'
+ :oslomsg_rpc_hosts => [ 'localhost' ],
+ :oslomsg_rpc_password => 'foo'
} }
it {
@@ -79,8 +79,8 @@ describe 'tripleo::profile::base::nova' do
let(:params) { {
:step => 4,
:bootstrap_node => 'other.example.com',
- :messaging_hosts => [ 'localhost' ],
- :messaging_password => 'foo',
+ :oslomsg_rpc_hosts => [ 'localhost' ],
+ :oslomsg_rpc_password => 'foo',
} }
it {
@@ -103,8 +103,8 @@ describe 'tripleo::profile::base::nova' do
:manage_migration => true,
:nova_compute_enabled => true,
:bootstrap_node => 'node.example.com',
- :messaging_hosts => [ 'localhost' ],
- :messaging_password => 'foo',
+ :oslomsg_rpc_hosts => [ 'localhost' ],
+ :oslomsg_rpc_password => 'foo',
} }
it {
diff --git a/spec/classes/tripleo_profile_base_nova_vncproxy_spec.rb b/spec/classes/tripleo_profile_base_nova_vncproxy_spec.rb
index f077875..902b27c 100644
--- a/spec/classes/tripleo_profile_base_nova_vncproxy_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_vncproxy_spec.rb
@@ -34,7 +34,7 @@ describe 'tripleo::profile::base::nova::vncproxy' do
<<-eos
class { '::tripleo::profile::base::nova':
step => #{params[:step]},
- messaging_hosts => [ '127.0.0.1' ],
+ oslomsg_rpc_hosts => [ '127.0.0.1' ],
}
eos
end
diff --git a/spec/classes/tripleo_profile_base_octavia_api_spec.rb b/spec/classes/tripleo_profile_base_octavia_api_spec.rb
index e94e00c..abc0111 100644
--- a/spec/classes/tripleo_profile_base_octavia_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_octavia_api_spec.rb
@@ -33,9 +33,9 @@ describe 'tripleo::profile::base::octavia::api' do
<<-eos
class { 'tripleo::profile::base::octavia' :
step => #{params[:step]},
- rabbit_user => 'bugs',
- rabbit_password => 'rabbits_R_c00l',
- rabbit_hosts => ['hole.field.com']
+ oslomsg_rpc_username => 'bugs',
+ oslomsg_rpc_password => 'rabbits_R_c00l',
+ oslomsg_rpc_hosts => ['hole.field.com']
}
class { 'octavia::db::mysql':
password => 'some_password'
diff --git a/spec/classes/tripleo_profile_base_octavia_spec.rb b/spec/classes/tripleo_profile_base_octavia_spec.rb
index 89820ef..0070621 100644
--- a/spec/classes/tripleo_profile_base_octavia_spec.rb
+++ b/spec/classes/tripleo_profile_base_octavia_spec.rb
@@ -19,7 +19,7 @@ require 'spec_helper'
describe 'tripleo::profile::base::octavia' do
let :params do
- { :rabbit_hosts => ['some.server.com'],
+ { :oslomsg_rpc_hosts => ['some.server.com'],
:step => 5
}
end
@@ -44,7 +44,7 @@ describe 'tripleo::profile::base::octavia' do
it 'should provide basic initialization' do
is_expected.to contain_class('octavia').with(
- :default_transport_url => 'rabbit://some.server.com:5672/'
+ :default_transport_url => 'rabbit://guest:password@some.server.com:5672/?ssl=0'
)
is_expected.to contain_class('octavia::config')
end
@@ -52,24 +52,24 @@ describe 'tripleo::profile::base::octavia' do
context 'with multiple hosts' do
before do
- params.merge!({ :rabbit_hosts => ['some.server.com', 'someother.server.com'] })
+ params.merge!({ :oslomsg_rpc_hosts => ['some.server.com', 'someother.server.com'] })
end
it 'should construct a multihost URL' do
is_expected.to contain_class('octavia').with(
- :default_transport_url => 'rabbit://some.server.com:5672,someother.server.com:5672/'
+ :default_transport_url => 'rabbit://guest:password@some.server.com:5672,guest:password@someother.server.com:5672/?ssl=0'
)
end
end
context 'with username provided' do
before do
- params.merge!({ :rabbit_user => 'bunny' })
+ params.merge!({ :oslomsg_rpc_username => 'bunny' })
end
it 'should construct URL with username' do
is_expected.to contain_class('octavia').with(
- :default_transport_url => 'rabbit://bunny@some.server.com:5672/'
+ :default_transport_url => 'rabbit://bunny:password@some.server.com:5672/?ssl=0'
)
end
end
@@ -77,15 +77,15 @@ describe 'tripleo::profile::base::octavia' do
context 'with username and password provided' do
before do
params.merge!(
- { :rabbit_user => 'bunny',
- :rabbit_password => 'carrot'
+ { :oslomsg_rpc_username => 'bunny',
+ :oslomsg_rpc_password => 'carrot'
}
)
end
it 'should construct URL with username and password' do
is_expected.to contain_class('octavia').with(
- :default_transport_url => 'rabbit://bunny:carrot@some.server.com:5672/'
+ :default_transport_url => 'rabbit://bunny:carrot@some.server.com:5672/?ssl=0'
)
end
end
@@ -93,16 +93,16 @@ describe 'tripleo::profile::base::octavia' do
context 'with multiple hosts and user info provided' do
before do
params.merge!(
- { :rabbit_hosts => ['some.server.com', 'someother.server.com'],
- :rabbit_user => 'bunny',
- :rabbit_password => 'carrot'
+ { :oslomsg_rpc_hosts => ['some.server.com', 'someother.server.com'],
+ :oslomsg_rpc_username => 'bunny',
+ :oslomsg_rpc_password => 'carrot'
}
)
end
it 'should distributed user info across hosts URL' do
is_expected.to contain_class('octavia').with(
- :default_transport_url => 'rabbit://bunny:carrot@some.server.com:5672,bunny:carrot@someother.server.com:5672/'
+ :default_transport_url => 'rabbit://bunny:carrot@some.server.com:5672,bunny:carrot@someother.server.com:5672/?ssl=0'
)
end
end
diff --git a/spec/fixtures/hieradata/default.yaml b/spec/fixtures/hieradata/default.yaml
index 4d5dc99..eadb444 100644
--- a/spec/fixtures/hieradata/default.yaml
+++ b/spec/fixtures/hieradata/default.yaml
@@ -3,14 +3,18 @@ my_hash:
network: '127.0.0.1'
not_hash: string
# aodh profile required hieradata
+aodh::rabbit_password: 'password'
aodh_redis_password: 'password'
redis_vip: '127.0.0.1'
aodh::auth::auth_password: 'password'
aodh::db::mysql::password: 'password'
aodh::keystone::authtoken::password: 'password'
# babican profile required hieradata
+barbican::api::rabbit_password: 'password'
barbican::db::mysql::password: 'password'
barbican::keystone::authtoken::password: 'password'
+# ceilometer related items
+ceilometer::rabbit_password: 'password'
ceilometer::keystone::authtoken::password: 'password'
# ceph related items
ceph::profile::params::mon_key: 'password'
@@ -33,3 +37,5 @@ memcached_node_ips_v6:
- '::1'
memcached_node_ips:
- '127.0.0.1'
+# octavia related items
+octavia::rabbit_password: 'password'