Closed Bug 1050737 Opened 11 years ago Closed 11 years ago

[140812] Merge latest build/puppet changes into qa/puppet

Categories

(Infrastructure & Operations :: RelOps: Puppet, task)

Product:
Infrastructure & Operations
Component:
RelOps: Puppet
Type:
task
Priority:
Not set
Severity:
normal

Tracking

(Not tracked)

Status:
RESOLVED FIXED

People

(Reporter: whimboo, Assigned: whimboo)

Details

The last merge is a while ago. We should merge the latest changes from build/puppet before I continue with all the other work. That lowers the risk of merge conflicts.
The merge has been pushed as: https://hg.mozilla.org/qa/puppet/pushloghtml?changeset=140e7ee3cd6c Dustin, what is important to do before I merge to our production? Are the changes I have to do for the environments documented somewhere?
I already made the required changes -- I hope. If you're getting errors or anything like that, let me know.
Ok, so I will merge our default to production now. For safety I will backup existing environments, so in case something fails, we don't loose them.
So after the merge, the puppet.conf on puppetmaster still has the environmnet sections. Is this valid? I wonder because for the agents it has been correctly updated. But why not for the master?
All seems to work fine, except that we are now also suffering from bug 1052192 when using environments. So given that the moco ldap accounts have been synced meanwhile, I assume that I can do the next merge to the latest code in build/puppet.
Summary: [140808] Merge latest build/puppet changes into qa/puppet → [140812] Merge latest build/puppet changes into qa/puppet
I merged in the second half of the build/puppet changesets: https://hg.mozilla.org/qa/puppet/pushloghtml?changeset=8da2de4fb3db After testing I noticed that we fail with: Error: Could not retrieve catalog from remote server: Error 400 on SERVER: Failed to parse template ssh/ssh_authorized_keys.erb: Filepath: /etc/puppet/production/modules/ssh/templates/ssh_authorized_keys.erb Line: 9 Detail: no key for bpannabecker at /etc/puppet/production/modules/ssh/manifests/userconfig.pp:59 on node mm-ub-1404-32.qa.scl3.mozilla.com Warning: Not using cache on failed catalog Error: Could not retrieve catalog; skipping run Dustin landed the following follow-up patch, which now needs to be merged: http://hg.mozilla.org/build/puppet/rev/2bee991e1bfd
Merged the hopefully final patch now: https://hg.mozilla.org/qa/puppet/pushloghtml?changeset=79d319d30efb Also pushed to our production branch, let it sync with puppetmaster, and testing shows that all is working fine now!
Status: ASSIGNED → RESOLVED
Closed: 11 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.