Remove all consul references (#56)

* Update provision.sh * removing threatstack * Remove all consul references --------- Co-authored-by: Carlos Olímpio Pires da Cunha Filho <[email protected]>
FitnessKeeper · Oct 26, 2023 · b44942a · b44942a
1 parent 6b704ca
commit b44942a
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 87 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -13,12 +13,6 @@ fixtures:
     tomcat:
        repo: "puppetlabs/tomcat"
        ref: "1.4.1"
-    threatstack:
-       repo: "threatstack/threatstack"
-       ref: "2.0.12"
-    consul:
-       repo: "KyleAnderson/consul"
-       ref: "3.2.0"
     archive:
        repo: "puppet/archive"
        ref: "1.3.0"

diff --git a/data/common.yaml b/data/common.yaml
@@ -52,17 +52,10 @@ rk_tomcat::goss::tomcat_group: "%{alias('rk_tomcat::tomcat::tomcat_group')}"
 rk_tomcat::goss::tomcat_logdir: "%{alias('rk_tomcat::tomcat::logdir')}"
 rk_tomcat::goss::zulu_package: "%{alias('rk_tomcat::java::zulu_package')}"
 rk_tomcat::goss::zulu_version: "%{alias('rk_tomcat::java::zulu_version')}"
-rk_tomcat::goss::consul_version: "%{alias('rk_tomcat::consul::version')}"
 
 # Fonts
 rk_tomcat::fonts::packages:
   - ghostscript-chinese
   - cjkuni-ukai-fonts
   - cjkuni-uming-fonts
   - wqy-zenhei-fonts
-
-# threatstack
-rk_tomcat::threatstack::deploy_key: keyIsSetBySecretsCommon
-rk_tomcat::consul::datacenter: rk-staging-infra
-rk_tomcat::consul::tag_key: staging_consul_server
-rk_tomcat::consul::version: 1.9.5
diff --git a/files/provision.sh b/files/provision.sh
@@ -4,6 +4,8 @@
 # set up logging
 LOGGER='logger -t [CLOUDINIT] -p daemon.info'
 
+GEMHOME=/usr/local/share/gems
+
 if [[ "${USER}" -ne 0 ]]; then
   $LOGGER "$0 must be run as root."
   exit 1
@@ -89,24 +91,26 @@ yum -y install ruby-devel glibc-devel gcc
 cat > /root/.gemrc << 'GEMRC'
 ---
 install: --nodocument --bindir /usr/local/bin
+update: --nodocument --bindir /usr/local/bin
 GEMRC
 
 $LOGGER "Installing Bundler..."
 gem install bundler
 
 $LOGGER "Installing Puppet dependencies..."
+mkdir -p /etc/puppetlabs/code/modules
 export PUPPET_MODULE_DIR='/etc/puppetlabs/code/modules'
 yum -y install augeas augeas-devel libxml2-devel
 
 $LOGGER "Installing other gem dependencies..."
 BUNDLE=$(which bundle 2>/dev/null || echo '/usr/local/bin/bundle')
-$BUNDLE install
+$BUNDLE install --verbose
 
 LIBRARIAN_PUPPET=$(which librarian-puppet 2>/dev/null || echo '/usr/local/bin/librarian-puppet')
 $LIBRARIAN_PUPPET config path "$PUPPET_MODULE_DIR" --global
 $LIBRARIAN_PUPPET install
 
-ln -s /root/rk_tomcat "${PUPPET_MODULE_DIR}/rk_tomcat"
+ln -sf /root/rk_tomcat "${PUPPET_MODULE_DIR}/rk_tomcat"
 
 $LOGGER "Running Puppet agent..."
 PUPPET_LOGDIR=/var/log/puppet
@@ -131,7 +135,7 @@ $LOGGER "Disabling Puppet agent..."
 $PUPPET resource service puppet ensure=stopped enable=false
 
 $LOGGER "Linking Tomcat homedir to CATALINA_HOME..."
-ln -s /usr/share/tomcat /home/tomcat
+ln -sf /usr/share/tomcat /home/tomcat
 
 
 GOSS=$(which goss)
@@ -155,6 +159,9 @@ else
   $LOGGER "Goss not installed, skipping tests."
 fi
 
+# masking tomcat updates in yum.conf
+echo "exclude=tomcat*" >> /etc/yum.conf
+
 $LOGGER "Removing semaphore..."
 $AWS s3 rm "s3://rk-devops-${REGION}/jenkins/semaphores/${INSTANCE_ID}" 2>/dev/null || true
 

diff --git a/manifests/goss.pp b/manifests/goss.pp
@@ -1,7 +1,6 @@
 # rk_tomcat::goss
 #
 class rk_tomcat::goss (
-  $consul_version,
   $version,
   $destination,
   $catalina_home,

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -66,7 +66,6 @@
     class { 'rk_tomcat::deploy':
       require => Class[rk_tomcat::tomcat],
     }
-    class { 'rk_tomcat::threatstack': }
 
     class { 'rk_tomcat::goss::deploy':
       require => Class[rk_tomcat::deploy],

diff --git a/manifests/threatstack.pp b/manifests/threatstack.pp
diff --git a/metadata.json b/metadata.json
@@ -17,7 +17,6 @@
     {"name":"puppetlabs-yumrepo_core","version_requirement":"1.1.0"},
     {"name":"saz-limits","version_requirement":"3.0.4"},
     {"name":"rehan-wget","version_requirement":"1.6.1"},
-    {"name":"herculesteam-augeasproviders_sysctl","version_requirement":"2.6.0"},
-    {"name":"threatstack-threatstack","version_requirement":"2.0.12"}
+    {"name":"herculesteam-augeasproviders_sysctl","version_requirement":"2.6.0"}
   ]
 }
diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
@@ -46,10 +46,6 @@
       }
     end
     it { should contain_class('wget')}
