switch to master

.env.testing.example

@@ -25,7 +25,7 @@ SMTP_FROM=""
 SMTP_PORT=""
 SMTP_STARTTLS=""
 USE_SELF_CERTS="TRUE"
-BRANCH=testing
+BRANCH=master
 ARTIFACTS_LOCATION="https://raw.githubusercontent.com/bottkars/pcf-jump-azure/${BRANCH}"
 VMSIZE="Standard_DS2_v2"
 PAS_EDITION="srt"

README.md

@@ -34,14 +34,26 @@ Optionally, PAS will be deployed using [om cli](https://github.com/pivotal-cf/om
 - :new: specify download location for ops manager
 
 ### Initial supported Pivotal Cloudfoundry Tiles and Versions
-- <img src="https://dtb5pzswcit1e.cloudfront.net/assets/images/product_logos/[email protected]" height="16"> Pivotal Application Service 2.4.3
-- <img src="https://dtb5pzswcit1e.cloudfront.net/assets/images/product_logos/[email protected]" height="16"> MySQL 2.5.3
+- <img src="https://dtb5pzswcit1e.cloudfront.net/assets/images/product_logos/[email protected]" height="16"> Pivotal Application Service 2.5.x
+- <img src="https://dtb5pzswcit1e.cloudfront.net/assets/images/product_logos/[email protected]" height="16"> MySQL 2.6.x
 - <img src="https://dtb5pzswcit1e.cloudfront.net/assets/images/product_logos/[email protected]" height="16"> RabbitMQ 1.15.4
-- <img src="https://dtb5pzswcit1e.cloudfront.net/assets/images/product_logos/[email protected]" height="16"> Spring Cloud Services 2.0.6
+- <img src="https://dtb5pzswcit1e.cloudfront.net/assets/images/product_logos/[email protected]" height="16"> Spring Cloud Services 2.0.x, 3.x.x
 - <img src="https://dtb5pzswcit1e.cloudfront.net/assets/images/product_logos/[email protected]" height="16"> Microsoft Azure Service Broker 1.11.0 ( MASB )
+-  additional, post install tiles
 
 ![image](https://user-images.githubusercontent.com/8255007/53223791-cc1af080-3672-11e9-85ba-c8a78c550101.png) 
 
+
+## Changes
+
+###2019.04
+- reworked installatzion process, implemented "tile deployer" as a unified deployment service
+- added PAS 2.5 including support for Availability Zones
+- Istio Mesh Support
+
+2019.01
+
+
 ## usage
 
 there are are multiple ways to deploy the ARM template. we will describe Azure Portal Template based and az cli based Method  

azuredeploy.json

@@ -295,7 +295,7 @@
                 "TRUE"
             ],
             "metadata": {
-                "description": "for testing, use self signed certs, otherwise Let´s Encrypt"
+                "description": "for TESTIING, use self signed certs, otherwise Let´s Encrypt"
             }
         },
         "ubuntuOSVersion": {

docs/patched_terraform.md

@@ -4,7 +4,7 @@ cd ./pivotal-cf-terraforming-azure-*/
 cd terraforming-pas
 
 
-PATCH_SERVER="https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/patches/"
+PATCH_SERVER="https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/patches/"
 wget -q ${PATCH_SERVER}modules/pas/dns.tf -O ../modules/pas/dns.tf
 wget -q ${PATCH_SERVER}modules/pas/istiolb.tf -O ../modules/pas/istiolb.tf
 wget -q ${PATCH_SERVER}modules/pas/outputs.tf -O ../modules/pas/outputs.tf

env/updates.txt

@@ -1,10 +1,10 @@
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/env/apm/1.6.0/apm.env
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/env/p-compliance-scanner/1.0.0-beta.7/p-compliance-scanner.env
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/env/masb/1.11.0/masb.env
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/env/pivotal-mysql/2.5.3/pivotal-mysql.env
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/env/p-rabbitmq/1.15.7/p-rabbitmq.env
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/env/pas/2.5.0/pas.env
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/env/pas-windows/2.5.0/pas-windows.env
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/env/p-spring-services/2.0.7/p-spring-services.env
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/env/kubernetes-service-manager/0.4.34/kubernetes-service-manager.env
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/env/p-healthwatch/1.5.2/p-healthwatch.env
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/env/apm/1.6.0/apm.env
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/env/p-compliance-scanner/1.0.0-beta.7/p-compliance-scanner.env
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/env/masb/1.11.0/masb.env
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/env/pivotal-mysql/2.5.3/pivotal-mysql.env
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/env/p-rabbitmq/1.15.7/p-rabbitmq.env
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/env/pas/2.5.0/pas.env
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/env/pas-windows/2.5.0/pas-windows.env
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/env/p-spring-services/2.0.7/p-spring-services.env
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/env/kubernetes-service-manager/0.4.34/kubernetes-service-manager.env
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/env/p-healthwatch/1.5.2/p-healthwatch.env

scripts/deploy_base.sh

@@ -241,7 +241,7 @@ sudo -S -u ${ADMIN_USERNAME} unzip ${FILENAME}
 cd ./pivotal-cf-terraforming-azure-*/
 cd terraforming-pas
 
-PATCH_SERVER="https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/patches/"
+PATCH_SERVER="https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/patches/"
 wget -q ${PATCH_SERVER}modules/pas/dns.tf -O ../modules/pas/dns.tf
 wget -q ${PATCH_SERVER}modules/pas/istiolb.tf -O ../modules/pas/istiolb.tf
 wget -q ${PATCH_SERVER}modules/pas/outputs.tf -O ../modules/pas/outputs.tf

scripts/om_init.sh

@@ -35,7 +35,7 @@ cd ./pivotal-cf-terraforming-azure-*/
 cd terraforming-pas
 
 
-PATCH_SERVER="https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/patches/"
+PATCH_SERVER="https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/patches/"
 wget -q ${PATCH_SERVER}modules/pas/dns.tf -O ../modules/pas/dns.tf
 wget -q ${PATCH_SERVER}modules/pas/istiolb.tf -O ../modules/pas/istiolb.tf
 wget -q ${PATCH_SERVER}modules/pas/outputs.tf -O ../modules/pas/outputs.tf

scripts/update.sh

@@ -5,7 +5,7 @@ echo "this is the updater"
 mkdir -p ${LOG_DIR}
 UPDATE_DIR=${HOME_DIR}/conductor/updates
 mkdir -p ${UPDATE_DIR}
-BASE_URI="https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/"
+BASE_URI="https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/"
 
 
 if ! which parallel > /dev/null; then
@@ -30,5 +30,5 @@ echo "done"
 
 
 
-# wget -O - https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/scripts/update.sh | bash
+# wget -O - https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/scripts/update.sh | bash
 

scripts/updates.txt

@@ -1,20 +1,20 @@
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/scripts/cf_startstop.sh
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/scripts/create_certs.sh
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/scripts/create_self_certs.sh
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/scripts/deploy_base.sh
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/scripts/deploy_masb.sh
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/scripts/deploy_mysql.sh
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/scripts/deploy_osba.sh
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/scripts/deploy_p-compliance-scanner.sh
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/scripts/deploy_pas.sh
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/scripts/deploy_rabbit.sh
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/scripts/deploy_spring.sh
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/scripts/deploy_tile.sh
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/scripts/om_init.sh
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/scripts/pcf-azure.tfvars
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/scripts/scratch.sh
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/scripts/skeleton.sh
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/scripts/stemcell_loader.sh
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/scripts/update.sh
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/scripts/connect_om.sh
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/scripts/update_bosh_director.sh
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/scripts/cf_startstop.sh
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/scripts/create_certs.sh
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/scripts/create_self_certs.sh
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/scripts/deploy_base.sh
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/scripts/deploy_masb.sh
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/scripts/deploy_mysql.sh
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/scripts/deploy_osba.sh
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/scripts/deploy_p-compliance-scanner.sh
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/scripts/deploy_pas.sh
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/scripts/deploy_rabbit.sh
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/scripts/deploy_spring.sh
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/scripts/deploy_tile.sh
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/scripts/om_init.sh
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/scripts/pcf-azure.tfvars
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/scripts/scratch.sh
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/scripts/skeleton.sh
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/scripts/stemcell_loader.sh
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/scripts/update.sh
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/scripts/connect_om.sh
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/scripts/update_bosh_director.sh

templates/updates.txt

@@ -1,14 +1,14 @@
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/templates/pas/2.5.0/pas-srt.yaml
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/templates/pas/2.5.0/pas-cf.yaml
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/templates/pas-windows/2.5.0/pas-windows.yaml
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/templates/masb.yaml
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/templates/pivotal-mysql/2.5.3/pivotal-mysql.yaml
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/templates/healthwatch.yaml
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/templates/p-spring-services/2.0.7/p-spring-services.yaml
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/templates/p-compliance-scanner/1.0.0-beta.7/p-compliance-scanner.yaml
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/templates/apm/1.6.0/apm.yaml
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/templates/director_config.yaml
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/templates/p-rabbitmq/1.15.7/p-rabbitmq.yaml
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/templates/director_config.yaml
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/templates/kubernetes-service-manager/0.4.34/kubernetes-service-manager.yaml
-https://raw.githubusercontent.com/bottkars/pcf-jump-azure/testing/templates/p-healthwatch/1.5.2/p-healthwatch.yaml
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/templates/pas/2.5.0/pas-srt.yaml
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/templates/pas/2.5.0/pas-cf.yaml
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/templates/pas-windows/2.5.0/pas-windows.yaml
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/templates/masb.yaml
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/templates/pivotal-mysql/2.5.3/pivotal-mysql.yaml
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/templates/healthwatch.yaml
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/templates/p-spring-services/2.0.7/p-spring-services.yaml
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/templates/p-compliance-scanner/1.0.0-beta.7/p-compliance-scanner.yaml
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/templates/apm/1.6.0/apm.yaml
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/templates/director_config.yaml
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/templates/p-rabbitmq/1.15.7/p-rabbitmq.yaml
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/templates/director_config.yaml
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/templates/kubernetes-service-manager/0.4.34/kubernetes-service-manager.yaml
+https://raw.githubusercontent.com/bottkars/pcf-jump-azure/master/templates/p-healthwatch/1.5.2/p-healthwatch.yaml

testing.md

@@ -1 +1 @@
-testing
+master