Merge branch 'stackhpc/yoga' into feat/yoga-elrepo-9

Author: m-bull

etc/kayobe/ansible/scripts/nvmemon.sh

@@ -44,14 +44,18 @@ format_output() {
 nvme_version="$(nvme version | awk '$1 == "nvme" {print $3}')"
 echo "nvmecli{version=\"${nvme_version}\"} 1" | format_output
 
-# Get devices
-device_list="$(nvme list -o json | jq -r '.Devices | .[].DevicePath')"
+# Get devices (DevicePath and PhysicalSize)
+device_info="$(nvme list -o json | jq -c '.Devices[] | {DevicePath: .DevicePath, PhysicalSize: .PhysicalSize}')"
 
 # Loop through the NVMe devices
-for device in ${device_list}; do
+echo "$device_info" | while read -r device_data; do
+  device=$(echo "$device_data" | jq -r '.DevicePath')
   json_check="$(nvme smart-log -o json "${device}")"
   disk="${device##*/}"
 
+  physical_size=$(echo "$device_data" | jq -r '.PhysicalSize')
+  echo "physical_size_bytes{device=\"${disk}\"} ${physical_size}"
+
   # The temperature value in JSON is in Kelvin, we want Celsius
   value_temperature="$(echo "$json_check" | jq '.temperature - 273')"
   echo "temperature_celsius{device=\"${disk}\"} ${value_temperature}"

etc/kayobe/environments/ci-builder/kolla.yml

@@ -100,7 +100,7 @@ kolla_openstack_release: "{% raw %}{{ kayobe_image_tags['openstack'][kolla_base_
 
 # Docker tag applied to built container images. Default is
 # {{ kolla_openstack_release }}.
-#kolla_tag:
+kolla_tag: "{{ openstack_release }}-{{ ansible_facts.date_time.iso8601_basic_short }}"
 
 # Dict mapping names of sources to their definitions for
 # kolla_install_type=source. See kolla.common.config for details.

etc/kayobe/kolla.yml

@@ -0,0 +1,26 @@
+---
+fixes:
+  - |
+    Fixes an issue with local image builds where kolla_tag had not been set.
+    The error had the signature:
+
+    .. code-block:
+
+      Traceback (most recent call last):
+        File "/opt/kayobe/venvs/kolla/lib/python3.6/site-packages/kolla/image/build.py", line 565, in builder
+          buildargs=buildargs):
+        File "/opt/kayobe/venvs/kolla/lib/python3.6/site-packages/docker/api/build.py", line 269, in build
+          timeout=timeout,
+        File "/opt/kayobe/venvs/kolla/lib/python3.6/site-packages/docker/utils/decorators.py", line 46, in inner
+          return f(self, *args, **kwargs)
+        File "/opt/kayobe/venvs/kolla/lib/python3.6/site-packages/docker/api/client.py", line 233, in _post
+          return self.post(url, **self._set_request_timeout(kwargs))
+        File "/opt/kayobe/venvs/kolla/lib/python3.6/site-packages/requests/sessions.py", line 577, in post
+          return self.request('POST', url, data=data, json=json, **kwargs)
+        File "/opt/kayobe/venvs/kolla/lib/python3.6/site-packages/requests/sessions.py", line 529, in request
+          resp = self.send(prep, **send_kwargs)
+        File "/opt/kayobe/venvs/kolla/lib/python3.6/site-packages/requests/sessions.py", line 645, in send
+          r = adapter.send(request, **kwargs)
+        File "/opt/kayobe/venvs/kolla/lib/python3.6/site-packages/requests/adapters.py", line 501, in send
+          raise ConnectionError(err, request=request)
+      requests.exceptions.ConnectionError: ('Connection aborted.', ConnectionResetError(104, 'Connection reset by peer'))

releasenotes/notes/fix-local-image-build-59967df0a2bceddf.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Nvmemon now reports physical size of the disk.