[smarcet] - #13306

* docker : added swap file for virtualbox
* refactored naming

Author: smarcet

Vagrantfile

@@ -2,8 +2,12 @@
 # vi: set ft=ruby :
 # https://github.com/DevNIX/Vagrant-dependency-manager
 VAGRANTFILE_API_VERSION = "2"
-#MYSQL_SERVICE_PROVIDER = "init"
+
+#configuration constants
 MYSQL_SERVICE_PROVIDER = ENV["MYSQL_SERVICE_PROVIDER"] || "upstart"
+USE_SWAP               = ENV["USE_SWAP"] || 1
+SERVER_NAME            = ENV["SERVER_NAME"] || "local.openstack.org"
+
 required_plugins = %w( vagrant-vbguest vagrant-hosts vagrant-hostsupdater )
 require File.dirname(__FILE__)+"/scripts/dependency_manager"
 check_plugins required_plugins
@@ -20,7 +24,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Every Vagrant development environment requires a box. You can search for
   # boxes at https://atlas.hashicorp.com/search.
-  config.vm.hostname = "local.openstack.org"
+  config.vm.hostname = SERVER_NAME
 
   # Share an additional folder to the guest VM. The first argument is
   # the path on the host to the actual folder. The second argument is
@@ -30,12 +34,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.vm.synced_folder("puppet/hiera", "/etc/puppet/data")
     config.vm.synced_folder("puppet/certs", "/etc/ssl_certs")	
     config.vm.synced_folder("puppet", "/etc/puppet/modules/site")
-    config.vm.synced_folder ".", "/var/www/local.openstack.org", create: true, owner: "vagrant", group: "www-data", mount_options: ["dmode=777,fmode=777"]
+    config.vm.synced_folder ".", "/var/www/www.openstack.org", create: true, owner: "vagrant", group: "www-data", mount_options: ["dmode=777,fmode=777"]
 
   # virtualbox provider
   config.vm.provider "virtualbox" do |vb, override|
      vb.memory           = "2048"
-     vb.name             = "local.openstack.org"
+     vb.name             = SERVER_NAME
 	 vb.cpus             = 1
 	 override.vm.box     = "ubuntu/trusty64"
      override.vm.box_url = "https://atlas.hashicorp.com/ubuntu/trusty64"
@@ -46,7 +50,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # docker provider
   config.vm.provider "docker" do |d, override|
       d.build_dir = "."
-      d.name = "local.openstack.org"
+      d.name = SERVER_NAME
       d.has_ssh = true
       config.vm.network :forwarded_port, host: 80, guest: 80 #web
   end
@@ -55,7 +59,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # vagrant plugin install vagrant-hosts
 
   config.vm.provision :hosts do |provisioner|
-      provisioner.add_host '127.0.0.1', ['local.openstack.org']
+      provisioner.add_host '127.0.0.1', [SERVER_NAME]
   end
 
   config.vm.provision "bootstrap", type:"shell" do |s|
@@ -67,7 +71,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       puppet.manifest_file = "site.pp"
       puppet.hiera_config_path = "puppet/hiera/hiera.yaml"
       puppet.working_directory = "/etc/puppet/data"
-      puppet.facter   = { "mysql_service_provider" =>  MYSQL_SERVICE_PROVIDER }
+      puppet.facter   = {
+                            "mysql_service_provider" => MYSQL_SERVICE_PROVIDER,
+                            "use_swap"               => USE_SWAP,
+                            "server_name"            => SERVER_NAME
+                        }
       #puppet.options = "--verbose --debug"
   end
 

puppet/site.pp

@@ -19,6 +19,8 @@
 $os_db               = hiera('os_db_name')
 $developer_email     = hiera('developer_email')
 $db_dump_url         = hiera('db_dump_url')
+# fact
+notice("server_name ${server_name}")
 
 $main_packages = [
   'curl',
@@ -36,6 +38,7 @@
   'python-pip',
   'libmysqlclient-dev',
   'software-properties-common',
+  'nano',
 ]
 
 # php packages needed for server
