Various capacity fixes

Author: assumptionsandg

doc/source/configuration/monitoring.rst

@@ -175,14 +175,14 @@ via Kayobe.
 
 .. code-block:: console
 
-    kayobe playbook run ansible/deploy-os-capacity-exporter.yml
+    kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/deploy-os-capacity-exporter.yml
 
 It is required that you re-configure the Prometheus, Grafana and HAProxy
 services following deployment, to do this run the following Kayobe command.
 
 .. code-block:: console
 
-    kayobe overcloud service reconfigure -kt grafana,prometheus,haproxy
+    kayobe overcloud service reconfigure -kt grafana,prometheus,loadbalancer
 
 If you notice ``HaproxyServerDown`` or ``HaproxyBackendDown`` prometheus
 alerts after deployment it's likely the os_exporter secrets have not been

etc/kayobe/ansible/templates/os_capacity-clouds.yml.j2

@@ -1,10 +1,10 @@
 clouds:
   openstack:
     auth:
-      auth_url: "{{ secrets_os_capacity_auth_url }}"
+      auth_url: "{{ stackhpc_os_capacity_auth_url }}"
       application_credential_id: "{{ secrets_os_capacity_credential_id }}"
       application_credential_secret: "{{ secrets_os_capacity_credential_secret }}"
-    region_name: "RegionOne"
+    region_name: "{{ stackhpc_os_capacity_openstack_region_name }}"
     interface: "internal"
     identity_api_version: 3
     auth_type: "v3applicationcredential"

etc/kayobe/stackhpc-monitoring.yml

@@ -16,6 +16,12 @@ alertmanager_low_memory_threshold_gib: 5
 # targets being templated during deployment.
 stackhpc_enable_os_capacity: false
 
+# Keystone authentication URL for OpenStack Capacity
+stackhpc_os_capacity_auth_url: "{{ public_openrc_auth_url }}"
+
+# OpenStack region for OpenStack Capacity
+stackhpc_os_capacity_openstack_region_name: "{{ openstack_region_name | default(RegionOne) }}"
+
 # Whether TLS certificate verification is enabled for the OpenStack Capacity
 # exporter during Keystone authentication.
 stackhpc_os_capacity_openstack_verify: true