openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Fixup tests for puppet 6"

This commit is contained in:
Zuul 2019-04-26 03:44:05 +00:00 committed by Gerrit Code Review
parent e0677e0b1a 9de8c4eb38
commit 58d4e0707e
5 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Puppetfile_extras
View File

@ -89,3 +89,8 @@ mod 'keepalived',
mod 'redis',
:git => 'https://github.com/arioch/puppet-redis',
:ref => 'v3.3.0'
# NOTE(aschultz): in puppet 6 this was extracted out
mod 'selinux_core',
:git => 'https://github.com/puppetlabs/puppetlabs-selinux_core',
:ref => 'master'

7
spec/classes/tripleo_haproxy_spec.rb
View File

@ -21,7 +21,8 @@ describe 'tripleo::haproxy' do
shared_examples_for 'tripleo::haproxy' do
let :params do {
:controller_virtual_ip => '10.1.0.1',
:public_virtual_ip => '192.168.0.1'
:public_virtual_ip => '192.168.0.1',
:mysql_max_conn => 100
}
end
@ -31,7 +32,7 @@ describe 'tripleo::haproxy' do
:options => {
'timeout client' => "90m",
'timeout server' => "90m",
'maxconn' => :undef
'maxconn' => 100
}
)
end
@ -52,7 +53,7 @@ describe 'tripleo::haproxy' do
'timeout server' => "90m",
'stick-table' => "type ip size 1000",
'stick' => "on dst",
'maxconn' => :undef
'maxconn' => 100
}
)
end

14
spec/defines/tripleo_haproxy_endpoint_spec.rb
View File

@ -25,10 +25,8 @@ describe 'tripleo::haproxy::endpoint' do
it 'should configure haproxy' do
is_expected.to contain_haproxy__listen('neutron').with(
:collect_exported => false,
:bind => [
['10.0.0.1:9696', ['transparent']],
['192.168.0.1:9696', ['transparent']]
],
:bind => { "10.0.0.1:9696" => ["transparent"],
"192.168.0.1:9696" => ["transparent"] },
:options => {'option' => [],
'timeout client' => '90m',
'timeout server' => '90m',
@ -46,11 +44,9 @@ describe 'tripleo::haproxy::endpoint' do
it 'should configure haproxy' do
is_expected.to contain_haproxy__listen('neutron').with(
:collect_exported => false,
:bind => [
['10.0.0.1:9696', ['transparent']],
['fd00:fd00:fd00:2000::14:9696', ['transparent']],
['192.168.0.1:9696', ['transparent']]
]
:bind => { "10.0.0.1:9696" => ["transparent"],
"fd00:fd00:fd00:2000::14:9696" => ["transparent"],
"192.168.0.1:9696" => ["transparent"] },
)
end
end

25
spec/fixtures/hieradata/default.yaml vendored
View File

@ -2,15 +2,16 @@
my_hash:
network: '127.0.0.1'
not_hash: string
bootstrap_nodeid: node
# aodh profile required hieradata
aodh_api_bootstrap_node_name: node
aodh::rabbit_password: 'password'
aodh_redis_password: 'password'
redis_vip: '127.0.0.1'
redis::bind: '10.0.0.1'
aodh::auth::auth_password: 'password'
aodh::db::mysql::password: 'password'
aodh::keystone::authtoken::password: 'password'
# barbican profile required hieradata
barbican_api_bootstrap_node_name: node
barbican::api::rabbit_password: 'password'
barbican::db::mysql::password: 'password'
barbican::keystone::authtoken::password: 'password'
@ -26,6 +27,7 @@ ceph::profile::params::rgw_keystone_admin_project: 'keystone_project'
ceph::profile::params::rgw_keystone_admin_user: 'keystone_admin_user'
ceph::profile::params::rgw_keystone_admin_password: 'keystone_admin_password'
# cinder related items
cinder_api_short_bootstrap_node_name: node
cinder_backup_short_bootstrap_node_name: 'node.example.com'
cinder_backup_short_node_names:
- 'node.example.com'
@ -38,12 +40,15 @@ cinder::backup::nfs::backup_share: '/mnt/backup'
cinder::rabbit_password: 'password'
cinder::keystone::authtoken::password: 'password'
# gnocchi related items
gnocchi_api_short_bootstrap_node_name: node
gnocchi::keystone::authtoken::password: 'password'
gnocchi::storage::ceph::ceph_username: 'gnocchi'
gnocchi::storage::ceph::ceph_secret: 'password'
# haproxy related items
mysql_enabled: true
controller_node_ips: '10.1.0.1,10.1.0.2'
# mysql related
mysql_short_bootstrap_node_name: node
# manila related items
manila::rabbit_password: 'password'
manila::backend::cephfs::cephfs_protocol_helper_type: 'NFS'
@ -51,11 +56,18 @@ manila_share_short_bootstrap_node_name: 'node.example.com'
manila_share_short_node_names:
- 'manila-1'
- 'manila-2'
manila_api_short_bootstrap_node_name: node
# nova related items
ec2_api_short_bootstrap_node_name: node
nova_api_short_bootstrap_node_name: node
nova_metadata_short_bootstrap_node_name: node
nova_placement_short_bootstrap_node_name: node
nova::rabbit_password: 'password'
nova::keystone::authtoken::password: 'password'
nova::network::neutron::neutron_password: 'password'
# placement related items
placement_api_short_bootstrap_node_name: node
placement_short_bootstrap_node_name: node
placement::rabbit_password: 'password'
placement::keystone::authtoken::password: 'password'
# memcache related items
@ -65,6 +77,8 @@ memcached_node_ips:
- '127.0.0.1'
# octavia related items
octavia::rabbit_password: 'password'
# horizon related
horizon_short_bootstrap_node_name: node
horizon::secret_key: 'secrete'
horizon_node_ips:
- '127.0.0.1'
@ -128,8 +142,13 @@ tripleo::haproxy_basic_auth::haproxy_userlists:
- 'luke insecure-password jedi'
- 'anakin insecure-password darthvador'
- 'sith password $5$h9LsKUOeCr$UlD62CNEpuZQkGYdBoiFJLsM6TlXluRLBlhEnpjDdaC'
# redis related
redis_short_bootstrap_node_name: node
redis_vip: '127.0.0.1'
redis::bind: '10.0.0.1'
# OpenDaylight
neutron::plugins::ovs::opendaylight::odl_port: '8081'
neutron::plugins::ovs::opendaylight::odl_username: 'admin'
neutron::plugins::ovs::opendaylight::odl_password: 'admin'
# swift related
swift_proxy_short_bootstrap_node_name: node

3
zuul.d/layout.yaml
View File

@ -4,8 +4,7 @@
jobs:
- puppet-openstack-unit-4.8-centos-7
- puppet-openstack-unit-5.5-centos-7
- puppet-openstack-unit-6.0-ubuntu-bionic:
voting: false
- puppet-openstack-unit-6.0-ubuntu-bionic
- puppet-openstack-unit-latest-ubuntu-bionic:
voting: false
gate: