Closed
Bug 1138600
Opened 9 years ago
Closed 9 years ago
Add Windows Support to instance_metadata module
Categories
(Infrastructure & Operations :: RelOps: Puppet, task)
Tracking
(Not tracked)
RESOLVED
FIXED
People
(Reporter: markco, Assigned: markco)
References
Details
Attachments
(1 file)
7.81 KB,
patch
|
dustin
:
review+
markco
:
checked-in+
|
Details | Diff | Splinter Review |
No description provided.
Assignee | ||
Comment 1•9 years ago
|
||
Attachment #8573512 -
Flags: review?(dustin)
Comment 2•9 years ago
|
||
Comment on attachment 8573512 [details] [diff] [review] BUG1136404.patch Review of attachment 8573512 [details] [diff] [review]: ----------------------------------------------------------------- Looks like this just has two unnecessary files and a typo. Good to go with that stuff fixed up. ::: modules/buildslave/manifests/startup/windows.pp @@ +10,5 @@ > $puppet_semaphore = 'C:\ProgramData\PuppetAgain\puppetcomplete.semaphore' > # Batch file to start buildbot > + # Batch files varies slightly between AWS and datacenter machines > + case $::fqdn { > + /.*\.releng\.(use1|usw2)\.mozilla\.com$/: { I'd say "yuck", but we do the same thing in instance_metadata: 5 class instance_metadata { 6 case $::fqdn { 7 /.*\.releng\.(use1|usw2)\.mozilla\.com$/: { so, cool! I think runner can take care of this once it's everywhere, so hopefully this is just temporary. @@ +11,5 @@ > # Batch file to start buildbot > + # Batch files varies slightly between AWS and datacenter machines > + case $::fqdn { > + /.*\.releng\.(use1|usw2)\.mozilla\.com$/: { > + include instance_metadata Good catch (with the require below) ::: modules/dirs/manifests/etc/instance_metadata.pp @@ +7,5 @@ > + file { > + "c:/etc/instance_metadata": > + ensure => directory, > + } > +} Do we need a dir? The file is generated as C:\mozilla-build\python\python.exe C:\etc\instance_metadata.py -o C:\etc\instance_metadata.json ::: modules/instance_metadata/files/instance_metadata.bat @@ +5,5 @@ > +REM REM file, You can obtain one at http://mozilla.org/MPL/2.0/. > + > +cd C:\etc > + > +wget http://169.254.169.254/latest/meta-data/ I don't think this file is used.. ::: modules/instance_metadata/manifests/init.pp @@ +79,5 @@ > enable => false; > } > } > + Windows: { > + # Future runner task. Currently luanched startbuildbot.bat typo here :)
Attachment #8573512 -
Flags: review?(dustin) → review+
Assignee | ||
Comment 3•9 years ago
|
||
Comment on attachment 8573512 [details] [diff] [review] BUG1136404.patch Review of attachment 8573512 [details] [diff] [review]: ----------------------------------------------------------------- https://hg.mozilla.org/build/puppet/rev/dbe9379fd3db
Attachment #8573512 -
Flags: checked-in+
Assignee | ||
Updated•9 years ago
|
Status: NEW → RESOLVED
Closed: 9 years ago
Resolution: --- → FIXED
You need to log in
before you can comment on or make changes to this bug.
Description
•