From f02b1806ea33821c29dbe4ea7d7e7fb78350a5c3 Mon Sep 17 00:00:00 2001
From: Madhukar Nayakbomman <madhukarnayak@hotmail.com>
Date: Thu, 8 Mar 2018 10:51:07 -0800
Subject: [PATCH] Adding ocata images, moving to contrail ns

Pointing contrail charts to ocata images and moving contrail resources from
openstack namespace to contrail namespace

Partial-Bug: #1749018

Change-Id: I0d8912ad8133ecba3bd7510ea900600330d335b1
---
 .../templates/configmap-env.yaml              |  4 ++--
 contrail-analytics/values.yaml                | 16 +++++++------
 contrail-controller/values.yaml               | 24 ++++++++++---------
 .../templates/configmap-env.yaml              |  2 +-
 contrail-thirdparty/values.yaml               |  9 +++----
 contrail-vrouter/templates/configmap-env.yaml |  2 +-
 contrail-vrouter/values.yaml                  | 19 ++++++++-------
 rbac/cluster-admin.yaml                       | 15 ++++++++++++
 8 files changed, 56 insertions(+), 35 deletions(-)
 create mode 100644 rbac/cluster-admin.yaml

diff --git a/contrail-analytics/templates/configmap-env.yaml b/contrail-analytics/templates/configmap-env.yaml
index 7940b6e..e43e2e2 100644
--- a/contrail-analytics/templates/configmap-env.yaml
+++ b/contrail-analytics/templates/configmap-env.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.manifests.configmap_env }}
 {{- $context := . }}
