blsmith/dc-deployments-automation
1
0
Fork 0
mirror of https://bitbucket.org/atlassian/dc-deployments-automation.git synced 2025-12-15 09:23:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merged in dependency-updates (pull request #195)

Browse Source 
Dependency updates

Approved-by: Eugene Ivantsov
Approved-by: Dylan Rathbone
This commit is contained in:
Lee Goolsbee
2023-06-27 22:24:09 +00:00
parent fd4d9b6469 f480a452e9
commit 0f06a3b521
6 changed files with 494 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Pipfile
View File

@@ -4,16 +4,17 @@ verify_ssl = true
name = "pypi" name = "pypi"
[packages] [packages]
ansible-core = "==2.13.4" ansible-core = "==2.13.10"
cryptography = "==39.0.1" cryptography = "==41.0.1"
boto3 = "==1.24.68" boto3 = "==1.26.158"
botocore = "==1.27.68" botocore = "==1.29.158"
lxml = "==4.9.1" lxml = "==4.9.2"
psycopg2-binary = "==2.9.3" psycopg2-binary = "==2.9.6"
[dev-packages] [dev-packages]
molecule = "==4.0.1" molecule = "==4.0.4"
molecule-docker = "==2.0.0" molecule-docker = "==2.1.0"
ansible-compat = "==3.0.2"
docker = "==6.0.0" docker = "==6.0.0"
pytest = "*" pytest = "*"
pytest-testinfra = "*" pytest-testinfra = "*"

904
Pipfile.lock generated
View File

File diff suppressed because it is too large Load Diff

38
bitbucket-pipelines.yml
View File

@@ -44,6 +44,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/aws_common - cd roles/aws_common
@@ -57,6 +58,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/aws_common - cd roles/aws_common
@@ -70,6 +72,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/aws_common - cd roles/aws_common
@@ -83,6 +86,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/bitbucket_config - cd roles/bitbucket_config
@@ -96,6 +100,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/bitbucket_config - cd roles/bitbucket_config
@@ -109,6 +114,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/confluence_config - cd roles/confluence_config
@@ -122,6 +128,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/confluence_config - cd roles/confluence_config
@@ -135,6 +142,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/confluence_config - cd roles/confluence_config
@@ -148,6 +156,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/confluence_config - cd roles/confluence_config
@@ -161,6 +170,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/diy_backup - cd roles/diy_backup
@@ -174,6 +184,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/jira_config - cd roles/jira_config
@@ -187,6 +198,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/jira_config - cd roles/jira_config
@@ -200,6 +212,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/jira_config - cd roles/jira_config
@@ -213,6 +226,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/jira_config - cd roles/jira_config
@@ -226,6 +240,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/linux_common - cd roles/linux_common
@@ -239,6 +254,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/product_common - cd roles/product_common
@@ -252,6 +268,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/product_common - cd roles/product_common
@@ -265,6 +282,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/product_install - cd roles/product_install
@@ -278,6 +296,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/product_install - cd roles/product_install
@@ -291,6 +310,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/product_install - cd roles/product_install
@@ -304,6 +324,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/product_install - cd roles/product_install
@@ -317,6 +338,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/product_install - cd roles/product_install
@@ -330,6 +352,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/product_install - cd roles/product_install
@@ -343,6 +366,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/product_install - cd roles/product_install
@@ -356,6 +380,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/product_install - cd roles/product_install
@@ -369,6 +394,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/product_install - cd roles/product_install
@@ -382,6 +408,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/product_install - cd roles/product_install
@@ -395,6 +422,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/product_install - cd roles/product_install
@@ -408,6 +436,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/product_install - cd roles/product_install
@@ -421,6 +450,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/product_install - cd roles/product_install
@@ -434,6 +464,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/product_install - cd roles/product_install
@@ -447,6 +478,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/product_install - cd roles/product_install
@@ -460,6 +492,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/product_install - cd roles/product_install
@@ -473,6 +506,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/product_install - cd roles/product_install
@@ -486,6 +520,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/product_startup - cd roles/product_startup
@@ -499,6 +534,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/product_startup - cd roles/product_startup
@@ -512,6 +548,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/product_startup - cd roles/product_startup
@@ -525,6 +562,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/product_startup - cd roles/product_startup

1
pipeline_generator/templates/bitbucket-pipelines.yml.j2
View File

@@ -45,6 +45,7 @@ pipelines:
services: services:
- docker - docker
script: script:
- apt-get update && apt-get install -y rsync
- export ANSIBLE_CONFIG=./ansible.cfg - export ANSIBLE_CONFIG=./ansible.cfg
- ./bin/install-ansible --dev - ./bin/install-ansible --dev
- cd roles/{{ spath.parts[2] }} - cd roles/{{ spath.parts[2] }}

10
requirements.yml
View File

@@ -1,12 +1,12 @@
--- ---
collections: collections:
- name: amazon.aws - name: amazon.aws
version: "4.1.0" version: "6.1.0"
- name: ansible.posix - name: ansible.posix
version: "1.4.0" version: "1.5.4"
- name: community.docker - name: community.docker
version: "3.0.2" version: "3.4.8"
- name: community.general - name: community.general
version: "5.5.0" version: "7.1.0"
- name: community.postgresql - name: community.postgresql
version: "2.2.0" version: "3.0.0"

4
roles/product_install/tasks/main.yml
View File

@@ -180,8 +180,8 @@
# optionally grab basic_auth creds from secrets_manager secret called 'download_atlassian' # optionally grab basic_auth creds from secrets_manager secret called 'download_atlassian'
- name: set basic_auth facts if the secret exists - name: set basic_auth facts if the secret exists
ansible.builtin.set_fact: ansible.builtin.set_fact:
download_atlassian_password: "{{ lookup('amazon.aws.aws_secret', atl_download_secret_name + '.password', region=ansible_ec2_placement_region, bypath=false, nested=true, on_denied='skip', on_missing='skip') }}" download_atlassian_password: "{{ lookup('amazon.aws.secretsmanager_secret', atl_download_secret_name + '.password', region=ansible_ec2_placement_region, bypath=false, nested=true, on_denied='skip', on_missing='skip') }}"
download_atlassian_username: "{{ lookup('amazon.aws.aws_secret', atl_download_secret_name + '.username', region=ansible_ec2_placement_region, bypath=false, nested=true, on_denied='skip', on_missing='skip') }}" download_atlassian_username: "{{ lookup('amazon.aws.secretsmanager_secret', atl_download_secret_name + '.username', region=ansible_ec2_placement_region, bypath=false, nested=true, on_denied='skip', on_missing='skip') }}"
failed_when: false failed_when: false
ignore_errors: yes ignore_errors: yes
no_log: true no_log: true