Andrew Bogott has uploaded a new change for review. https://gerrit.wikimedia.org/r/265832
Change subject: Revert "Moved designate domain IDs into hiera" ...................................................................... Revert "Moved designate domain IDs into hiera" This breaks something, will need to make another attempt. This reverts commit 7811415ef7f511c43b81f8cc65d3cbdbce026ff1. Change-Id: I031a060acff89d00cfe3e166aae11490eedb3a38 --- M hieradata/codfw/labtest.yaml M hieradata/eqiad.yaml M modules/openstack/templates/kilo/designate/designate.conf.erb 3 files changed, 3 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/32/265832/1 diff --git a/hieradata/codfw/labtest.yaml b/hieradata/codfw/labtest.yaml index 733aa44..101c3d1 100644 --- a/hieradata/codfw/labtest.yaml +++ b/hieradata/codfw/labtest.yaml @@ -97,8 +97,6 @@ pdns_db_name: 'pdns' rabbit_host: *labsnovacontroller controller_hostname: *labsnovacontroller - domain_id_internal_forward: '61194e5b-b78b-4979-bcdb-581dc4f296bf' - domain_id_internal_reverse: '7766d667-4a29-4a0a-9c36-77e9c4e38a32' glanceconfig: db_host: 'labtestcontrol2001.wikimedia.org' diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml index 2bbb524..e110b1a 100644 --- a/hieradata/eqiad.yaml +++ b/hieradata/eqiad.yaml @@ -126,8 +126,6 @@ pdns_db_name: 'pdns' rabbit_host: *labsnovacontroller controller_hostname: *labsnovacontroller - domain_id_internal_forward: '114f1333-c2c1-44d3-beb4-ebed1a91742b' - domain_id_internal_reverse: '8d114f3c-815b-466c-bdd4-9b91f704ea60' labs_baremetal_servers: - '10.64.20.12' diff --git a/modules/openstack/templates/kilo/designate/designate.conf.erb b/modules/openstack/templates/kilo/designate/designate.conf.erb index 2212e22..9bb0faf 100644 --- a/modules/openstack/templates/kilo/designate/designate.conf.erb +++ b/modules/openstack/templates/kilo/designate/designate.conf.erb @@ -211,13 +211,13 @@ #----------------------- [handler:nova_fixed_multi] # Domain ID of domain to create records in. For a pre-existing domain, in this case eqiad.wmflabs -domain_id = <%= @designateconfig["domain_id_internal_forward"] %> +domain_id = '114f1333-c2c1-44d3-beb4-ebed1a91742b' notification_topics = monitor notification_topics = notifications control_exchange = nova format = '%(hostname)s.%(project_name)s.%(domain)s' format = '%(hostname)s.%(domain)s' -domain_id = <%= @designateconfig["domain_id_internal_reverse"] %> +reverse_domain_id = '8d114f3c-815b-466c-bdd4-9b91f704ea60' reverse_format = '%(hostname)s.%(project_name)s.%(domain)s' keystone_auth_name = "novaadmin" keystone_auth_pass = "<%= @keystoneconfig['ldap_user_pass'] %>" @@ -229,7 +229,7 @@ #----------------------- [handler:nova_ldap] # Domain ID of domain to create records in. For a pre-existing domain, in this case eqiad.wmflabs -domain_id = <%= @designateconfig["domain_id_internal_forward"] %> +domain_id = '114f1333-c2c1-44d3-beb4-ebed1a91742b' notification_topics = monitor notification_topics = notifications control_exchange = nova -- To view, visit https://gerrit.wikimedia.org/r/265832 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I031a060acff89d00cfe3e166aae11490eedb3a38 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
