From e9afc5fe240a3cd5c9c74ae4e5272260b610a49e Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Fri, 17 Feb 2017 17:55:26 +0000
Subject: [PATCH] Add support for Bifrost dib_os_release
There is a Bifrost bug that causes this variable to be required
---
ansible/group_vars/all/bifrost | 3 +++
ansible/roles/kolla-bifrost/defaults/main.yml | 3 +++
ansible/roles/kolla-bifrost/templates/dib.yml.j2 | 5 ++++-
etc/kayobe/bifrost.yml | 3 +++
4 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/ansible/group_vars/all/bifrost b/ansible/group_vars/all/bifrost
index 9a5d4c1b..53b6d0b3 100644
--- a/ansible/group_vars/all/bifrost
+++ b/ansible/group_vars/all/bifrost
@@ -7,6 +7,9 @@
# DIB base OS element.
kolla_bifrost_dib_os_element: "centos7"
+# DIB image OS release.
+kolla_bifrost_dib_os_release: "GenericCloud"
+
# List of DIB elements.
kolla_bifrost_dib_elements:
- "serial-console"
diff --git a/ansible/roles/kolla-bifrost/defaults/main.yml b/ansible/roles/kolla-bifrost/defaults/main.yml
index d0fed6d5..e9b47372 100644
--- a/ansible/roles/kolla-bifrost/defaults/main.yml
+++ b/ansible/roles/kolla-bifrost/defaults/main.yml
@@ -5,6 +5,9 @@ kolla_node_custom_config_path:
# DIB image OS element.
kolla_bifrost_dib_os_element:
+# DIB image OS release.
+kolla_bifrost_dib_os_release:
+
# List of DIB image elements.
kolla_bifrost_dib_elements: []
diff --git a/ansible/roles/kolla-bifrost/templates/dib.yml.j2 b/ansible/roles/kolla-bifrost/templates/dib.yml.j2
index 65147b31..e3456414 100644
--- a/ansible/roles/kolla-bifrost/templates/dib.yml.j2
+++ b/ansible/roles/kolla-bifrost/templates/dib.yml.j2
@@ -2,11 +2,14 @@
# Diskimage-builder element for base OS.
dib_os_element: "{{ kolla_bifrost_dib_os_element }}"
+# DIB OS release.
+dib_os_release: "{{ kolla_bifrost_dib_os_release }}"
+
# List of DIB image elements.
dib_elements: "{{ (kolla_bifrost_dib_elements + [kolla_bifrost_dib_init_element]) | join(' ') }}"
# DIB image environment variables.
-dib_env_vars: "{{ kolla_bifrost_dib_env_vars }}"
+{{ {'dib_env_vars': kolla_bifrost_dib_env_vars} | to_nice_yaml }}
# List of DIB image packages.
dib_packages: "{{ kolla_bifrost_dib_packages | join(',') }}"
diff --git a/etc/kayobe/bifrost.yml b/etc/kayobe/bifrost.yml
index d88eeabd..a9860f94 100644
--- a/etc/kayobe/bifrost.yml
+++ b/etc/kayobe/bifrost.yml
@@ -7,6 +7,9 @@
# DIB base OS element.
#kolla_bifrost_dib_os_element:
+# DIB image OS release.
+#kolla_bifrost_dib_os_release:
+
# List of DIB elements.
#kolla_bifrost_dib_elements:
--
GitLab