-    it { should contain_class('threatstack').with(
-      'deploy_key'      => 'd3adk3yd3adk3yd3adk3yd3adk3yd3adk3yd3adk3yd3adk3yd3adk3yd3adk3yd3adk3yAA',
-      )
-    }
     it { should contain_class('rk_tomcat')}
     it { should contain_class('rk_tomcat::deploy')}
     it { should contain_class('rk_tomcat::tomcat')}

diff --git a/spec/classes/threatstack_spec.rb b/spec/classes/threatstack_spec.rb
diff --git a/spec/fixtures/hieradata/common.yaml b/spec/fixtures/hieradata/common.yaml
@@ -55,7 +55,6 @@ rk_tomcat::goss::tomcat_group: "%{alias('rk_tomcat::tomcat::tomcat_group')}"
 rk_tomcat::goss::tomcat_logdir: "%{alias('rk_tomcat::tomcat::logdir')}"
 rk_tomcat::goss::zulu_package: "%{alias('rk_tomcat::java::zulu_package')}"
 rk_tomcat::goss::zulu_version: "%{alias('rk_tomcat::java::zulu_version')}"
-rk_tomcat::goss::consul_version: "%{alias('rk_tomcat::consul::version')}"
 
 # Fonts
 rk_tomcat::fonts::packages:
@@ -67,9 +66,3 @@ rk_tomcat::fonts::packages:
 
 rk_tomcat::rsyslog::datahub_host: localhost
 rk_tomcat::rsyslog::datahub_port: 1234
-
-# threatstack
-rk_tomcat::threatstack::deploy_key: d3adk3yd3adk3yd3adk3yd3adk3yd3adk3yd3adk3yd3adk3yd3adk3yd3adk3yd3adk3yAA
-rk_tomcat::consul::datacenter: rk-staging-infra
-rk_tomcat::consul::tag_key: staging_consul_server
-rk_tomcat::consul::version: 1.9.5
diff --git a/templates/99_threatstack.cfg.epp b/templates/99_threatstack.cfg.epp
diff --git a/templates/provision/gold_master.erb b/templates/provision/gold_master.erb
@@ -6,6 +6,8 @@
 # set up logging
 LOGGER='logger -t [CLOUDINIT] -p daemon.info'
 
+GEMHOME=/usr/local/share/gems
+
 if [[ "${USER}" -ne 0 ]]; then
   $LOGGER "$0 must be run as root."
   exit 1
@@ -69,29 +71,30 @@ fi
 cd rk_tomcat
 
 $LOGGER "Configuring RubyGems..."
-yum -y install ruby23-devel glibc-devel gcc
-yum -y remove ruby20 ruby20-libs
+yum -y install ruby-devel glibc-devel gcc
 cat > /root/.gemrc << 'GEMRC'
 ---
 install: --nodocument --bindir /usr/local/bin
+update: --nodocument --bindir /usr/local/bin
 GEMRC
 
 $LOGGER "Installing Bundler..."
 gem install bundler
 
 $LOGGER "Installing Puppet dependencies..."
+mkdir -p /etc/puppetlabs/code/modules
 export PUPPET_MODULE_DIR='/etc/puppetlabs/code/modules'
 yum -y install augeas-devel augeas libxml2-devel
 
 $LOGGER "Installing other gem dependencies..."
 BUNDLE=$(which bundle 2>/dev/null || echo '/usr/local/bin/bundle')
-$BUNDLE install
+$BUNDLE install --verbose
 
 LIBRARIAN_PUPPET=$(which librarian-puppet 2>/dev/null || echo '/usr/local/bin/librarian-puppet')
 $LIBRARIAN_PUPPET config path "$PUPPET_MODULE_DIR" --global
 $LIBRARIAN_PUPPET install
 
-ln -s /root/rk_tomcat "${PUPPET_MODULE_DIR}/rk_tomcat"
+ln -sf /root/rk_tomcat "${PUPPET_MODULE_DIR}/rk_tomcat"
 
 $LOGGER "Running Puppet agent..."
 mkdir -p /etc/hiera
@@ -121,7 +124,7 @@ $LOGGER "Disabling Puppet agent..."
 $PUPPET resource service puppet ensure=stopped enable=false
 
 $LOGGER "Linking Tomcat homedir to CATALINA_HOME..."
-ln -s /usr/share/tomcat /home/tomcat
+ln -sf /usr/share/tomcat /home/tomcat
 
 GOSS=$(which goss)
 GOSSFILE='./goss.json'