Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

version: 3.3.1 #97

Merged
merged 5 commits into from
Jan 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
681 changes: 367 additions & 314 deletions defaults/poetry.lock

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions defaults/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ boto3 = "*"
botocore = "^1.33" # Versioned because of https://github.com/python-poetry/poetry/issues/2094
cryptography = "*"
dnspython = "*"
dpath = "*"
hvac = "*"
jinja2 = "*"
jmespath = "*"
Expand All @@ -22,6 +23,10 @@ lxml = "*"
netaddr = "*"
oauthlib = "*"
packaging = "*"
pan-os-python = "*"
pan-python = "*"
pandevice = "*"
panos-upgrade-assurance = "*"
paramiko = "*"
passlib = "*"
polling = "*"
Expand Down
12 changes: 7 additions & 5 deletions defaults/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ roles:

collections:
- name: amazon.aws
version: 7.1.0
version: 7.2.0
- name: ansible.netcommon
version: 6.0.0
- name: ansible.posix
Expand All @@ -29,7 +29,7 @@ collections:
- name: chocolatey.chocolatey
version: 1.5.1
- name: cisco.ios
version: 6.0.0
version: 6.1.0
- name: cloud.common
version: 2.1.3
- name: community.aws
Expand All @@ -39,9 +39,9 @@ collections:
- name: community.docker
version: 3.5.0
- name: community.general
version: 8.1.0
version: 8.2.0
- name: community.hashi_vault
version: 6.0.0
version: 6.1.0
- name: community.mysql
version: 3.8.0
- name: community.network
Expand All @@ -59,11 +59,13 @@ collections:
- name: kubernetes.core
version: 2.4.0
- name: linode.cloud
version: 0.23.0
version: 0.24.0
- name: microsoft.ad
version: 1.4.1
- name: microsoft.sql
version: 2.0.2
- name: paloaltonetworks.panos
version: 2.19.1
- name: vmware.vmware_rest
version: 3.0.0
- name: vyos.vyos
Expand Down
6 changes: 4 additions & 2 deletions docs/02-how-to-use.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,13 @@ Once inside the Catapult container you can type `ctp-` and use the tab key to se

## General commands

- Lists all available projects under /srv/inventories and allows you to select one if there is only one project the command will select it automatically
- Lists all available projects under /srv/inventories and allows you to select one if there is only one project the command will select it automatically. The command looks for projects that contain .git folder. If you are not using git for your project you can create an empty .git folder to make the project selectable.

````zsh

```zsh
ctp-select-project
```
````

## Deploy commands

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
# Template created with packer
# Used only to create project templates from
base_vm_template: BASE_TEMPLATE_pfsense_2_7_2

vm_template: catapult-template-pfsense-2-7-2
5 changes: 4 additions & 1 deletion inventories/_operating_systems/os.ini
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ os_vyos_1_4

[os_pfsense:children]
os_pfsense_2_7_1
os_pfsense_2_7_2

#####################
# Operating Systems #
Expand Down Expand Up @@ -190,4 +191,6 @@ os_pfsense_2_7_1

[os_vyos_1_4]

[os_pfsense_2_7_1]
[os_pfsense_2_7_1]

[os_pfsense_2_7_2]
2 changes: 1 addition & 1 deletion scripts/entrypoints/99-select-inventory.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ function bash_selector() {

else

echo "No projects found."
echo "No projects found in /srv/inventories or project does not have .git folder."

fi

Expand Down
2 changes: 1 addition & 1 deletion version.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version: 3.2.5
version: 3.3.0