[ARVADOS] updated: 2.1.0-2065-g4060fcafe
Git user
git at public.arvados.org
Wed Mar 16 16:39:59 UTC 2022
Summary of changes:
tools/salt-install/Vagrantfile | 19 +++++++++++++------
.../multi_host/aws/pillars/nginx_passenger.sls | 2 +-
.../multiple_hostnames/pillars/nginx_passenger.sls | 2 +-
.../single_hostname/pillars/nginx_passenger.sls | 2 +-
4 files changed, 16 insertions(+), 9 deletions(-)
via 4060fcafe05a811394d217917c184ea4b590b413 (commit)
from 52e3c2cd8b49cf441690778182e11a20002fde52 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 4060fcafe05a811394d217917c184ea4b590b413
Author: Javier Bértoli <jbertoli at curii.com>
Date: Wed Mar 16 13:39:41 2022 -0300
18681: Fix typo
Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at curii.com>
diff --git a/tools/salt-install/Vagrantfile b/tools/salt-install/Vagrantfile
index a8dd34534..1573b6862 100644
--- a/tools/salt-install/Vagrantfile
+++ b/tools/salt-install/Vagrantfile
@@ -41,6 +41,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
/vagrant/local.params.example.single_host_multiple_hostnames > /tmp/local.params.single_host_multiple_hostnames"
# s/#\ BRANCH=\"main\"/\ BRANCH=\"main\"/g;' \
+ arv.vm.provision "shell",
+ inline: "cp -vr /tmp/local.params.single_host_multiple_hostnames /tmp/local.params.single_host_multiple_hostnames.falla;
+ cp -vr /vagrant/centos7-local.params.single_host_single_hostname-f258b604f831bb3bd7fab506c670b975ae8e4118 /tmp/local.params.single_host_multiple_hostnames"
arv.vm.provision "shell",
path: "provision.sh",
args: [
@@ -54,7 +57,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# A single_host single_hostname example
config.vm.define "arvados-sh-sn" do |arv|
- arv.vm.box = "bento/debian-11"
+ #arv.vm.box = "bento/centos-7"
+ arv.vm.box = "bento/ubuntu-20.04"
arv.vm.hostname = "zeppo"
# CPU/RAM
config.vm.provider :virtualbox do |v|
@@ -80,12 +84,15 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
arv.vm.provision "shell",
inline: "cp -vr /vagrant/config_examples/single_host/single_hostname /home/vagrant/local_config_dir;
cp -vr /vagrant/tests /home/vagrant/tests;
- sed 's#HOSTNAME_EXT=\"hostname_ext_fixme_or_this_wont_work\"#HOSTNAME_EXT=\"zeppo.local\"#g;
- 's#IP_INT=\"ip_int_fixme_or_this_wont_work\"#IP_INT=\"127.0.0.1\"#g;
- s#cluster_fixme_or_this_wont_work#zeppo#g;
- s#domain_fixme_or_this_wont_work#local#g;' \
+ sed 's#cluster_fixme_or_this_wont_work#cnts7#g;
+ s#domain_fixme_or_this_wont_work#local#g;
+ s#HOSTNAME_EXT=\"hostname_ext_fixme_or_this_wont_work\"#HOSTNAME_EXT=\"cnts7.local\"#g;
+ s#IP_INT=\"ip_int_fixme_or_this_wont_work\"#IP_INT=\"127.0.0.1\"#g;
+ s#RELEASE=\"production\"#RELEASE=\"development\"#g;
+ s/# BRANCH=\"main\"/BRANCH=\"main\"/g;
+ s/# VERSION=.*$/VERSION=\"latest\"/g' \
/vagrant/local.params.example.single_host_single_hostname > /tmp/local.params.single_host_single_hostname"
- # s/#\ BRANCH=\"main\"/\ BRANCH=\"main\"/g;
+
arv.vm.provision "shell",
path: "provision.sh",
args: [
diff --git a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_passenger.sls b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_passenger.sls
index a1d7efde6..fbd42bd7a 100644
--- a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_passenger.sls
+++ b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_passenger.sls
@@ -28,7 +28,7 @@ nginx:
# As we now differentiate where passenger is required or not, we need to
# load this module conditionally, so we add this conditional just to use
# the same pillar file
- {% if "install_from_phusionpassenger" == "____NGINX_INSTALL_SOURCE__" %}
+ {% if "install_from_phusionpassenger" == "__NGINX_INSTALL_SOURCE__" %}
# This is required to get the passenger module loaded
# In Debian it can be done with this
# include: 'modules-enabled/*.conf'
diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_passenger.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_passenger.sls
index c376cd0aa..dbf21c265 100644
--- a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_passenger.sls
+++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_passenger.sls
@@ -28,7 +28,7 @@ nginx:
# As we now differentiate where passenger is required or not, we need to
# load this module conditionally, so we add this conditional just to use
# the same pillar file
- {% if "install_from_phusionpassenger" == "____NGINX_INSTALL_SOURCE__" %}
+ {% if "install_from_phusionpassenger" == "__NGINX_INSTALL_SOURCE__" %}
# This is required to get the passenger module loaded
# In Debian it can be done with this
# include: 'modules-enabled/*.conf'
diff --git a/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_passenger.sls b/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_passenger.sls
index 9db093677..c25720c60 100644
--- a/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_passenger.sls
+++ b/tools/salt-install/config_examples/single_host/single_hostname/pillars/nginx_passenger.sls
@@ -28,7 +28,7 @@ nginx:
# As we now differentiate where passenger is required or not, we need to
# load this module conditionally, so we add this conditional just to use
# the same pillar file
- {% if "install_from_phusionpassenger" == "____NGINX_INSTALL_SOURCE__" %}
+ {% if "install_from_phusionpassenger" == "__NGINX_INSTALL_SOURCE__" %}
# This is required to get the passenger module loaded
# In Debian it can be done with this
# include: 'modules-enabled/*.conf'
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list