Add Designate test coverage to scenario003 

This adds Designate test coverage with puppet-designate
to scenario003 with the BIND backend.
Change-Id: I06651552f6b9238a46c9d27bca4e30de9853da82
This commit is contained in:
David Moreau-Simard
2016年07月05日 16:45:23 -04:00
parent c594d0f1ef
commit 52d8fe5465

View File

@@ -212,7 +212,7 @@ mod 'python',
mod 'dns',
:git => 'https://github.com/theforeman/puppet-dns',
:ref => '3.4.0'
:ref => '3.4.1'
mod 'corosync',
:git => 'https://github.com/voxpupuli/puppet-corosync',

View File

@@ -44,6 +44,7 @@ scenario](#all-in-one).
| cinder | rbd | iscsi | | iscsi |
| ceilometer | X | | | |
| aodh | X | | | |
| designate | | | bind | |
| gnocchi | rbd | | | |
| heat | | | X | |
| swift | | X | | |

View File

@@ -70,12 +70,14 @@ include ::openstack_integration::heat
#enablewhenwefigurewhymistraltempesttestsaresounstable
#include::openstack_integration::mistral
include::openstack_integration::sahara
include::openstack_integration::designate
include::openstack_integration::provision
class{ '::openstack_integration::tempest':
trove => $trove_enabled,
mistral => $mistral_enabled,
sahara => true,
horizon => true,
heat => true,
designate => true,
trove => $trove_enabled,
mistral => $mistral_enabled,
sahara => true,
horizon => true,
heat => true,
}

49
manifests/bind.pp Normal file
View File

@@ -0,0 +1,49 @@
#ConfigurestheBINDserviceforusewithDesignate'sBINDbackend
#
classopenstack_integration::bind{
include ::openstack_integration::config
include ::openstack_integration::params
# Need some particular options that aren't default in ::dns when using
# designate with bind9 backend. Set them up.
$controls = {
"${::openstack_integration::config::host}"=>{
'port' => 953,
'allowed_addresses' => [ $::openstack_integration::config::host ],
'keys' => [ 'rndc-key' ]
},
}
#NOTE(dmsimard):listen_on_v6isfalseandoverriddenduetoextendedport
#configurationinadditional_options
class{ '::dns':
recursion => 'no',
allow_recursion => [],
controls => $controls,
listen_on_v6 => false,
additional_options => {
'listen-on' => 'port 5322 { any; }',
'listen-on-v6'=>'port 5322 { any; }',
'auth-nxdomain'=>'no',
}
}
#/var/namedisroot:namedonRedHatand/var/cache/bindisroot:bindon
#Debian.Bothgroupsonlyhavereadaccessbutrequirewritepermissionin
#ordertobeabletouserndcaddzone/delzonecommandsthatDesignateuses.
file{ $::dns::params::vardir:
mode => 'g+w',
require => Package[$dns::params::dns_server_package]
}
#::dnscreatestherndckeybutnotarndc.conf.
#Contributethisinupstream::dns?
file{ '/etc/rndc.conf':
ensure => present,
owner => $::dns::params::owner,
group => $::dns::params::group,
content => template("${module_name}/rndc.conf.erb"),
require=>Package[$dns::params::dns_server_package]
}
}

116
manifests/designate.pp Normal file
View File

@@ -0,0 +1,116 @@
#ConfiguretheDesignateservice
#
classopenstack_integration::designate{
include ::openstack_integration::config
include ::openstack_integration::params
include ::openstack_integration::bind
rabbitmq_user { 'designate':
admin => true,
password => 'an_even_bigger_secret',
provider => 'rabbitmqctl',
require => Class['::rabbitmq'],
}
rabbitmq_user_permissions{ 'designate@/':
configure_permission => '.*',
write_permission => '.*',
read_permission => '.*',
provider => 'rabbitmqctl',
require => Class['::rabbitmq'],
}
class{ '::designate::db::mysql':
password => 'designate',
}
class{ '::designate':
rabbit_userid => 'designate',
rabbit_password => 'an_even_bigger_secret',
rabbit_host => $::openstack_integration::config::ip_for_url,
rabbit_port => $::openstack_integration::config::rabbit_port,
rabbit_use_ssl => $::openstack_integration::config::ssl,
debug => true,
}
class{ '::designate::db':
database_connection => 'mysql+pymysql://designate:designate@127.0.0.1/designate?charset=utf8'
}
include'::designate::client'
#TODO:SupportSSL
class{ '::designate::keystone::auth':
password => 'a_big_secret',
public_url => "http://${::openstack_integration::config::ip_for_url}:9001",
internal_url=>"http://${::openstack_integration::config::ip_for_url}:9001",
admin_url=>"http://${::openstack_integration::config::ip_for_url}:9001",
}
class{ '::designate::keystone::authtoken':
password => 'a_big_secret',
user_domain_name => 'Default',
project_domain_name => 'Default',
auth_url => $::openstack_integration::config::keystone_admin_uri,
auth_uri => $::openstack_integration::config::keystone_auth_uri,
memcached_servers => $::openstack_integration::config::memcached_servers,
}
class{ '::designate::api':
api_host => $::openstack_integration::config::host,
api_base_uri => "http://${::openstack_integration::config::ip_for_url}:9001",
auth_strategy=>'keystone',
enable_api_v2=>true,
enable_api_admin=>true
}
#IPv6doesn'tworkformdns?https://bugs.launchpad.net/designate/+bug/1501396
class{ '::designate::mdns':
host => '127.0.0.1',
port => '5354',
}
class{ '::designate::central':
backend_driver => 'bind9',
}
class{ '::designate::pool_manager':
pool_id => '794ccc2c-d751-44fe-b57f-8894c9f5c842',
}
class{ '::designate::pool_manager_cache::memcache':
memcached_servers => $::openstack_integration::config::memcached_servers,
}
class{ '::designate::backend::bind9':
rndc_host => $::openstack_integration::config::host,
rndc_config_file => '/etc/rndc.conf',
rndc_key_file => $::dns::params::rndckeypath,
}
#TODO:Implementpools.yamlmanagementinpuppet-designate
file{ '/etc/designate/pools.yaml':
ensure => present,
content => template("${module_name}/pools.yaml.erb"),
require=>Package['designate-common'],
}
#Validatethatdesignate-centralisreadyforpoolupdate
$command="openstack--os-auth-url${::openstack_integration::config::keystone_auth_uri}\
--os-project-nameservices--os-usernamedesignate--os-passworda_big_secretzonelist"
openstacklib::service_validation{ 'designate-central':
command => $command,
timeout => '15',
refreshonly => true,
require => Service['designate-central']
}
exec{ 'Update designate pools':
command => 'designate-manage pool update --file /etc/designate/pools.yaml',
path => '/usr/bin',
refreshonly => true,
logoutput => 'on_failure',
subscribe => File['/etc/designate/pools.yaml'],
require => Openstacklib::Service_validation['designate-central']
}
}

View File

@@ -12,6 +12,10 @@
#(optional)DefineifCinderneedstobetested.
#Defaulttofalse.
#
#[*designate*]
#(optional)DefineifDesignateneedstobetested.
#Defaulttofalse.
#
#[*glance*]
#(optional)DefineifGlanceneedstobetested.
#Defaulttotrue.
@@ -68,6 +72,7 @@ class openstack_integration::tempest (
$aodh=false,
$ceilometer=false,
$cinder=false,
$designate=false,
$glance=true,
$gnocchi=false,
$heat=false,
@@ -116,6 +121,7 @@ class openstack_integration::tempest (
image_name=>'cirros',
image_name_alt=>'cirros_alt',
cinder_available=>$cinder,
designate_available=>$designate,
glance_available=>$glance,
horizon_available=>$horizon,
nova_available=>$nova,

29
templates/pools.yaml.erb Normal file
View File

@@ -0,0 +1,29 @@
---
- name: default
description: Puppet BIND Pool
attributes: {}
ns_records:
- hostname: ns1.example.org.
priority: 1
nameservers:
- host: <%= scope.lookupvar("openstack_integration::config::host") %>
port: 5322
targets:
- type: bind9
description: BIND Instance
masters:
# mdns doesn't support ipv6
- host: 127.0.0.1
port: 5354
options:
host: <%= scope.lookupvar("openstack_integration::config::host") %>
port: 5322
rndc_host: <%= scope.lookupvar("openstack_integration::config::host") %>
rndc_port: 953
rndc_config_file: /etc/rndc.conf
rndc_key_file: /etc/rndc.key

6
templates/rndc.conf.erb Normal file
View File

@@ -0,0 +1,6 @@
include "/etc/rndc.key";
options {
default-key "rndc-key";
default-server <%= scope.lookupvar("openstack_integration::config::host") %>;
default-port 953;
};
Reference in New Issue
openstack/puppet-openstack-integration
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.

The note is not visible to the blocked user.