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

Bug fixes 2.x pr 2.x #1730

Merged
merged 126 commits into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
90aeb2c
Improving AWS subnet docs.
gregharvey Nov 22, 2023
c277047
Merge branch '2.x' into bug_fixes_2.x
gregharvey Nov 30, 2023
97570e3
Merge branch '2.x' into bug_fixes_2.x
gregharvey Dec 12, 2023
7c31b40
Error in timers structure in the SSL role.
gregharvey Dec 12, 2023
44a4d87
Merge branch '2.x' into bug_fixes_2.x-PR-2.x
gregharvey Dec 12, 2023
fd6c81b
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Dec 12, 2023
8a5acaa
Merge branch '2.x' into bug_fixes_2.x
gregharvey Dec 21, 2023
b75fe03
Removing obsolete backports requirements.
gregharvey Dec 21, 2023
c57b886
Merge branch '2.x' into bug_fixes_2.x-PR-2.x
gregharvey Dec 21, 2023
b270172
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Dec 21, 2023
5b27a8c
Allow the billing role to access Sustainability information.
gregharvey Dec 21, 2023
053097b
Merge branch '2.x' into bug_fixes_2.x-PR-2.x
gregharvey Dec 21, 2023
23bec8f
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Dec 21, 2023
883e323
Merge branch '2.x' into bug_fixes_2.x
gregharvey Dec 21, 2023
dff1847
Merge branch '2.x' into bug_fixes_2.x
gregharvey Dec 21, 2023
9ca4148
Missing comma in IAM billing policy.
gregharvey Dec 21, 2023
1e07a78
Merge branch '2.x' into bug_fixes_2.x-PR-2.x
gregharvey Dec 21, 2023
fa8c5dc
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Dec 21, 2023
d753fad
Merge branch '2.x' into bug_fixes_2.x
gregharvey Jan 9, 2024
c8199be
Removing broken GitLab Runner code.
gregharvey Jan 9, 2024
e1b01a8
Merge branch '2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 9, 2024
c222fec
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 9, 2024
0ba4138
Fixed the include_role task in gitlab_runner.
gregharvey Jan 10, 2024
aacf70b
Suppressing a failure if there is no system pip to call.
gregharvey Jan 10, 2024
8b20f84
Merge branch '2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 10, 2024
6357281
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 10, 2024
c634ef5
Logic error in Ansible installer username, needs to be set from calli…
gregharvey Jan 10, 2024
7e5fb2b
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 10, 2024
2673659
ansible_user is a reserved variable, seems to be causing issues.
gregharvey Jan 10, 2024
3dbd017
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 10, 2024
c6af4c0
_ansible_ANYTHING is reserved, using _install_username instead.
gregharvey Jan 10, 2024
2c487c2
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 10, 2024
b302676
python_boto role also needs the username set in the calling role.
gregharvey Jan 10, 2024
2fe29a1
Updating python_boto docs.
gregharvey Jan 10, 2024
b56f6a2
Merge branch '2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 10, 2024
443534d
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 10, 2024
32f3ced
Making profile.d loading more robust.
gregharvey Jan 11, 2024
1f8d80e
Also pip removing ansible-core and trying with pip and pip3 to cover …
gregharvey Jan 11, 2024
ff2803f
Updating bad AWS SG role var namespacing in other roles.
gregharvey Jan 11, 2024
edf2185
Merge branch '2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 11, 2024
d57d760
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 11, 2024
0966398
Refactoring how we handle python3-pip.
gregharvey Jan 11, 2024
45814bd
Merge branch '2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 11, 2024
bf05609
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 11, 2024
6b2b69b
Allow passing in of the Python interpreter to Ansible.
gregharvey Jan 12, 2024
ff82392
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 12, 2024
3c1d06c
Updating the packages server for CE.
gregharvey Jan 15, 2024
f9d55ad
Merging 2.x.
gregharvey Jan 15, 2024
c765a4b
Merging devel.
gregharvey Jan 15, 2024
d6a819e
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 15, 2024
2b422a9
Installing Ansible in a venv on all machines.
gregharvey Jan 16, 2024
54585fc
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 16, 2024
33abf0a
Changing common_base format for readability.
gregharvey Jan 16, 2024
a3ef3e9
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 16, 2024
394ec01
No need to specify Python to the point release.
gregharvey Jan 17, 2024
d44cda2
Merge branch '2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 17, 2024
3697d1c
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 17, 2024
122e4a8
Merging 2.x.
gregharvey Jan 17, 2024
f906530
Docs update.
gregharvey Jan 17, 2024
1657971
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 17, 2024
54602bc
Merge branch '2.x' into bug_fixes_2.x
gregharvey Jan 18, 2024
a621f1c
Merge branch '2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 18, 2024
e1ab6e7
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 18, 2024
7c43ab0
Merge branch '2.x' into bug_fixes_2.x
gregharvey Jan 18, 2024
9167265
Merge branch '2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 18, 2024
b0c5c34
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 18, 2024
9b63954
Fixing LDAP SSL to use systemd timer.
gregharvey Jan 18, 2024
516f61d
Allowing different systemd timer names for different Ansible installs.
gregharvey Jan 18, 2024
2f9363a
Merge branch 'bug_fixes_2.x-PR-2.x' of github.com:codeenigma/ce-provi…
gregharvey Jan 18, 2024
17f7804
Fixing dynamic key name in ansible role.
gregharvey Jan 19, 2024
75d9919
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 19, 2024
3f9f67e
Trying to debug missing timer_command var.
gregharvey Jan 19, 2024
e34d247
Treating the timer string so it becomes a dict.
gregharvey Jan 19, 2024
2d0d5e7
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 19, 2024
d8b3d89
Merge branch '2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 22, 2024
170c782
Moving default log location for clamav.
gregharvey Jan 22, 2024
84c15bf
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 22, 2024
21f882b
Updating ClamAV docs.
gregharvey Jan 22, 2024
48758c1
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 22, 2024
0950374
Merge branch '2.x' into bug_fixes_2.x
gregharvey Jan 24, 2024
a15256e
Merge branch '2.x' into bug_fixes_2.x
gregharvey Jan 25, 2024
a57c5ff
Grouping systemd timer tasks together.
gregharvey Jan 25, 2024
6d96c0c
Merge branch '2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 25, 2024
cc223d2
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Jan 25, 2024
b4473ca
Merge branch '2.x' into bug_fixes_2.x
gregharvey Feb 21, 2024
36a52ee
Exposing ce-provision version in build output.
gregharvey Feb 21, 2024
7739831
Merge branch '2.x' into bug_fixes_2.x-PR-2.x
gregharvey Feb 21, 2024
e6217f1
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Feb 21, 2024
a1f51a1
Merge branch '2.x' into bug_fixes_2.x
gregharvey Feb 23, 2024
a02e9e5
Wrong variable in meta role for controller username.
gregharvey Feb 23, 2024
3597b41
Merge branch '2.x' into bug_fixes_2.x-PR-2.x
gregharvey Feb 23, 2024
4b0c62f
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey Feb 23, 2024
b8c2c72
Merging 2.x.
gregharvey May 13, 2024
bd22857
Merge branch '2.x' into bug_fixes_2.x
gregharvey May 13, 2024
206b36e
Removing any reference to _aws variables in debian role defaults.
gregharvey May 13, 2024
091a1a8
Merging 2.x.
gregharvey May 13, 2024
5bd3a2f
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey May 13, 2024
a669010
Merge branch '2.x' into bug_fixes_2.x
gregharvey May 14, 2024
8ee9e69
Setting more sane ASG defaults.
gregharvey May 14, 2024
f56da67
Merge branch '2.x' into bug_fixes_2.x-PR-2.x
gregharvey May 14, 2024
f143188
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey May 14, 2024
aff0054
Making ClamAV timers a list so they can be entirely replaced.
gregharvey May 14, 2024
83d721a
Merge branch '2.x' into bug_fixes_2.x-PR-2.x
gregharvey May 14, 2024
23a55de
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey May 14, 2024
cb4f6eb
Spacing fix for linting.
gregharvey May 16, 2024
7103006
Merge branch '2.x' into bug_fixes_2.x
gregharvey May 22, 2024
ad20385
Renaming npm module.
gregharvey May 22, 2024
3285e19
Merging 2.x.
gregharvey May 22, 2024
437fc49
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey May 22, 2024
6ada751
Merge branch '2.x' into bug_fixes_2.x
gregharvey May 22, 2024
e97ea5d
Merge branch '2.x' into bug_fixes_2.x
gregharvey May 27, 2024
cf6d60c
Removing NGINX installation as part of phpMyAdmin role by default.
gregharvey May 27, 2024
336bd0a
Merge branch '2.x' into bug_fixes_2.x-PR-2.x
gregharvey May 27, 2024
3f4a090
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey May 27, 2024
3de5bf6
Fixing Varnish handler names.
gregharvey May 27, 2024
502d031
Merge branch '2.x' into bug_fixes_2.x-PR-2.x
gregharvey May 27, 2024
edcccfb
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey May 27, 2024
cda4642
Excluding name[casing] rule from linting due to false positives.
gregharvey May 27, 2024
b6550df
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey May 27, 2024
3a25d9b
Put rule in wrong place!
gregharvey May 27, 2024
31bb61a
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey May 27, 2024
4fa0f63
Merge branch '2.x' into bug_fixes_2.x
gregharvey May 29, 2024
31b7e90
Removing lock file behaviour from ASGs as it cannot work unless contr…
gregharvey May 29, 2024
34d295d
Capturing lock file limitations in comment.
gregharvey May 29, 2024
afe08e5
Merge branch '2.x' into bug_fixes_2.x-PR-2.x
gregharvey May 29, 2024
27cb997
Merge branch 'bug_fixes_2.x' into bug_fixes_2.x-PR-2.x
gregharvey May 29, 2024
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
3 changes: 2 additions & 1 deletion roles/_init/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
ansible.builtin.debug:
msg: "Using ce-provision {{ _init.ce_provision_version }}"

