fix: mongo role for sandbox

Author: nadeemshahzad

Makefile

@@ -20,6 +20,11 @@ requirements:
 	pip install -qr requirements/pip.txt --exists-action w
 	pip install -qr requirements.txt --exists-action w
 
+requirements3_12:
+	pip install -qr requirements/pip.txt --exists-action w
+	pip install -qr requirements3_12txt --exists-action w
+
+
 COMMON_CONSTRAINTS_TXT=requirements/common_constraints.txt
 .PHONY: $(COMMON_CONSTRAINTS_TXT)
 $(COMMON_CONSTRAINTS_TXT):

playbooks/edx_provision.yml

@@ -61,7 +61,7 @@
       wait_for:
         path: /var/log/cloud-init.log
         timeout: 15
-        search_regex: "final-message"
+        search_regex: "final[-_]message"
     - name: gather_facts
       setup: ""
   vars_files:

playbooks/library/ec2_lookup

@@ -16,7 +16,10 @@
 
 from __future__ import absolute_import
 from __future__ import print_function
-import six
+import sys
+import boto3
+from ansible.module_utils.basic import AnsibleModule
+
 DOCUMENTATION = '''
 ---
 module: ec2_lookup
@@ -28,8 +31,8 @@ options:
   region:
     description:
       - The AWS region to use.  Must be specified if ec2_url
-        is not used.  If not specified then the value of the
-        EC2_REGION environment variable, if any, is used.
+        is not used.  If not specified then the value of
+        the EC2_REGION environment variable, if any, is used.
     required: false
     default: null
     aliases: [ 'aws_region', 'ec2_region' ]
@@ -42,20 +45,20 @@ options:
     aliases: [ 'ec2_secret_key', 'secret_key' ]
   aws_access_key:
     description:
-      - AWS access key. If not set then the value of the
-        AWS_ACCESS_KEY environment variable is used.
+      - AWS access key. If not set then the value of
+        the AWS_ACCESS_KEY environment variable is used.
     required: false
     default: null
     aliases: [ 'ec2_access_key', 'access_key' ]
   tags:
-    desription:
+    description:
       - tags to lookup
     required: false
     default: null
     type: dict
     aliases: []
 
-requirements: [ "boto" ]
+requirements: [ "boto3" ]
 author: John Jarvis
 '''
 
@@ -70,8 +73,6 @@ EXAMPLES = '''
         Name: foo
 '''
 
