From 5ccd3a9e958480cb94544d92ec450ec5dd49b86c Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Mon, 17 Jun 2019 11:34:47 -0500
Subject: [PATCH] Nova: Fix metadata deps

This PS fixes the nova metadata deps to permit operation without
and ingress controller and prevent a circular dep chain.

Change-Id: I265d488e8024967685c5587d7a7cd24281011f3b
Signed-off-by: Pete Birley <pete@port.direct>
---
 nova/templates/deployment-api-metadata.yaml |  4 ++--
 nova/values.yaml                            | 19 +++++++++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/nova/templates/deployment-api-metadata.yaml b/nova/templates/deployment-api-metadata.yaml
index fb2e56316f..e5b8233ad2 100644
--- a/nova/templates/deployment-api-metadata.yaml
+++ b/nova/templates/deployment-api-metadata.yaml
@@ -21,7 +21,7 @@ limitations under the License.
 {{- $mounts_nova_api_metadata_init := .Values.pod.mounts.nova_api_metadata.init_container }}
 
 {{- $serviceAccountName := "nova-api-metadata" }}
-{{ tuple $envAll "api" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
+{{ tuple $envAll "api_metadata" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -54,7 +54,7 @@ spec:
         {{ .Values.labels.api_metadata.node_selector_key }}: {{ .Values.labels.api_metadata.node_selector_value }}
       terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.metadata.timeout | default "30" }}
       initContainers:
-{{ tuple $envAll "api" $mounts_nova_api_metadata_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
+{{ tuple $envAll "api_metadata" $mounts_nova_api_metadata_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: nova-api-metadata-init
 {{ tuple $envAll "nova_api" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ tuple $envAll $envAll.Values.pod.resources.api_metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
diff --git a/nova/values.yaml b/nova/values.yaml
index 086c9c7c91..824c78eee7 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -260,8 +260,19 @@ dependencies:
           service: oslo_db
         - endpoint: internal
           service: identity
-        - endpoint: public
-          service: compute_metadata
+    api_metadata:
+      jobs:
+        - nova-db-sync
+        - nova-ks-user
+        - nova-ks-endpoints
+        - nova-rabbit-init
+      services:
+        - endpoint: internal
+          service: oslo_messaging
+        - endpoint: internal
+          service: oslo_db
+        - endpoint: internal
+          service: identity
     bootstrap:
       services:
         - endpoint: internal
@@ -317,6 +328,8 @@ dependencies:
           service: compute
         - endpoint: internal
           service: network
+        - endpoint: internal
+          service: compute_metadata
     compute_ironic:
       jobs:
         - nova-db-sync
@@ -423,6 +436,8 @@ dependencies:
           service: compute
         - endpoint: internal
           service: network
+        - endpoint: internal
+          service: compute_metadata
     image_repo_sync:
       services:
         - endpoint: internal