# See roles/aws/aws_ec2_autoscale_cluster for lock handling in ASGs.
# @TODO This cannot work for ASGs.
# We will need something central for lock files and it cannot be controller servers because they may be containers.
- name: Check for a ce-deploy lock file.
ansible.builtin.stat:
path: "{{ _init.deploy_lock_file }}"
Expand Down
36 changes: 0 additions & 36 deletions roles/aws/aws_ec2_autoscale_cluster/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,4 @@
---
# With ASGs the lock behaviour in _init will not work, we need to do it here.
- name: Check for a ce-deploy lock file.
ansible.builtin.stat:
path: "{{ _init.deploy_lock_file }}"
register: _ce_deploy_lock
connection: ssh
run_once: true
when: aws_ec2_autoscale_cluster.type == "ec2"

- name: Abort if ce-deploy lock file exists.
when:
- _ce_deploy_lock.stat.exists is defined and _ce_deploy_lock.stat.exists
block:
- name: Abort if ce-deploy lock file is found.
ansible.builtin.debug:
msg: "ce-deploy lock file discovered, a deployment is in progress! If this is not the case, login to the affected server and delete the file at {{ _init.deploy_lock_file }}."
- ansible.builtin.meta: end_play

- name: Set a lock file on each ASG machine.
ansible.builtin.file:
path: "{{ _init.lock_file }}"
state: touch
mode: 0644
connection: ssh
when: aws_ec2_autoscale_cluster.type == "ec2"

# @todo Do we still need that? Used by AMI and LC,
# but probably could simply use the base name.
- name: Define unique name for resources.
Expand Down Expand Up @@ -782,13 +756,3 @@
when:
- aws_ec2_autoscale_cluster.route_53.zone is defined
- aws_ec2_autoscale_cluster.route_53.zone | length > 0

# We only need to remove the lock file if the machines will not be replaced.
- name: Remove the lock file on each ASG machine.
ansible.builtin.file:
path: "{{ _init.lock_file }}"
state: absent
connection: ssh
when:
- aws_ec2_autoscale_cluster.type == "ec2"
- not aws_ec2_autoscale_cluster.asg_refresh
Loading