Skip to content

Commit 875f61e

Browse files
committed
add changes from branch rl9
1 parent 2d78fc9 commit 875f61e

File tree

6 files changed

+18
-11
lines changed

6 files changed

+18
-11
lines changed

ansible/roles/mysql/tasks/install.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1+
- name: Install pip
2+
dnf:
3+
name: python3-pip
4+
15
- name: Install python mysql client
26
pip:
3-
name: pymysql
7+
name:
8+
- pymysql
9+
- cryptography
410
state: present
511

612
- name: Create systemd mysql container unit file

ansible/roles/mysql/templates/mysql.service.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ExecStart=/usr/bin/podman run \
2626
--volume {{ mysql_datadir }}:/var/lib/mysql:U \
2727
--publish 3306:3306 \
2828
--env MYSQL_ROOT_PASSWORD=${MYSQL_INITIAL_ROOT_PASSWORD} \
29-
mysql:{{ mysql_tag }}{%- for opt in mysql_mysqld_options %} \
29+
docker.io/library/mysql:{{ mysql_tag }}{%- for opt in mysql_mysqld_options %} \
3030
--{{ opt }}{% endfor %}
3131

3232
ExecStop=/usr/bin/podman stop --ignore mysql -t 10

ansible/roles/opensearch/templates/opensearch.service.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ExecStart=/usr/bin/podman run \
2929
--env bootstrap.memory_lock=true \
3030
--env "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" \
3131
--env DISABLE_INSTALL_DEMO_CONFIG=true \
32-
opensearchproject/opensearch:{{ opensearch_version }}
32+
docker.io/opensearchproject/opensearch:{{ opensearch_version }}
3333
ExecStop=/usr/bin/podman stop --ignore opensearch -t 10
3434
# note for some reason this returns status=143 which makes systemd show the unit as failed, not stopped
3535
ExecStopPost=/usr/bin/podman rm --ignore -f opensearch

environments/.stackhpc/hooks/post-bootstrap.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
gather_facts: false
44
tags: podman
55
tasks:
6-
- name: Configure container image registry for unqualified searches to avoid docker.io ratelimits
6+
- name: Configure container image registry to avoid docker.io ratelimits
77
copy:
8-
dest: /etc/containers/registries.conf.d/003-arcus-unqualfied-overrides.conf
8+
dest: /etc/containers/registries.conf.d/003-arcus-mirror.conf
99
content: |
10-
unqualified-search-registries = ['{{ podman_registry_address | split('/') | first }}', 'registry.access.redhat.com', 'registry.redhat.io', 'docker.io']
11-
1210
[[registry]]
13-
prefix = "{{ podman_registry_address }}"
11+
location="docker.io/library/"
12+
prefix="docker.io/library/"
13+
14+
[[registry.mirror]]
1415
location = "{{ podman_registry_address }}"
1516
insecure = true
1617
when: "ci_cloud == 'ARCUS'"

environments/.stackhpc/terraform/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ variable "cluster_name" {
1313
variable "cluster_image" {
1414
description = "single image for all cluster nodes - a convenience for CI"
1515
type = string
16-
default = "openhpc-240116-1156-aa8dba7d" # https://github.com/stackhpc/ansible-slurm-appliance/pull/351
17-
# default = "Rocky-8-GenericCloud-Base-8.9-20231119.0.x86_64.qcow2"
16+
# default = "openhpc-240116-1156-aa8dba7d" # https://github.com/stackhpc/ansible-slurm-appliance/pull/351
17+
default = "Rocky-9-GenericCloud-Base-9.3-20231113.0.x86_64.qcow2"
1818
}
1919

2020
variable "cluster_net" {}

requirements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ roles:
33
- src: stackhpc.nfs
44
version: v23.12.1 # Tolerate state nfs file handles
55
- src: https://github.com/stackhpc/ansible-role-openhpc.git
6-
version: v0.23.0 # https://github.com/stackhpc/ansible-role-openhpc/pull/165
6+
version: rl9
77
name: stackhpc.openhpc
88
- src: https://github.com/stackhpc/ansible-node-exporter.git
99
version: stackhpc

0 commit comments

Comments
 (0)