-import sys
-
 AWS_REGIONS = ['ap-northeast-1',
                'ap-southeast-1',
                'ap-southeast-2',
@@ -81,17 +82,8 @@ AWS_REGIONS = ['ap-northeast-1',
                'us-west-1',
                'us-west-2']
 
-try:
-    import boto.ec2
-    from boto.ec2 import connect_to_region
-except ImportError:
-    print("failed=True msg='boto required for this module'")
-    sys.exit(1)
-
-
 def main():
-
-    module=AnsibleModule(
+    module = AnsibleModule(
         argument_spec=dict(
             ec2_url=dict(),
             region=dict(aliases=['aws_region', 'ec2_region'],
@@ -108,35 +100,34 @@ def main():
     region = module.params.get('region')
     ec2_url = module.params.get('ec2_url')
 
-    # If we have a region specified, connect to its endpoint.
+    # If region is specified, create a session with boto3 and connect to the EC2 service
     if region:
         try:
-            ec2 = connect_to_region(region, aws_access_key_id=aws_access_key,
-                                    aws_secret_access_key=aws_secret_key)
-        except boto.exception.NoAuthHandlerFound as e:
-            module.fail_json(msg=str(e))
-    # If we specified an ec2_url then try connecting to it
-    elif ec2_url:
-        try:
-            ec2 = boto.connect_ec2_endpoint(ec2_url, aws_access_key,
-                                            aws_secret_key)
-        except boto.exception.NoAuthHandlerFound as e:
-            module.fail_json(msg=str(e))
+            ec2 = boto3.resource('ec2', region_name=region, aws_access_key_id=aws_access_key, aws_secret_access_key=aws_secret_key)
+        except Exception as e:
+            module.fail_json(msg=f"Error connecting to AWS EC2: {str(e)}")
     else:
-        module.fail_json(msg="Either region or ec2_url must be specified")
+        module.fail_json(msg="Region must be specified")
+
+    # If EC2 URL is provided, it can be used for connection
+    if ec2_url:
+        module.fail_json(msg="ec2_url is not supported in boto3 connection. Please use region instead.")
 
     instances = []
     instance_ids = []
-    for res in ec2.get_all_instances(filters={'tag:' + tag: value
-                                     for tag, value in six.iteritems(module.params.get('tags'))}):
-        for inst in res.instances:
-            if inst.state == "running":
-                instances.append({k: v for k, v in six.iteritems(inst.__dict__)
-                                  if isinstance(v, (six.string_types))})
-                instance_ids.append(inst.id)
-    module.exit_json(changed=False, instances=instances,
-                     instance_ids=instance_ids)
 
+    # Get all instances with the specified tags
+    filters = {'tag:' + tag: value for tag, value in module.params.get('tags', {}).items()}
+    try:
+        instances_query = ec2.instances.filter(Filters=[{'Name': f'tag:{tag}', 'Values': [value]} for tag, value in filters.items()])
+        for instance in instances_query:
+            if instance.state['Name'] == 'running':
+                instances.append({k: v for k, v in instance.__dict__.items() if isinstance(v, str)})
+                instance_ids.append(instance.id)
+    except Exception as e:
+        module.fail_json(msg=f"Error querying EC2 instances: {str(e)}")
+
+    module.exit_json(changed=False, instances=instances, instance_ids=instance_ids)
 
 # this is magic, see lib/ansible/module_common.py
 #<<INCLUDE_ANSIBLE_MODULE_COMMON>>

playbooks/roles/common/tasks/main.yml

@@ -2,7 +2,9 @@
 - name: Check Configuration Sources
   fail:
     msg: "Configuration Sources Checking (COMMON_EXTRA_CONFIGURATION_SOURCES_CHECKING) is enabled, you must define {{ item }}"
-  when: COMMON_EXTRA_CONFIGURATION_SOURCES_CHECKING and ({{ item }} is not defined or {{ item }} != True)
+  when: 
+    - COMMON_EXTRA_CONFIGURATION_SOURCES_CHECKING
+    - item not in vars or vars[item] != True
   with_items: "{{ COMMON_EXTRA_CONFIGURATION_SOURCES }}"
   tags:
     - "install"
@@ -170,8 +172,15 @@
     state: present
     extra_args: "-i {{ COMMON_PYPI_MIRROR_URL }}"
     executable: pip3
-  when: ansible_distribution in common_debian_variants
+  when: ansible_distribution in common_debian_variants and ansible_distribution_release != "noble"
 
+- name: pip install virtualenv
+  pip:
+    name: "{{ common_pip_pkgs }}"
+    state: present
+    extra_args: "-i {{ COMMON_PYPI_MIRROR_URL }} --break-system-packages"
+    executable: pip3
+  when: ansible_distribution in common_debian_variants and ansible_distribution_release == "noble"
 
 - name: update /etc/hosts
   template:

playbooks/roles/launch_ec2/tasks/main.yml

@@ -35,26 +35,27 @@
   when: terminate_instance == true and elb and tag_lookup.instance_ids|length == 1
 
 - name: Launch ec2 instance
-  local_action:
-    module: ec2
-    keypair: "{{ keypair }}"
-    group: "{{ security_group }}"
+  community.aws.ec2_instance:
+    key_name: "{{ keypair }}"
+    security_groups: 
+     - "{{ security_group }}"
     instance_type: "{{ instance_type }}"
     instance_initiated_shutdown_behavior: "{{ instance_initiated_shutdown_behavior }}"
-    image: "{{ ami }}"
+    image_id: "{{ ami }}"
     vpc_subnet_id: "{{ vpc_subnet_id }}"
-    assign_public_ip: yes
     wait: true
     region: "{{ region }}"
-    instance_tags: "{{ instance_tags }}"
+    tags: "{{ instance_tags }}"
+    network:
+      assign_public_ip: true
     volumes:
       - device_name: /dev/sda1
-        volume_size: "{{ root_ebs_size }}"
-        delete_on_termination: true
-        volume_type: "gp2"
-        encrypted: true
-    zone: "{{ zone }}"
-    instance_profile_name: "{{ instance_profile_name }}"
+        ebs:
+          volume_size: "{{ root_ebs_size }}"
+          delete_on_termination: true
+          volume_type: "gp2"
+          encrypted: true
+    instance_role: "{{ instance_profile_name }}"
     user_data: "{{ user_data }}"
   register: ec2
 
@@ -97,7 +98,7 @@
 - name: Add new instance to host group
   local_action:
     module: add_host
-    hostname: "{{ item.public_ip }}"
+    hostname: "{{ item.network_interfaces[0].association.public_ip }}"
     groups: launched
   with_items: "{{ ec2.instances }}"
 

playbooks/roles/mongo_7_0/defaults/main.yml

@@ -17,6 +17,7 @@ mongo_journal_dir: "{{ COMMON_DATA_DIR }}/mongo/mongodb/journal"
 mongo_user: mongodb
 
 MONGODB_REPO: "deb http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/{{ MONGO_VERSION_MAJOR_MINOR }} multiverse"
+MONGODB_REPO_NOBLE: "deb http://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/{{ MONGO_VERSION_MAJOR_MINOR }} multiverse"
 
 mongodb_debian_pkgs:
   - "mongodb-org={{ MONGO_VERSION }}"

playbooks/roles/mongo_7_0/tasks/main.yml

@@ -27,6 +27,18 @@
     state: present
     version: "{{ PYMONGO_VERSION }}"
     extra_args: "-i {{ COMMON_PYPI_MIRROR_URL }}"
+  when: ansible_distribution_release != "noble"
+  tags:
+    - "install"
+    - "install:app-requirements"
+
+- name: install python pymongo for mongo_user ansible module
+  pip:
+    name: pymongo
+    state: present
+    version: "{{ PYMONGO_VERSION }}"
+    extra_args: "-i {{ COMMON_PYPI_MIRROR_URL }} --break-system-packages"
+  when: ansible_distribution_release == "noble"
   tags:
     - "install"
     - "install:app-requirements"
@@ -46,6 +58,17 @@
   apt_repository:
     repo: "{{ MONGODB_REPO }}"
     state: present
+  when: ansible_distribution_release != "noble"
+  tags:
+    - "install"
+    - "install:app-requirements"
+    - "mongo_packages"
+
+- name: add the mongodb repo to the sources list
+  apt_repository:
+    repo: "{{ MONGODB_REPO_NOBLE }}"
+    state: present
+  when: ansible_distribution_release == "noble"
   tags:
     - "install"
     - "install:app-requirements"
@@ -172,7 +195,9 @@
 - name: determine if backup tasks should run
   set_fact:
     is_backup_node: true
-  when: MONGO_BACKUP_ENABLED and '{{ ansible_default_ipv4.address|default(ansible_all_ipv4_addresses[0]) }}' == '{{ MONGO_BACKUP_NODE }}'
+  when:
+    - MONGO_BACKUP_ENABLED
+    - ansible_default_ipv4.address | default(ansible_all_ipv4_addresses[0]) == MONGO_BACKUP_NODE
   tags:
     - "backup:mongo"
 

playbooks/roles/mysql/defaults/main.yml

@@ -4,12 +4,12 @@ remove_experimental_mysql: false
 mysql_debian_pkgs_default:
   - python3-mysqldb
 mysql_release_specific_debian_pkgs:
-  xenial:
-    - python-mysqldb
   bionic:
     - python-mysqldb
   focal:
     - python3-mysqldb
+  noble:
+    - python3-mysqldb
 mysql_debian_pkgs: "{{ mysql_debian_pkgs_default + mysql_release_specific_debian_pkgs[ansible_distribution_release] }}"
 
 mysql_server_pkg: "{{ 'mysql-server-5.7' if mysql_server_version_5_7 is defined and (mysql_server_version_5_7 | bool) else 'mysql-server-5.6' }}"

playbooks/roles/mysql/tasks/mysql.yml

@@ -44,7 +44,7 @@
     name: "{{ mysql_server_pkg }}"
     install_recommends: yes
     state: present
-  when: ansible_distribution_release != 'focal'
+  when: ansible_distribution_release != 'focal' and ansible_distribution_release != 'noble'
 
 - name: Set default character sets and collations
   template:
@@ -53,7 +53,7 @@
     owner: root
     group: root
     mode: 0644
-  when: ansible_distribution_release != 'bionic' and ansible_distribution_release != 'focal'
+  when: ansible_distribution_release != 'bionic' and ansible_distribution_release != 'focal' and ansible_distribution_release != 'noble'
 
 - name: add the mysql signing key
   apt_key:
@@ -95,7 +95,7 @@
      name: "{{ mysql_server_8_0_pkgs }}"
      state: present
      update_cache: yes
-  when: ansible_distribution_release == 'focal' and mysql_8_0_install
+  when: ((ansible_distribution_release == 'focal') or (ansible_distribution_release == 'noble')) and mysql_8_0_install
 
 
 - name: restart mysql

playbooks/roles/redis/defaults/main.yml

@@ -28,10 +28,12 @@ redis_group: redis
 #
 
 REDIS_REPO: "deb https://packages.redis.io/deb {{ ansible_distribution_release }} main"
-REDIS_VERSION: "6:7.2.0-1rl1~focal1"
+redis_release_specific_pkg:
+  focal: "6:7.2.0-1rl1~focal1"
+  noble: "6:7.4.2-1rl1~noble1" 
 
 redis_debian_pkgs:
-  - "redis-tools={{ REDIS_VERSION }}"
-  - "redis-server={{ REDIS_VERSION }}"
+  - "redis-tools={{ redis_release_specific_pkg[ansible_distribution_release] }}"
+  - "redis-server={{ redis_release_specific_pkg[ansible_distribution_release] }}"
 
 redis_redhat_pkgs: []