Adding nova,neutron,glance,cinder info to config

Webui needs this config to create service-instances. Removing hardcoding of keystone api version to v3, supported versions are set in contrail-container-builder as default Change-Id: Ibcec17fede06e19218a5a313644c193ac622397b Closes-Bug: #1757249
Juniper · Mar 21, 2018 · 182fa43 · 182fa43
1 parent 67183c0
commit 182fa43
Show file tree

Hide file tree

Showing 3 changed files with 110 additions and 5 deletions.
diff --git a/contrail-controller/templates/configmap-env.yaml b/contrail-controller/templates/configmap-env.yaml
@@ -1,7 +1,46 @@
 {{- $context := . }}
 {{- $keystone_auth_host := tuple "keystone" "internal" $context | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}
 {{- $rabbitmq_host := tuple "rabbitmq" "internal" $context | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}
-{{- $metadata_host := tuple "nova_metadata" "internal" $context | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}
+
+{{- if empty .Values.global.contrail_env.IPFABRIC_SERVICE_HOST -}}
+{{- tuple "nova_metadata" "internal" $context | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" | set .Values.global.contrail_env "IPFABRIC_SERVICE_HOST" | quote | trunc 0 -}}
+{{- end -}}
+
+{{- if empty .Values.global.contrail_env.IPFABRIC_SERVICE_PORT }}
+{{- $_ := set .Values.global.contrail_env "IPFABRIC_SERVICE_PORT" .Values.endpoints.nova_metadata.port.metadata.default -}}
+{{- end -}}
+
+{{- if empty .Values.global.contrail_env.networkManager_ip -}}
+{{- tuple "network" "internal" $context | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" | set .Values.global.contrail_env "networkManager_ip" | quote | trunc 0 -}}
+{{- end -}}
+
+{{- if empty .Values.global.contrail_env.networkManager_port -}}
+{{- $_ := set .Values.global.contrail_env "networkManager_port" .Values.endpoints.network.port.api.default -}}
+{{- end -}}
+
+{{- if empty .Values.global.contrail_env.imageManager_ip -}}
+{{- tuple "image" "internal" $context | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" | set .Values.global.contrail_env "imageManager_ip" | quote | trunc 0 -}}
+{{- end -}}
+
+{{- if empty .Values.global.contrail_env.imageManager_port -}}
+{{- $_ := set .Values.global.contrail_env "imageManager_port" .Values.endpoints.image.port.api.default -}}
+{{- end -}}
+
+{{- if empty .Values.global.contrail_env.computeManager_ip -}}
+{{- tuple "nova" "internal" $context | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" | set .Values.global.contrail_env "computeManager_ip" | quote | trunc 0 -}}
+{{- end -}}
+
+{{- if empty .Values.global.contrail_env.computeManager_port -}}
+{{- $_ := set .Values.global.contrail_env "computeManager_port" .Values.endpoints.nova.port.api.default -}}
+{{- end -}}
+
+{{- if empty .Values.global.contrail_env.storageManager_ip -}}
+{{- tuple "volume" "internal" $context | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" | set .Values.global.contrail_env "storageManager_ip" | quote | trunc 0 -}}
+{{- end -}}
+
+{{- if empty .Values.global.contrail_env.storageManager_port -}}
+{{- $_ := set .Values.global.contrail_env "storageManager_port" .Values.endpoints.volume.port.api.default -}}
+{{- end -}}
 
 {{- if .Values.manifests.configmap_controller_env }}
 ---
@@ -13,8 +52,7 @@ data:
   {{- range $key, $value := .Values.global.contrail_env }}
   {{ $key }}: {{ $value | quote }}
   {{- end }}
-  IPFABRIC_SERVICE_HOST: {{ $metadata_host }}
-  IPFABRIC_SERVICE_PORT: {{ .Values.endpoints.nova_metadata.port.metadata.public | quote }}
+
 {{- end }}
 
 {{- if .Values.manifests.configmap_controller_keystone }}
@@ -35,7 +73,6 @@ data:
   KEYSTONE_AUTH_ADMIN_PORT: {{ .Values.endpoints.keystone.port.admin.default | quote }}
   KEYSTONE_AUTH_PUBLIC_PORT: {{ .Values.endpoints.keystone.port.api.default | quote }}
   KEYSTONE_AUTH_REGION_NAME: {{ .Values.endpoints.keystone.auth.region_name | quote }}
-  identityManager_apiVersion: '["v3"]'
 {{- end }}
 
 {{- if .Values.manifests.configmap_controller_rabbitmq }}

diff --git a/contrail-controller/values.yaml b/contrail-controller/values.yaml
@@ -104,6 +104,73 @@ endpoints:
         default: 8775
         public: 80
     namespace: openstack
+  nova:
+    name: nova
+    hosts:
+      default: nova-api
+      public: nova
+    host_fqdn_override:
+      default: null
+    path:
+      default: "/v2/%(tenant_id)s"
+    scheme:
+      default: 'http'
+    port:
+      api:
+        default: 8774
+        public: 80
+      novncproxy:
+        default: 6080
+    namespace: openstack
+  network:
+    name: neutron
+    hosts:
+      default: neutron-server
+      public: neutron
+    host_fqdn_override:
+      default: null
+    path:
+      default: null
+    scheme:
+      default: 'http'
+    port:
+      api:
+        default: 9696
+        public: 80
+    namespace: openstack
+  image:
+    name: glance
+    hosts:
+      default: glance-api
+      public: glance
+    host_fqdn_override:
+      default: null
+    path:
+      default: null
+    scheme:
+      default: http
+    port:
+      api:
+        default: 9292
+        public: 80
+    namespace: openstack
+  volume:
+    name: cinder
+    hosts:
+      default: cinder-api
+      public: cinder
+    host_fqdn_override:
+      default: null
+    path:
+      default: '/v1/%(tenant_id)s'
+    scheme:
+      default:  'http'
+    port:
+      api:
+        default: 8776
+        public: 80
+    namespace: openstack
+
 
 # Service related inputs are defined here
 service:

diff --git a/doc/contrail-osh-aio-install.md b/doc/contrail-osh-aio-install.md
@@ -98,7 +98,8 @@ Install below packages on your setup
   tee /tmp/contrail.yaml << EOF
   global:
     contrail_env:
-      CONTROLLER_NODES: ${CONTROL_NODES}
+      CONTROLLER_NODES: 172.17.0.1
+      CONTROL_NODES: ${CONTROL_NODES}
       LOG_LEVEL: SYS_NOTICE
       CLOUD_ORCHESTRATOR: openstack
       AAA_MODE: cloud-admin