[MediaWiki-commits] [Gerrit] Expose host server's name to VM - change (mediawiki/vagrant)

2015-12-16 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Expose host server's name to VM
..


Expose host server's name to VM

Expose the host server's hostname to the VM as the "vmhost" Factor fact.
This fact is used by default in the labs environment to compute vhost
names.

Bug: T119990
Change-Id: I26c12fdd5ff7cf92ab2ccb57c9c299060e5fda82
---
M Vagrantfile
M puppet/hieradata/environment/labs.yaml
2 files changed, 4 insertions(+), 2 deletions(-)

Approvals:
  BryanDavis: Looks good to me, approved
  Physikerwelt: Looks good to me, but someone else must approve
  Gergő Tisza: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/Vagrantfile b/Vagrantfile
index 446756a..43e34e5 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -31,6 +31,7 @@
 require_relative 'lib/mediawiki-vagrant/version'
 require 'fileutils'
 require 'ipaddr'
+require 'socket'
 
 # NOTE Use RubyGems over the Vagrant plugin manager as it's more reliable
 gemspec = Gem::Specification.find { |s| s.name == 'mediawiki-vagrant' }
@@ -226,6 +227,7 @@
   'forwarded_https_port' => settings[:https_port],
   'shared_apt_cache' => '/vagrant/cache/apt/',
   'environment'  => ENV['MWV_ENVIRONMENT'] || 'vagrant',
+  'vmhost'   => Socket.gethostname,
 }
 
 if settings[:http_port] != 80
diff --git a/puppet/hieradata/environment/labs.yaml 
b/puppet/hieradata/environment/labs.yaml
index d74c089..8ccba98 100644
--- a/puppet/hieradata/environment/labs.yaml
+++ b/puppet/hieradata/environment/labs.yaml
@@ -1,7 +1,7 @@
 ---
 classes: ['::role::labs_initial_content']
 
-role::mediawiki::hostname: "%{::hostname}.wmflabs.org"
-mediawiki::multiwiki::base_domain: "-%{::hostname}.wmflabs.org"
+role::mediawiki::hostname: "%{::vmhost}.wmflabs.org"
+mediawiki::multiwiki::base_domain: "-%{::vmhost}.wmflabs.org"
 
 hhvm::logroot: /var/log

-- 
To view, visit https://gerrit.wikimedia.org/r/257259
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I26c12fdd5ff7cf92ab2ccb57c9c299060e5fda82
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Physikerwelt 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Expose host server's name to VM - change (mediawiki/vagrant)

2015-12-06 Thread BryanDavis (Code Review) 
BryanDavis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/257259

Change subject: Expose host server's name to VM
..

Expose host server's name to VM

Expose the host server's hostname to the VM as the "vmhost" Factor fact.
This fact is used by default in the labs environment to compute vhost
names.

Bug: T119990
Change-Id: I26c12fdd5ff7cf92ab2ccb57c9c299060e5fda82
---
M Vagrantfile
M puppet/hieradata/environment/labs.yaml
2 files changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/59/257259/1

diff --git a/Vagrantfile b/Vagrantfile
index 446756a..43e34e5 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -31,6 +31,7 @@
 require_relative 'lib/mediawiki-vagrant/version'
 require 'fileutils'
 require 'ipaddr'
+require 'socket'
 
 # NOTE Use RubyGems over the Vagrant plugin manager as it's more reliable
 gemspec = Gem::Specification.find { |s| s.name == 'mediawiki-vagrant' }
@@ -226,6 +227,7 @@
   'forwarded_https_port' => settings[:https_port],
   'shared_apt_cache' => '/vagrant/cache/apt/',
   'environment'  => ENV['MWV_ENVIRONMENT'] || 'vagrant',
+  'vmhost'   => Socket.gethostname,
 }
 
 if settings[:http_port] != 80
diff --git a/puppet/hieradata/environment/labs.yaml 
b/puppet/hieradata/environment/labs.yaml
index d74c089..8ccba98 100644
--- a/puppet/hieradata/environment/labs.yaml
+++ b/puppet/hieradata/environment/labs.yaml
@@ -1,7 +1,7 @@
 ---
 classes: ['::role::labs_initial_content']
 
-role::mediawiki::hostname: "%{::hostname}.wmflabs.org"
-mediawiki::multiwiki::base_domain: "-%{::hostname}.wmflabs.org"
+role::mediawiki::hostname: "%{::vmhost}.wmflabs.org"
+mediawiki::multiwiki::base_domain: "-%{::vmhost}.wmflabs.org"
 
 hhvm::logroot: /var/log

-- 
To view, visit https://gerrit.wikimedia.org/r/257259
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I26c12fdd5ff7cf92ab2ccb57c9c299060e5fda82
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits