openstack
/
puppet-openstack-integration
Code Issues Proposed changes

Re-enable Designate on CentOS7 

A fix was merged in Designate to not depend on Monasca:
https://review.openstack.org/#/c/389800/

This patch re-enable Designate testing on CentOS for Ocata.
Though we disable IPv6 which seems broken at this time.

Change-Id: Ia916cb10ced94d03003e131228ec645d76616ae9
This commit is contained in:
Emilien Macchi 2016-11-04 08:19:35 -04:00
parent 9e8634014c
commit a1f39858b4
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fixtures/scenario003.pp
View File

@ -44,9 +44,7 @@ if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease
} else {
$ssl_enabled = true
$neutron_plugin = 'linuxbridge'
# Designate packaging in Ocata is missing monasca dependencies.
# Until it's fixed, let's disable it.
$designate_enabled = false
$designate_enabled = true
}
include ::openstack_integration

4
manifests/bind.pp
View File

@ -9,9 +9,9 @@ class openstack_integration::bind {
# Need some particular options that aren't default in ::dns when using
# designate with bind9 backend. Set them up.
$controls = {
"${::openstack_integration::config::host}" => {
'127.0.0.1' => {
'port' => 953,
'allowed_addresses' => [ $::openstack_integration::config::host ],
'allowed_addresses' => [ '127.0.0.1' ],
'keys' => [ 'rndc-key' ]
},
}

4
manifests/designate.pp
View File

@ -66,7 +66,7 @@ class openstack_integration::designate {
}
class { '::designate::api':
listen => "${::openstack_integration::config::host}:9001",
listen => "${::openstack_integration::config::ip_for_url}:9001",
api_base_uri => "http://${::openstack_integration::config::ip_for_url}:9001",
auth_strategy => 'keystone',
enable_api_v2 => true,
@ -91,7 +91,7 @@ class openstack_integration::designate {
}
class { '::designate::backend::bind9':
rndc_host => $::openstack_integration::config::host,
rndc_host => '127.0.0.1',
rndc_config_file => '/etc/rndc.conf',
rndc_key_file => $::dns::params::rndckeypath,
}

6
templates/pools.yaml.erb
View File

@ -8,7 +8,7 @@
priority: 1
nameservers:
- host: <%= scope.lookupvar("openstack_integration::config::host") %>
- host: 127.0.0.1
port: 5322
targets:
@ -21,9 +21,9 @@
port: 5354
options:
host: <%= scope.lookupvar("openstack_integration::config::host") %>
host: 127.0.0.1
port: 5322
rndc_host: <%= scope.lookupvar("openstack_integration::config::host") %>
rndc_host: 127.0.0.1
rndc_port: 953
rndc_config_file: /etc/rndc.conf
rndc_key_file: /etc/rndc.key

2
templates/rndc.conf.erb
View File

@ -1,6 +1,6 @@
include "/etc/rndc.key";
options {
default-key "rndc-key";
default-server <%= scope.lookupvar("openstack_integration::config::host") %>;
default-server 127.0.0.1;
default-port 953;
};