Updates box from bento/centos-7.3 to bento/centos-8.1

cloudsoft · May 11, 2020 · 72ffdf0 · 72ffdf0
1 parent c95865a
commit 72ffdf0
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 6 deletions.
diff --git a/files/install_amp.sh b/files/install_amp.sh
@@ -10,8 +10,9 @@ JAVA_VERSION=8
 export JAVA_HOME=/usr/lib/jvm/java-${JAVA_VERSION}-openjdk-amd64/
 
 echo "Download AMP"
-#curl -o cloudsoft-amp-karaf-noarch.rpm -s -S http://developers-origin.cloudsoftcorp.com/latest/io/cloudsoft/amp/cloudsoft-amp-karaf/5.5.0-SNAPSHOT/cloudsoft-amp-karaf-5.5.0-SNAPSHOT-noarch.rpm
-wget http://developers-origin.cloudsoftcorp.com/latest/io/cloudsoft/amp/cloudsoft-amp-karaf/5.5.0-SNAPSHOT/cloudsoft-amp-karaf-5.5.0-SNAPSHOT-noarch.rpm -O cloudsoft-amp-karaf-noarch.rpm
+curl -o cloudsoft-amp-karaf-noarch.rpm -s -S http://developers-origin.cloudsoftcorp.com/latest/io/cloudsoft/amp/cloudsoft-amp-karaf/5.5.0-SNAPSHOT/cloudsoft-amp-karaf-5.5.0-SNAPSHOT-noarch.rpm
+# use the following command to test SNAPSHOT versions
+# wget http://developers-origin.cloudsoftcorp.com/latest/io/cloudsoft/amp/cloudsoft-amp-karaf/5.5.0-SNAPSHOT/cloudsoft-amp-karaf-5.5.0-SNAPSHOT-noarch.rpm -O cloudsoft-amp-karaf-noarch.rpm
 
 echo "Validate downloaded file is an archive"
 download_type=`file cloudsoft-amp-karaf-noarch.rpm`

diff --git a/servers.yaml b/servers.yaml
@@ -33,4 +33,31 @@ servers:
       cmd:
         - sudo sed -i 's/PasswordAuthentication no/PasswordAuthentication yes/g' /etc/ssh/sshd_config
         - sudo systemctl restart sshd
-...
+  - name: byon3
+    box: bento/centos-8.1
+    ram: 512
+    cpus: 2
+    ip: 10.10.10.103
+    shell:
+      cmd:
+        - sudo sed -i 's/PasswordAuthentication no/PasswordAuthentication yes/g' /etc/ssh/sshd_config
+        - sudo systemctl restart sshd
+  - name: byon4
+    box: bento/centos-8.1
+    ram: 512
+    cpus: 2
+    ip: 10.10.10.104
+    shell:
+      cmd:
+        - sudo sed -i 's/PasswordAuthentication no/PasswordAuthentication yes/g' /etc/ssh/sshd_config
+        - sudo systemctl restart sshd
+  - name: byon5
+    box: bento/centos-8.1
+    ram: 512
+    cpus: 2
+    ip: 10.10.10.105
+    shell:
+      cmd:
+        - sudo sed -i 's/PasswordAuthentication no/PasswordAuthentication yes/g' /etc/ssh/sshd_config
+        - sudo systemctl restart sshd
+...
diff --git a/tests/catalog.bom b/tests/catalog.bom
@@ -12,15 +12,15 @@ brooklyn.catalog:
       description: |
         URL of the AMP to use
       type: string
-      default: http://developers-origin.cloudsoftcorp.com/latest/io/cloudsoft/amp/cloudsoft-amp-karaf/5.5.0-SNAPSHOT/cloudsoft-amp-karaf-5.5.0-SNAPSHOT-noarch.rpm
+      default: http://downloads.cloudsoftcorp.com/amp/latest/cloudsoft-amp-karaf-latest-noarch.rpm
     services:
     - type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess
       name: AMP Vagrant Node
       brooklyn.config:
         amp.port: 8081
         shell.env:
           AMP_URL: $brooklyn:config("amp.download.url")
-          DEFAULT_AMP_URL: "http://developers-origin.cloudsoftcorp.com/latest/io/cloudsoft/amp/cloudsoft-amp-karaf/5.5.0-SNAPSHOT/cloudsoft-amp-karaf-5.5.0-SNAPSHOT-noarch.rpm"
+          DEFAULT_AMP_URL: "http://downloads.cloudsoftcorp.com/amp/latest/cloudsoft-amp-karaf-latest-noarch.rpm"
         install.command: |
           sudo apt-add-repository "deb http://download.virtualbox.org/virtualbox/debian $(lsb_release -sc) contrib"
           wget -q https://www.virtualbox.org/download/oracle_vbox.asc -O- | sudo apt-key add -

diff --git a/tests/catalog.tests.bom b/tests/catalog.tests.bom
@@ -14,7 +14,7 @@ brooklyn.catalog:
         description: |
           URL of the AMP to use
         type: string
-        default: http://developers-origin.cloudsoftcorp.com/latest/io/cloudsoft/amp/cloudsoft-amp-karaf/5.5.0-SNAPSHOT/cloudsoft-amp-karaf-5.5.0-SNAPSHOT-noarch.rpm
+        default: http://downloads.cloudsoftcorp.com/amp/latest/cloudsoft-amp-karaf-latest-noarch.rpm
       services:
       - type: amp-vagrant
         id: vagrant