Update docs

boxcutter · Dec 16, 2024 · 7b47e1f · 7b47e1f
1 parent 4573c8a
commit 7b47e1f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 14 deletions.
diff --git a/docs/bootstrap_vm.md b/docs/bootstrap_vm.md
@@ -168,18 +168,20 @@ sudo mkdir -p /etc/cinc
 sudo ln -snf /etc/cinc /etc/chef
 
 curl -L https://omnitruck.cinc.sh/install.sh | sudo bash
+curl -L https://omnitruck.cinc.sh/install.sh | sudo bash -s -- -v 18.4.12
+
 
 # /opt/chef -> /opt/cinc
 sudo ln -snf /opt/cinc /opt/chef
 
-# prime onepassword secret /etc/cinc/op_service_account_token
-# Install 1Password cli
-sudo apt-get update
-sudo apt-get install unzip
-ARCH="<choose between 386/amd64/arm/arm64>"
-curl -o /tmp/op.zip https://cache.agilebits.com/dist/1P/op2/pkg/v2.29.0/op_linux_amd64_v2.29.0.zip
-sudo unzip /tmp/op.zip op -d /usr/local/bin/
-rm -f /tmp/op.zip
+## prime onepassword secret /etc/cinc/op_service_account_token
+## Install 1Password cli
+# sudo apt-get update
+# sudo apt-get install unzip
+# ARCH="<choose between 386/amd64/arm/arm64>"
+# curl -o /tmp/op.zip https://cache.agilebits.com/dist/1P/op2/pkg/v2.30.3/op_linux_amd64_v2.30.3.zip
+# sudo unzip /tmp/op.zip op -d /usr/local/bin/
+# rm -f /tmp/op.zip
  
 # op user get --me 
 
@@ -222,6 +224,7 @@ sudo tee /etc/chef/run-list.json <<EOF
 }
 EOF
 
+sudo apt-get install git
 sudo mkdir -p /var/chef /var/chef/repos /var/log/chef
 cd /var/chef/repos
 sudo git clone https://github.com/boxcutter/chef-cookbooks.git \
@@ -413,7 +416,7 @@ sudo mkdir -p /etc/cinc
 # /etc/chef -> /etc/cinc
 sudo ln -snf /etc/cinc /etc/chef
 
-curl -L https://omnitruck.cinc.sh/install.sh | sudo bash
+curl -L https://omnitruck.cinc.sh/install.sh | sudo bash -s -- -v 18.4.12
 
 # /opt/chef -> /opt/cinc
 sudo ln -snf /opt/cinc /opt/chef
@@ -422,7 +425,7 @@ sudo ln -snf /opt/cinc /opt/chef
 # Install 1Password cli
 sudo dnf install unzip
 ARCH="<choose between 386/amd64/arm/arm64>"
-curl -o /tmp/op.zip https://cache.agilebits.com/dist/1P/op2/pkg/v2.29.0/op_linux_amd64_v2.29.0.zip
+curl -o /tmp/op.zip https://cache.agilebits.com/dist/1P/op2/pkg/v2.30.3/op_linux_amd64_v2.30.3.zip
 sudo unzip /tmp/op.zip op -d /usr/local/bin/
 rm -f /tmp/op.zip
  

diff --git a/docs/taste-tester.md b/docs/taste-tester.md
@@ -10,17 +10,17 @@ sudo apt-get install cmake
 # linked against the system openssl and won't work properly
 export OPENSSL_ROOT_DIR=/opt/cinc-workstation/embedded
 
-$ eval "$(cinc shell-init bash)
+$ eval "$(cinc shell-init bash)"
 $ which cinc
 /opt/cinc-workstation/bin/cinc
 
 cinc gem install taste_tester
 
 sudo mkdir -p /usr/local/etc/taste-tester
-sudo cp ~/github/boxcutter/boxcutter-chef-cookbooks/cookbooks/boxcutter_chef/files/taste-tester/taste-tester-plugin.rb /usr/local/etc/taste-tester
-sudo cp ~/github/boxcutter/boxcutter-chef-cookbooks/cookbooks/boxcutter_chef/files/taste-tester/taste-tester.conf /usr/local/etc/taste-tester
+# sudo cp ~/github/boxcutter/boxcutter-chef-cookbooks/cookbooks/boxcutter_chef/files/taste-tester/taste-tester-plugin.rb /usr/local/etc/taste-tester
+# sudo cp ~/github/boxcutter/boxcutter-chef-cookbooks/cookbooks/boxcutter_chef/files/taste-tester/taste-tester.conf /usr/local/etc/taste-tester
 
-sudo tee /usr/local/etc/taste-tester/taste-tester-plugin.rb <<EOF
+sudo tee /usr/local/etc/taste-tester/taste-tester-plugin.rb <<'EOF'
 def self.test_remote_client_rb_extra_code(_hostname)
   <<~EOF
 
@@ -31,6 +31,10 @@ def self.test_remote_client_rb_extra_code(_hostname)
     json_attribs '/etc/cinc/run-list.json'
     ohai.critical_plugins ||= []
     ohai.critical_plugins += [:Passwd]
+    ohai.critical_plugins += [:ShardSeed]
+    ohai.optional_plugins ||= []
+    ohai.optional_plugins += [:Passwd]
+    ohai.optional_plugins += [:ShardSeed]
   EOF
 end
 EOF