From 73c22ba01a5bfaa46665d291663bae741905e6ab Mon Sep 17 00:00:00 2001 From: Doug Szumski Date: Tue, 20 Feb 2018 11:03:10 +0000 Subject: [PATCH] Update unit tests and fix issue highlighted by them --- ansible/roles/kolla-ansible/templates/globals.yml.j2 | 2 +- ansible/roles/kolla-ansible/tests/test-defaults.yml | 2 ++ ansible/roles/kolla-ansible/tests/test-extras.yml | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ansible/roles/kolla-ansible/templates/globals.yml.j2 b/ansible/roles/kolla-ansible/templates/globals.yml.j2 index 3d9d7eec2..e6dc0d2e3 100644 --- a/ansible/roles/kolla-ansible/templates/globals.yml.j2 +++ b/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 %} diff --git a/ansible/roles/kolla-ansible/tests/test-defaults.yml b/ansible/roles/kolla-ansible/tests/test-defaults.yml index 0db04d3a5..11ad631c7 100644 --- a/ansible/roles/kolla-ansible/tests/test-defaults.yml +++ b/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: diff --git a/ansible/roles/kolla-ansible/tests/test-extras.yml b/ansible/roles/kolla-ansible/tests/test-extras.yml index 82ec995c0..5dedb1058 100644 --- a/ansible/roles/kolla-ansible/tests/test-extras.yml +++ b/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