Andrew Bogott has submitted this change and it was merged.
Change subject: Have sink create ldap host entries.
......................................................................
Have sink create ldap host entries.
This is experimental -- in the long run we can use this
to replace some of the ldap integration in OpenStackManager
and allow instance creation/deletion in Horizon.
Change-Id: I2badbf8ff2adc120b6e1a8001262be05e7a3daf8
---
M modules/openstack/manifests/designate/service.pp
M modules/openstack/templates/icehouse/designate/designate.conf.erb
2 files changed, 30 insertions(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/openstack/manifests/designate/service.pp
b/modules/openstack/manifests/designate/service.pp
index 87d0c71..538c4b0 100644
--- a/modules/openstack/manifests/designate/service.pp
+++ b/modules/openstack/manifests/designate/service.pp
@@ -2,6 +2,9 @@
include openstack::repo
+ include passwords::openstack::nova
+ $ldap_user_pass = $passwords::openstack::nova::nova_ldap_user_pass
+
package { ['python-designateclient',
'designate-sink',
'designate-common',
@@ -10,6 +13,8 @@
'designate-doc',
'designate-agent',
'designate-central',
+ 'python-nova-ldap',
+ 'python-paramiko',
'python-nova-fixed-multi' ]:
ensure => present,
require => Class['openstack::repo'];
diff --git a/modules/openstack/templates/icehouse/designate/designate.conf.erb
b/modules/openstack/templates/icehouse/designate/designate.conf.erb
index 3d59bb8..2d374f4 100644
--- a/modules/openstack/templates/icehouse/designate/designate.conf.erb
+++ b/modules/openstack/templates/icehouse/designate/designate.conf.erb
@@ -121,7 +121,7 @@
# List of notification handlers to enable, configuration of these needs to
# correspond to a [handler:my_driver] section below or else in the config
# Can be one or more of : nova_fixed, neutron_floatingip
-enabled_notification_handlers = nova_fixed_multi
+enabled_notification_handlers = nova_fixed_multi nova_ldap
#-----------------------
# mDNS Service
@@ -211,6 +211,30 @@
reverse_domain_id = '8d114f3c-815b-466c-bdd4-9b91f704ea60'
reverse_format = '%(hostname)s.%(tenant_id)s.%(domain)s'
+#-----------------------
+# Nova Fixed Ldap Handler
+#-----------------------
+[handler:nova_ldap]
+# Domain ID of domain to create records in. For a pre-existing domain, in this
case eqiad.wmflabs
+domain_id = '114f1333-c2c1-44d3-beb4-ebed1a91742b'
+notification_topics = monitor
+notification_topics = notifications
+control_exchange = nova
+format = 'TESTING-%(hostname)s.%(tenant_id)s.%(domain)s'
+format = 'TESTING-%(hostname)s.%(domain)s'
+ldapusername = uid=novaadmin,ou=people,dc=wikimedia,dc=org
+ldappassword = <%= @ldap_user_pass %>
+puppetdefaultclasses = 'base'
+puppetdefaultclasses = 'role::labs::instance'
+puppetdefaultvars = 'realm=labs'
+puppetdefaultvars = 'use_dnsmasq=true'
+
+certmanager_user = certmanager
+puppet_key_format = '%(hostname)s.%(tenant_id)s.%(domain)s'
+puppet_master_host = "<%= designateconfig['controller_hostname'] %>"
+salt_key_format = '%(hostname)s.%(tenant_id)s.%(domain)s'
+salt_master_host = "<%= designateconfig['controller_hostname'] %>"
+
#------------------------
# Neutron Floating Handler
#------------------------
--
To view, visit https://gerrit.wikimedia.org/r/202582
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2badbf8ff2adc120b6e1a8001262be05e7a3daf8
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