@@ -137,7 +140,7 @@
   cwd       => '/',
   path      => '/usr/bin:/bin:/usr/local/bin:/usr/lib/node_modules/npm/bin',
   logoutput => on_failure,
-  command   => "cat /var/www/local.openstack.org/scripts/insert_default_admin.sql >> /dump.sql",
+  command   => "cat /var/www/www.openstack.org/scripts/insert_default_admin.sql >> /dump.sql",
   require   => Exec['rename-db'],
 }
 
@@ -165,15 +168,15 @@
   ],
 }
 
-file { '/var/www/local.openstack.org/_ss_environment.php':
+file { '/var/www/www.openstack.org/_ss_environment.php':
   ensure  => present,
   content => template('site/_ss_environment.php.erb'),
   owner   => 'vagrant',
   group   => 'www-data',
   mode    => '0640',
 }
 
-file { '/var/www/local.openstack.org/db.ini':
+file { '/var/www/www.openstack.org/db.ini':
   ensure  => present,
   content => template('site/db.ini.erb'),
   owner   => 'vagrant',
@@ -195,7 +198,7 @@
     Package[$php5_packages] ,
     Service['mysql'],
     Service['php5.6-fpm'],
-    File['/var/www/local.openstack.org/_ss_environment.php'],
+    File['/var/www/www.openstack.org/_ss_environment.php'],
   ],
 }
 
@@ -223,9 +226,9 @@
   require => Service['nginx'],
 }
 
-file { '/etc/nginx/sites-available/local.openstack.org':
+file { '/etc/nginx/sites-available/www.openstack.org':
   ensure  => present,
-  content => template('site/local.openstack.org.erb'),
+  content => template('site/www.openstack.org.erb'),
   owner   => 'vagrant',
   group   => 'www-data',
   mode    => '0640',
@@ -246,10 +249,10 @@
   ]
 }
 