-{{- $keystone_auth_host := tuple "keystone" "internal" $context | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-{{- $rabbitmq_host := tuple "rabbitmq" "internal" $context | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
+{{- $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" }}
 
 ---
 apiVersion: v1
diff --git a/contrail-analytics/values.yaml b/contrail-analytics/values.yaml
index ddc0a1b..6fcf271 100644
--- a/contrail-analytics/values.yaml
+++ b/contrail-analytics/values.yaml
@@ -1,12 +1,12 @@
 images:
   tags:
-    nodemgr: "docker.io/opencontrailnightly/contrail-nodemgr:newton-master-17"
-    analytics_api: "docker.io/opencontrailnightly/contrail-analytics-api:newton-master-17"
-    contrail_collector: "docker.io/opencontrailnightly/contrail-analytics-collector:newton-master-17"
-    analytics_alarm_gen: "docker.io/opencontrailnightly/contrail-analytics-alarm-gen:newton-master-17"
-    analytics_query_engine: "docker.io/opencontrailnightly/contrail-analytics-query-engine:newton-master-17"
-    analytics_snmp_collector: "docker.io/opencontrailnightly/contrail-analytics-snmp-collector:newton-master-17"
-    contrail_topology: "docker.io/opencontrailnightly/contrail-analytics-topology:newton-master-17"
+    nodemgr: "docker.io/opencontrailnightly/contrail-nodemgr:ocata-master-17"
+    analytics_api: "docker.io/opencontrailnightly/contrail-analytics-api:ocata-master-17"
+    contrail_collector: "docker.io/opencontrailnightly/contrail-analytics-collector:ocata-master-17"
+    analytics_alarm_gen: "docker.io/opencontrailnightly/contrail-analytics-alarm-gen:ocata-master-17"
+    analytics_query_engine: "docker.io/opencontrailnightly/contrail-analytics-query-engine:ocata-master-17"
+    analytics_snmp_collector: "docker.io/opencontrailnightly/contrail-analytics-snmp-collector:ocata-master-17"
+    contrail_topology: "docker.io/opencontrailnightly/contrail-analytics-topology:ocata-master-17"
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
   imagePullPolicy: "IfNotPresent"
 
@@ -47,6 +47,7 @@ endpoints:
     host_fqdn_override:
        default: null
     domain_override: null
+    namespace: openstack
   keystone:
     auth:
       username: admin
@@ -68,6 +69,7 @@ endpoints:
       default: http
     host_fqdn_override:
        default: null
+    namespace: openstack
 
 # Service related inputs are defined here
 service:
diff --git a/contrail-controller/values.yaml b/contrail-controller/values.yaml
index ccc928d..304c714 100644
--- a/contrail-controller/values.yaml
+++ b/contrail-controller/values.yaml
@@ -1,15 +1,15 @@
 images:
   tags:
-    nodemgr: "docker.io/opencontrailnightly/contrail-nodemgr:newton-master-17"
-    contrail_control: "docker.io/opencontrailnightly/contrail-controller-control-control:newton-master-17"
-    control_dns: "docker.io/opencontrailnightly/contrail-controller-control-dns:newton-master-17"
-    control_named: "docker.io/opencontrailnightly/contrail-controller-control-named:newton-master-17"
-    config_api: "docker.io/opencontrailnightly/contrail-controller-config-api:newton-master-17"
-    config_devicemgr: "docker.io/opencontrailnightly/contrail-controller-config-devicemgr:newton-master-17"
-    config_schema_transformer: "docker.io/opencontrailnightly/contrail-controller-config-schema:newton-master-17"
-    config_svcmonitor: "docker.io/opencontrailnightly/contrail-controller-config-svcmonitor:newton-master-17"
-    webui_middleware: "docker.io/opencontrailnightly/contrail-controller-webui-job:newton-master-17"
-    webui: "docker.io/opencontrailnightly/contrail-controller-webui-web:newton-master-17"
+    nodemgr: "docker.io/opencontrailnightly/contrail-nodemgr:ocata-master-17"
+    contrail_control: "docker.io/opencontrailnightly/contrail-controller-control-control:ocata-master-17"
+    control_dns: "docker.io/opencontrailnightly/contrail-controller-control-dns:ocata-master-17"
+    control_named: "docker.io/opencontrailnightly/contrail-controller-control-named:ocata-master-17"
+    config_api: "docker.io/opencontrailnightly/contrail-controller-config-api:ocata-master-17"
+    config_devicemgr: "docker.io/opencontrailnightly/contrail-controller-config-devicemgr:ocata-master-17"
+    config_schema_transformer: "docker.io/opencontrailnightly/contrail-controller-config-schema:ocata-master-17"
+    config_svcmonitor: "docker.io/opencontrailnightly/contrail-controller-config-svcmonitor:ocata-master-17"
+    webui_middleware: "docker.io/opencontrailnightly/contrail-controller-webui-job:ocata-master-17"
+    webui: "docker.io/opencontrailnightly/contrail-controller-webui-web:ocata-master-17"
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
   imagePullPolicy: "IfNotPresent"
 
@@ -65,6 +65,7 @@ endpoints:
     host_fqdn_override:
        default: null
     domain_override: null
+    namespace: openstack
   keystone:
     auth:
       username: admin
@@ -86,6 +87,7 @@ endpoints:
       default: http
     host_fqdn_override:
        default: null
+    namespace: openstack
 
 # Service related inputs are defined here
 service:
@@ -97,7 +99,7 @@ manifests:
   daemonset_control: true
   daemonset_control_only: false
   daemonset_webui: true
-  daemonset_vrouter: true
+  daemonset_agent: true
   service_config_api: true
   service_webui: true
   ingress_webui: true
diff --git a/contrail-thirdparty/templates/configmap-env.yaml b/contrail-thirdparty/templates/configmap-env.yaml
index 018301d..2b5225a 100644
--- a/contrail-thirdparty/templates/configmap-env.yaml
+++ b/contrail-thirdparty/templates/configmap-env.yaml
@@ -2,7 +2,7 @@
 {{- $context := . }}
 {{- $configdb_nodes := .Values.contrail_env.CONFIG_NODES | default .Values.contrail_env.CONTROLLER_NODES }}
 {{- $analyticsdb_nodes := .Values.contrail_env.ANALYTICS_NODES | default .Values.contrail_env.CONTROLLER_NODES }}
-{{- $keystone_auth_host := tuple "keystone" "internal" $context | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
+{{- $keystone_auth_host := tuple "keystone" "internal" $context | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}
 
 ---
 apiVersion: v1
diff --git a/contrail-thirdparty/values.yaml b/contrail-thirdparty/values.yaml
index 21900de..35cca54 100644
--- a/contrail-thirdparty/values.yaml
+++ b/contrail-thirdparty/values.yaml
@@ -1,10 +1,10 @@
 images:
   tags:
-    kafka: "docker.io/opencontrailnightly/contrail-external-kafka:newton-master-17"
-    cassandra: "docker.io/opencontrailnightly/contrail-external-cassandra:newton-master-17"
+    kafka: "docker.io/opencontrailnightly/contrail-external-kafka:ocata-master-17"
+    cassandra: "docker.io/opencontrailnightly/contrail-external-cassandra:ocata-master-17"
     redis: "redis:4.0.2"
-    zookeeper: "docker.io/opencontrailnightly/contrail-external-zookeeper:newton-master-17"
-    nodemgr: "docker.io/opencontrailnightly/contrail-nodemgr:newton-master-17"
+    zookeeper: "docker.io/opencontrailnightly/contrail-external-zookeeper:ocata-master-17"
+    nodemgr: "docker.io/opencontrailnightly/contrail-nodemgr:ocata-master-17"
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
 
 labels:
@@ -75,6 +75,7 @@ endpoints:
       default: http
     host_fqdn_override:
        default: null
+    namespace: openstack
 
 manifests:
   configmap_env: true
diff --git a/contrail-vrouter/templates/configmap-env.yaml b/contrail-vrouter/templates/configmap-env.yaml
index 05faba7..a5fa968 100644
--- a/contrail-vrouter/templates/configmap-env.yaml
+++ b/contrail-vrouter/templates/configmap-env.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.manifests.configmap_env }}
 {{- $context := . }}
-{{- $keystone_auth_host := tuple "keystone" "internal" $context | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
+{{- $keystone_auth_host := tuple "keystone" "internal" $context | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}
 
 ---
 apiVersion: v1
diff --git a/contrail-vrouter/values.yaml b/contrail-vrouter/values.yaml
index cc05a44..4d58bdc 100644
--- a/contrail-vrouter/values.yaml
+++ b/contrail-vrouter/values.yaml
@@ -1,12 +1,12 @@
 images:
   tags:
-    nodemgr: "docker.io/opencontrailnightly/contrail-nodemgr:newton-master-17"
-    build_driver_init: "docker.io/opencontrailnightly/contrail-vrouter-kernel-build-init:newton-master-17"
-    vrouter_agent: "docker.io/opencontrailnightly/contrail-vrouter-agent:newton-master-17"
-    vrouter_init_kernel: "docker.io/opencontrailnightly/contrail-vrouter-kernel-init:newton-master-17"
-    vrouter_dpdk: "docker.io/opencontrailnightly/contrail-vrouter-agent-dpdk:newton-master-17"
-    vrouter_init_dpdk: "docker.io/opencontrailnightly/contrail-vrouter-kernel-init-dpdk:newton-master-17"
-    dpdk_watchdog: "docker.io/opencontrailnightly/contrail-vrouter-net-watchdog:newton-master-17"
+    nodemgr: "docker.io/opencontrailnightly/contrail-nodemgr:ocata-master-17"
+    build_driver_init: "docker.io/opencontrailnightly/contrail-agent-build-driver-init:ocata-master-17"
+    vrouter_agent: "docker.io/opencontrailnightly/contrail-agent-vrouter:ocata-master-17"
+    vrouter_init_kernel: "docker.io/opencontrailnightly/contrail-agent-vrouter-init-kernel:ocata-master-17"
+    vrouter_dpdk: "docker.io/opencontrailnightly/contrail-agent-vrouter-dpdk:ocata-master-17"
+    vrouter_init_dpdk: "docker.io/opencontrailnightly/contrail-agent-vrouter-init-kernel-dpdk:ocata-master-17"
+    dpdk_watchdog: "docker.io/opencontrailnightly/contrail-agent-net-watchdog:ocata-master-17"
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
   imagePullPolicy: "IfNotPresent"
 
@@ -33,13 +33,13 @@ contrail_env:
   LOG_LEVEL: SYS_NOTICE
   CLOUD_ORCHESTRATOR: openstack
   AAA_MODE: cloud-admin
-  #PHYSICAL_INTERFACE: p1p2
+  PHYSICAL_INTERFACE: enp0s8
   #CPU_CORE_MASK: "0xf"
   #DPDK_UIO_DRIVER: uio_pci_generic
   #HUGE_PAGES: 32000
   #AGENT_MODE: dpdk
   #HUGE_PAGES_DIR: /hugepages
-  #VROUTER_GATEWAY: 8.0.0.254
+  VROUTER_GATEWAY: None
 
 node:
   host_os: ubuntu
@@ -70,6 +70,7 @@ endpoints:
       default: http
     host_fqdn_override:
        default: null
+    namespace: openstack
 
 manifests:
   configmap_env: true
diff --git a/rbac/cluster-admin.yaml b/rbac/cluster-admin.yaml
new file mode 100644
index 0000000..192eaf3
--- /dev/null
+++ b/rbac/cluster-admin.yaml
@@ -0,0 +1,15 @@
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: cluster-admin
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cluster-admin
+subjects:
+- kind: Group
+  name: system:masters
+- kind: Group
+  name: system:authenticated
+- kind: Group
+  name: system:unauthenticated