From 77a79f43591588567d2da614cbda38a72e1bcdf9 Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Fri, 12 Jul 2019 08:45:27 +0000
Subject: [PATCH] Provide compute nodes with domain information

The domain is missing from the credentials that nova cloud
controller passes to the compute nodes. This change adds it in.

Closes-Bug: 1830536
Change-Id: I2ad82b9b271d83e1b49691187c620d7b976e5ff0
---
 .gitignore                                | 1 +
 hooks/nova_cc_hooks.py                    | 1 +
 templates/icehouse/etc_nova_api-paste.ini | 3 +++
 templates/kilo/etc_nova_api-paste.ini     | 3 +++
 templates/liberty/etc_nova_api-paste.ini  | 3 +++
 templates/mitaka/api-paste.ini            | 3 +++
 6 files changed, 14 insertions(+)

diff --git a/.gitignore b/.gitignore
index 0ef7b11d..006568ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ xenial/
 tests/cirros-*-disk.img
 func*.json
 .stestr
+__pycache__
diff --git a/hooks/nova_cc_hooks.py b/hooks/nova_cc_hooks.py
index f1dd859c..07106ee4 100755
--- a/hooks/nova_cc_hooks.py
+++ b/hooks/nova_cc_hooks.py
@@ -487,6 +487,7 @@ def _auth_config():
         'service_tenant': ncc_utils.auth_token_config('admin_tenant_name'),
         # add api version if found
         'api_version': ncc_utils.auth_token_config('api_version') or '2.0',
+        'admin_domain_name': ncc_utils.auth_token_config('admin_domain_name')
     }
     return cfg
 
diff --git a/templates/icehouse/etc_nova_api-paste.ini b/templates/icehouse/etc_nova_api-paste.ini
index 16211daa..ffae65c6 100644
--- a/templates/icehouse/etc_nova_api-paste.ini
+++ b/templates/icehouse/etc_nova_api-paste.ini
@@ -124,4 +124,7 @@ auth_protocol =  {{ auth_protocol }}
 admin_tenant_name = {{ admin_tenant_name }}
 admin_user = {{ admin_user }}
 admin_password = {{ admin_password }}
+{% if admin_domain_name -%}
+admin_domain_name = {{ admin_domain_name }}
+{% endif -%}
 {% endif -%}
diff --git a/templates/kilo/etc_nova_api-paste.ini b/templates/kilo/etc_nova_api-paste.ini
index 8ba8f4c3..c9666cc4 100644
--- a/templates/kilo/etc_nova_api-paste.ini
+++ b/templates/kilo/etc_nova_api-paste.ini
@@ -147,4 +147,7 @@ auth_protocol =  {{ auth_protocol }}
 admin_tenant_name = {{ admin_tenant_name }}
 admin_user = {{ admin_user }}
 admin_password = {{ admin_password }}
+{% if admin_domain_name -%}
+admin_domain_name = {{ admin_domain_name }}
+{% endif -%}
 {% endif -%}
diff --git a/templates/liberty/etc_nova_api-paste.ini b/templates/liberty/etc_nova_api-paste.ini
index 2600296d..e1a8945e 100644
--- a/templates/liberty/etc_nova_api-paste.ini
+++ b/templates/liberty/etc_nova_api-paste.ini
@@ -148,4 +148,7 @@ admin_tenant_name = {{ admin_tenant_name }}
 admin_user = {{ admin_user }}
 admin_password = {{ admin_password }}
 api_version = {{ api_version }}
+{% if admin_domain_name -%}
+admin_domain_name = {{ admin_domain_name }}
+{% endif -%}
 {% endif -%}
diff --git a/templates/mitaka/api-paste.ini b/templates/mitaka/api-paste.ini
index 2aaf207b..a5d4a4aa 100644
--- a/templates/mitaka/api-paste.ini
+++ b/templates/mitaka/api-paste.ini
@@ -116,4 +116,7 @@ auth_protocol =  {{ auth_protocol }}
 admin_tenant_name = {{ admin_tenant_name }}
 admin_user = {{ admin_user }}
 admin_password = {{ admin_password }}
+{% if admin_domain_name -%}
+admin_domain_name = {{ admin_domain_name }}
+{% endif -%}
 {% endif -%}