Skip to content

Commit

Permalink
Merge branch 'r-22-3-0' into 'main'
Browse files Browse the repository at this point in the history
ESECLDTPLT-3148 - R22.3.0

See merge request cloudsolutions/automation-templates/f5-google-gdm-templates-v2!102
  • Loading branch information
mikeshimkus committed Jul 25, 2022
2 parents a4924d5 + 44778ad commit e871f0d
Show file tree
Hide file tree
Showing 272 changed files with 3,431 additions and 3,664 deletions.
5 changes: 4 additions & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,10 @@ disable=raw-checker-failed,
line-too-long,
too-many-locals,
duplicate-code,
invalid-name
invalid-name,
line-length,
document-start,
expression-not-assigned

# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ run_expected_outputs_diff:

run_sync_at_metadata:
echo "Syncing AT component metadata"
cd ${SYNC_AT_DIR} && ./sync_at_components_metadata.sh --config-directories ../../examples/autoscale/bigip-configurations,../../examples/quickstart/bigip-configurations,../../examples/failover/bigip-configurations --template-directory ../../examples --runtime-init-package-url https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.5.0/dist/f5-bigip-runtime-init-1.5.0-1.gz.run --cloud gcp --exclude-package do
cd ${SYNC_AT_DIR} && ./sync_at_components_metadata.sh --config-directories ../../examples/autoscale/bigip-configurations,../../examples/quickstart/bigip-configurations,../../examples/failover/bigip-configurations --template-directory ../../examples --runtime-init-package-url https://cdn.f5.com/product/cloudsolutions/f5-bigip-runtime-init/v1.5.1/dist/f5-bigip-runtime-init-1.5.1-1.gz.run --cloud gcp
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
APP CONTAINER NAME: 'f5devcentral/f5-demo-app:latest'
AVAILABILITY ZONE: <REGION>-b
AZ SHORT NAME: us-w1
BASTION AUTOSCALE: true
BIGIP IP CIDR RANGE: 10.0.20.0/24
BIGIP VERSION: 16-1-2-2-0-0-28
BIGIQ LICENSE POOL: production
ENABLE FLOW LOGS: ''
IMAGE NAME: f5-bigip-<BIGIP VERSION>-byol-<IMAGE TYPE>-<IMAGE SUFFIX>
IMAGE SUFFIX: '0505081937'
Expand Down Expand Up @@ -39,8 +39,9 @@ SECONDARY RANGE NAME 1: ''
SECRET ID: <ACCESS STACK NAME>-secret
SECRET VALUE: 'B!giq2017'
SERVICE ACCOUNT EMAIL: <UNIQUESTRING>-admin@<PROJECT>.iam.gserviceaccount.com
STACK NAME: <UNIQUESTRING>-autoscale-existing-stack
STACK NAME: <UNIQUESTRING>-autoscale
STORAGE NAME: <STACK NAME>-bucket
TEMPLATE NAME: autoscale-existing-network.py
TEMPLATE NAME: autoscale.py
TEMPLATE URL: https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/main/examples/autoscale/bigiq/autoscale-existing-network.py
UNIQUESTRING: dd-<DEWPOINT JOB ID>
USE DEFAULT PARAMETERS: 'Yes'

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
---
APP CONTAINER NAME: 'f5devcentral/f5-demo-app:latest'
AVAILABILITY ZONE: <REGION>-b
AZ SHORT NAME: us-w2
BIGIP IP CIDR RANGE: 10.0.2.0/24
AZ SHORT NAME: us-w1
BIGIP VERSION: 16-1-2-2-0-0-28
BIGIQ LICENSE POOL: production
ENABLE FLOW LOGS: ''
Expand All @@ -17,7 +16,7 @@ LOG ID: <UNIQUESTRING>-f5-waf-logs
PRIVATE IP GOOGLE ACCESS: ''
PROJECT: f5-7656-pdsoleng-dev
PROVISION PUBLIC IP: true
REGION: us-west2
REGION: us-west1
RESTRICTED SRC ADDRESS APP: '0.0.0.0/0'
RESTRICTED SRC ADDRESS: '0.0.0.0/0'
RUNTIME INIT UPDATE: 'update_<DEWPOINT JOB ID>-runtime.yaml'
Expand All @@ -36,3 +35,4 @@ STORAGE NAME: <STACK NAME>-bucket
TEMPLATE NAME: autoscale.py
TEMPLATE URL: https://raw.githubusercontent.com/F5Networks/f5-google-gdm-templates-v2/main/examples/autoscale/bigiq/autoscale.py
UNIQUESTRING: dd-<DEWPOINT JOB ID>
USE DEFAULT PARAMETERS: 'Yes'

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit e871f0d

Please sign in to comment.