Update unit tests and fix issue highlighted by them

ansible/roles/kolla-ansible/templates/globals.yml.j2

@@ -288,7 +288,7 @@ bifrost_deploy_image: "{% raw %}{{ docker_registry ~ '/' if docker_registry else
 # in the Grafana database, breaking the local admin account, and
 # preventing admin API calls to Grafana. To reduce the chance of this
 # happening the local admin account is renamed here.
-{% if kolla_enable_grafana and grafana_local_admin_user_name %}
+{% if kolla_enable_grafana and grafana_local_admin_user_name is defined %}
 grafana_admin_username: "{{ grafana_local_admin_user_name }}"
 {% endif %}
 

ansible/roles/kolla-ansible/tests/test-defaults.yml

@@ -45,6 +45,7 @@
             kolla_provision_interface: "eth9"
             kolla_inspector_dnsmasq_interface: "eth10"
             kolla_enable_tls_external: False
+            kolla_enable_grafana: False
             kolla_external_fqdn_cert: "fake-cert"
             kolla_openstack_logging_debug: False
 
@@ -117,6 +118,7 @@
               - enable_ironic
               - enable_neutron
               - enable_nova
+              - grafana_admin_username
 
         - name: Check whether inventory files exist
           stat:

ansible/roles/kolla-ansible/tests/test-extras.yml

@@ -58,6 +58,7 @@
             kolla_enable_tls_external: False
             kolla_external_fqdn_cert: "fake-cert"
             kolla_openstack_logging_debug: True
+            grafana_local_admin_user_name: "grafana-admin"
             # Enable everything.
             kolla_enable_aodh: True
             kolla_enable_barbican: True
@@ -186,6 +187,7 @@
               kolla_enable_tls_external: False
               kolla_external_fqdn_cert: "fake-cert"
               openstack_logging_debug: True
+              grafana_admin_username: "grafana-admin"
               # NOTE: The following options are not present in globals.yml.
               # It's possible this is related to the use of hostvars and
               # include_role, caused by something like