Merge branch 'release-1.6.8'

refinery-platform · Feb 27, 2019 · c0b2669 · c0b2669
2 parents 1a93a1b + cb1dbca
commit c0b2669
Show file tree

Hide file tree

Showing 255 changed files with 5,781 additions and 6,940 deletions.
diff --git a/.gitignore b/.gitignore
@@ -49,9 +49,9 @@ Thumbs.db
 supervisord.conf
 codekit-config.json
 .vagrant/
-/deployment/.librarian/
-/deployment/.tmp/
-/deployment/Puppetfile.lock
+/deployment/puppet/.librarian/
+/deployment/puppet/.tmp/
+/deployment/puppet/Puppetfile.lock
 /deployment/aws-config/config.yaml
 /deployment/aws-config/tags.yaml
 /refinery/celerybeat-schedule*
@@ -67,7 +67,6 @@ codekit-config.json
 /refinery/ui/docs/
 /refinery/ui/cypress/screenshots/
 /refinery/ui/cypress/videos/
-/isa-tab/
 /import/
 /static/
 /transfer/

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/Vagrantfile b/Vagrantfile
@@ -11,7 +11,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Every Vagrant virtual environment requires a box to build off of.
   config.vm.box = "ubuntu/trusty64"
-  config.vm.box_version = "20170619.0.0"
+  config.vm.box_version = "20181203.0.1"
   config.vm.hostname = "refinery"
   # nic_type set to virtio to increase guest network performance (https://superuser.com/a/850389)
   config.vm.network "private_network", ip: "192.168.50.50", nic_type: "virtio"
@@ -51,10 +51,10 @@ GALAXY_WARNING_SCRIPT
   config.vm.provision :shell, path: "deployment/bootstrap.sh"
 
   config.vm.provision :puppet do |puppet|
-    puppet.manifests_path = "deployment/manifests"
-    puppet.manifest_file  = "default.pp"
-    puppet.module_path = "deployment/modules"  # requires modules dir to exist when this file is parsed
-    puppet.options = "--hiera_config /vagrant/deployment/hiera.yaml"  # to avoid missing file warning
+    puppet.manifests_path = "deployment/puppet/manifests"
+    puppet.manifest_file  = "vagrant.pp"
+    puppet.module_path = "deployment/puppet/modules"  # requires modules dir to exist when this file is parsed
+    puppet.options = "--hiera_config /vagrant/deployment/puppet/hiera.yaml"  # to avoid missing file warning
   end
 
   # workaround for services that start on boot before /vagrant is available

diff --git a/deployment/aws-config/config.yaml.erb b/deployment/aws-config/config.yaml.erb
diff --git a/deployment/aws-config/tags.yaml.template b/deployment/aws-config/tags.yaml.template
diff --git a/deployment/aws.sh b/deployment/aws.sh
diff --git a/deployment/bin/convert-iam-to-smtp b/deployment/bin/convert-iam-to-smtp
diff --git a/deployment/bin/create-smtp-credentials b/deployment/bin/create-smtp-credentials
diff --git a/deployment/bin/fetch-github-ssh-keys b/deployment/bin/fetch-github-ssh-keys
diff --git a/deployment/bin/fix-untagged-volumes b/deployment/bin/fix-untagged-volumes
diff --git a/deployment/bin/generate-superuser b/deployment/bin/generate-superuser
@@ -3,24 +3,18 @@
 import json
 import os
 
+# https://docs.djangoproject.com/en/1.9/topics/auth/passwords/#django.contrib.auth.hashers.make_password
+from django.contrib.auth.hashers import make_password
+
 # The local package refinery/core/__init__.py
 import core     # Only used for its location
 
 core_path = os.path.dirname(os.path.abspath(core.__file__))
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.dev")
 
-# https://docs.djangoproject.com/en/1.9/topics/auth/passwords/#django.contrib.auth.hashers.make_password
-from django.contrib.auth.hashers import make_password
 
 def main():
-
-    if 'ADMIN_PASSWORD' not in os.environ:
-        with open("/home/ubuntu/s3-config") as inp:
-            j = json.load(inp)
-            os.environ['ADMIN_PASSWORD'] = j['ADMIN_PASSWORD']
-    password = os.environ['ADMIN_PASSWORD']
-
     with open(os.path.join(core_path, 'fixtures/superuser.json')) as j:
 	o = json.load(j)
 
@@ -29,7 +23,7 @@ def main():
     assert len(admin_index) == 1
     (admin_index,) = admin_index
 
-    hashed_password = make_password(password)
+    hashed_password = make_password(os.environ['ADMIN_PASSWORD'])
 
     o[admin_index]['fields']['password'] = hashed_password
 

diff --git a/deployment/bin/get-s3-config b/deployment/bin/get-s3-config
diff --git a/deployment/bootstrap.sh b/deployment/bootstrap.sh
@@ -1,11 +1,14 @@
 #!/usr/bin/env bash
 
+# initial configuration for Vagrant box
+
+# https://serverfault.com/a/670688
 export DEBIAN_FRONTEND=noninteractive
 
-/usr/bin/apt-get clean && /usr/bin/apt-get -qq update
+/usr/bin/apt-get clean && /usr/bin/apt-get -qq update && /usr/bin/apt-get autoremove
+
+/usr/bin/apt-get -q -y install git ruby-dev
 
-# "make" and "puppet" are required on AWS, and already installed
-# on Vagrant (so adding them again is quick).
-/usr/bin/apt-get -q -y install git ruby-dev make puppet
+/usr/bin/gem install librarian-puppet -v 2.2.3 --no-rdoc --no-ri
 
-/usr/bin/gem install librarian-puppet -v 2.2.3 --no-rdoc --no-ri && cd /vagrant/deployment && librarian-puppet install
+cd /vagrant/deployment/puppet && librarian-puppet install
diff --git a/deployment/Puppetfile → deployment/puppet/Puppetfile b/deployment/Puppetfile → deployment/puppet/Puppetfile
@@ -14,4 +14,4 @@ mod 'saz/timezone', '3.2.0'
 mod 'stankevich/python', '1.9.8'
 mod 'thias/sysctl', '1.0.2'
 
-mod 'refinery/refinery', :path => "refinery-modules/refinery"
+mod 'refinery/refinery', :path => "refinery"
diff --git a/deployment/hiera.yaml → deployment/puppet/hiera.yaml b/deployment/hiera.yaml → deployment/puppet/hiera.yaml