Skip to content

Commit 09275df

Browse files
committed
Merge stackhpc/zed into stackhpc/2023.1
2 parents 860b818 + 2e2ff99 commit 09275df

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

.github/workflows/stackhpc-all-in-one.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,17 @@ jobs:
137137
run: ssh-keygen -f id_rsa -N ''
138138
working-directory: ${{ github.workspace }}/terraform/aio
139139

140+
# TODO: Remove the following step in Antelope.
141+
# NOTE: In Ansible 2.10 and lower the synchronize module used in the
142+
# ansible/diagnostics.yml playbook does not respect SSH connection
143+
# variables. This may result in Permission Denied issues if using an SSH
144+
# key that is not in ~/.ssh.
145+
- name: Copy SSH keypair to .ssh/
146+
run: |
147+
install -d ~/.ssh -m 700 &&
148+
cp id_rsa* ~/.ssh/
149+
working-directory: ${{ github.workspace }}/terraform/aio
150+
140151
- name: Generate clouds.yaml
141152
run: |
142153
cat << EOF > clouds.yaml

doc/source/configuration/monitoring.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ on the overcloud hosts:
7474
.. code-block:: console
7575
7676
(kayobe) [stack@node ~]$ cd etc/kayobe
77-
(kayobe) [stack@node kayobe]$ kayobe playbook run ansible/smartmontools.yml
77+
(kayobe) [stack@node kayobe]$ kayobe playbook run ansible/smartmon-tools.yml
7878
7979
SMART reporting should now be enabled along with a Prometheus alert for
8080
unhealthy disks and a Grafana dashboard called ``Hardware Overview``.

etc/kayobe/environments/aufn-ceph/tenks.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ node_types:
2121
volumes:
2222
# There is a minimum disk space capacity requirement of 4GiB when using Ironic Python Agent:
2323
# https://github.com/openstack/ironic-python-agent/blob/master/ironic_python_agent/utils.py#L290
24-
- capacity: 10GiB
24+
- capacity: 15GiB
2525
# Ceph volume
26-
- capacity: 10GiB
26+
- capacity: 20GiB
2727
physical_networks:
2828
- provision-net
2929
- cloud-net
@@ -34,7 +34,7 @@ node_types:
3434
volumes:
3535
# There is a minimum disk space capacity requirement of 4GiB when using Ironic Python Agent:
3636
# https://github.com/openstack/ironic-python-agent/blob/master/ironic_python_agent/utils.py#L290
37-
- capacity: 10GiB
37+
- capacity: 15GiB
3838
physical_networks:
3939
- provision-net
4040
- cloud-net

0 commit comments

Comments
 (0)