-file { '/etc/nginx/sites-enabled/local.openstack.org':
+file { '/etc/nginx/sites-enabled/www.openstack.org':
   ensure    => 'link',
-  target    => '/etc/nginx/sites-available/local.openstack.org',
-  require   => File['/etc/nginx/sites-available/local.openstack.org'],
+  target    => '/etc/nginx/sites-available/www.openstack.org',
+  require   => File['/etc/nginx/sites-available/www.openstack.org'],
 }
 
 cron { 'RssEventsDigestTask':
@@ -278,4 +281,11 @@
     command => 'php /var/www/www.openstack.org/framework/cli-script.php /UpdateFeedTask',
     user => 'root', 
     minute => '*/5', 
+}
+
+#fact
+if $use_swap == 1 {
+  swap_file::files { 'default':
+    ensure => present,
+  }
 }

puppet/templates/_ss_environment.php.erb

@@ -108,7 +108,7 @@ define('DUPE_EMAIL_FROM','<%= @developer_email %>');
 define('OPENSTACKID_ENABLED',false);
 //set true on production mode, otherwise false
 define('Auth_OpenID_VERIFY_HOST',false);
-define('Auth_OpenID_Realm','https://local.openstack.org');
+define('Auth_OpenID_Realm','https://www.openstack.org');
 
 //survey module
 define('SURVEY_START_DATE','2015-03-09 00:00:00');
@@ -162,4 +162,4 @@ define('ACTIVECOMMITTERSERVICE_GERRIT_USER_SSH_KEY_FILE', '');
 
 global $_FILE_TO_URL_MAPPING;
 
-$_FILE_TO_URL_MAPPING['/var/www/local.openstack.org'] = 'http://local.openstack.org';
+$_FILE_TO_URL_MAPPING['/var/www/www.openstack.org'] = 'http://<%= @server_name %>';

puppet/templates/local.openstack.org.erb puppet/templates/www.openstack.org.erbpuppet/templates/local.openstack.org.erb renamed to puppet/templates/www.openstack.org.erb

@@ -9,9 +9,9 @@ server {
     ssl_certificate /etc/nginx/ssl/server.crt;
     ssl_certificate_key /etc/nginx/ssl/server.key;
 
-    server_name local.openstack.org;
+    server_name <%= @server_name %>;
 
-    root /var/www/local.openstack.org;
+    root /var/www/www.openstack.org;
 
     # Deny all attempts to access hidden files such as .htaccess, .htpasswd, .DS_Store (Mac).
     # Keep logging the requests to parse later (or to pass to firewall utilities such as fail2ban)
@@ -21,8 +21,8 @@ server {
     }
 
     #logs 	    
-    error_log /var/log/nginx/local.openstack.org.error.log;
-    access_log /var/log/nginx/local.openstack.org.access.log;
+    error_log /var/log/nginx/www.openstack.org.error.log;
+    access_log /var/log/nginx/www.openstack.org.access.log;
 
     # Directives to send expires headers and turn off 404 error logging.
     location ~* \.(js|css|png|jpe?g|gif|ico|svg)$ {

scripts/bootstrap.sh

@@ -19,8 +19,9 @@ mkdir -p /etc/puppet/modules;
 puppet module install --force --module_repository https://forge.puppet.com --version 3.2.2 puppetlabs-stdlib;
 puppet module install --force --module_repository https://forge.puppet.com --version 3.9.0 puppetlabs-mysql;
 puppet module install --force --module_repository https://forge.puppet.com --version 0.3.0 jfryman-nginx;
+puppet module install --force --module_repository https://forge.puppet.com --version 3.0.2 petems-swap_file;
 
 # Set up environment variables, adding the new tools to PATH.
 sudo sh -c "cat > /etc/profile.d/composer.sh" <<'EOF'
-export COMPOSER_HOME=/var/www/local.openstack.org
+export COMPOSER_HOME=/var/www/www.openstack.org
 EOF

scripts/postdeployment.sh

@@ -45,20 +45,20 @@ su vagrant;
 # install local nodejs modules on VM
 mkdir -p /home/vagrant/node_modules;
 chown vagrant:www-data -R /home/vagrant/node_modules;
-ln -sf /home/vagrant/node_modules /var/www/local.openstack.org/node_modules;
+ln -sf /home/vagrant/node_modules /var/www/www.openstack.org/node_modules;
 
 # install local bower modules on VM
 mkdir -p /home/vagrant/bower_modules;
 chown vagrant:www-data -R /home/vagrant/bower_modules;
-ln -sf /home/vagrant/bower_modules /var/www/local.openstack.org/themes/openstack/bower_assets;
+ln -sf /home/vagrant/bower_modules /var/www/www.openstack.org/themes/openstack/bower_assets;
 
-cd /var/www/local.openstack.org;
+cd /var/www/www.openstack.org;
 #composer installation from https://getcomposer.org/download/
 php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 php composer-setup.php
 php -r "unlink('composer-setup.php');"
 # create local folder for ss cache
-mkdir -p /var/www/local.openstack.org/silverstripe-cache;
+mkdir -p /var/www/www.openstack.org/silverstripe-cache;
 php composer.phar install --ignore-platform-reqs --prefer-dist;
 sudo ./framework/sake installsake;
 

scripts/updatedeployment.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -xe
 echo “running update deployment …”;
-cd /var/www/local.openstack.org;
+cd /var/www/www.openstack.org;
 ./clear_ss_cache.sh;
 php composer.phar update --ignore-platform-reqs --prefer-dist;
 #run ss tasks
@@ -12,7 +12,7 @@ sudo bower install --allow-root config.interactive=false;
 sudo npm run build-all;
 chown vagrant:www-data -R /home/vagrant/node_modules;
 chown vagrant:www-data -R /home/vagrant/bower_modules;
-chown vagrant:www-data -R /var/www/local.openstack.org/vendor;
+chown vagrant:www-data -R /var/www/www.openstack.org/vendor;
 sudo service nginx restart;
 sudo service php5.6-fpm restart;
-sudo php /var/www/local.openstack.org/framework/cli-script.php /UpdateFeedTask;
+sudo php /var/www/www.openstack.org/framework/cli-script.php /UpdateFeedTask;