Pointing to the correct contrail services

1. Pointing to correct contrail service
2. override file for RBAC configuration for /etc/neutron/api-paste.ini
3. Add deployment bash file for RBAC
4. Extra_args variable for bash scripts

Change-Id: Ic17a7f43af266de42cca84751ac7b1c2fd4cb08d
Partial-Bug: #1749018

neutron/values.yaml

@@ -37,7 +37,7 @@ images:
     neutron_openvswitch_agent: docker.io/openstackhelm/neutron:newton
     neutron_linuxbridge_agent: docker.io/openstackhelm/neutron:newton
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
-    opencontrail_neutron_init: 
+    opencontrail_neutron_init:
   pull_policy: "IfNotPresent"
 
 labels:
@@ -1010,12 +1010,12 @@ conf:
     ml2_conf_sriov: null
     opencontrail:
       APISERVER:
-        api_server_ip: contrail-config-api.contrail
+        api_server_ip: config-api-server.contrail
         api_server_port: 8082
         contrail_extensions: "ipam:neutron_plugin_contrail.plugins.opencontrail.contrail_plugin_ipam.NeutronPluginContrailIpam,policy:neutron_plugin_contrail.plugins.opencontrail.contrail_plugin_policy.NeutronPluginContrailPolicy,route-table:neutron_plugin_contrail.plugins.opencontrail.contrail_plugin_vpc.NeutronPluginContrailVpc,contrail:None,service-interface:None,vf-binding:None"
         multi_tenancy: True
       COLLECTOR:
-        analytics_api_ip: contrail-analytics-api.contrail
+        analytics_api_ip: analytics-api-server.contrail
         analytics_api_port: 8081
       KEYSTONE:
         insecure: True

tools/deployment/developer/ceph/151-libvirt-opencontrail.sh

@@ -25,11 +25,12 @@ if [ "$OPENSTACK_VERSION" == "ocata" ]; then
 else
   values=""
 fi
-: ${OSH_EXTRA_HELM_ARGS:=""}
+
 helm upgrade --install libvirt ./libvirt \
   --namespace=openstack $values \
   --values=./tools/overrides/backends/opencontrail/libvirt.yaml \
-  ${OSH_EXTRA_HELM_ARGS}
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_LIBVIRT}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack

tools/deployment/developer/ceph/161-compute-kit-opencontrail.sh

@@ -26,28 +26,30 @@ if [ "$OPENSTACK_VERSION" == "ocata" ]; then
 else
   values=""
 fi
-: ${OSH_EXTRA_HELM_ARGS:=""}
+
 if [ "x$(systemd-detect-virt)" == "xnone" ]; then
   echo 'OSH is not being deployed in virtualized environment'
   helm upgrade --install nova ./nova \
       --namespace=openstack $values \
       --values=./tools/overrides/backends/opencontrail/nova.yaml \
-      ${OSH_EXTRA_HELM_ARGS}
+      ${OSH_EXTRA_HELM_ARGS} \
+      ${OSH_EXTRA_HELM_ARGS_NOVA}
 else
   echo 'OSH is being deployed in virtualized environment, using qemu for nova'
   helm upgrade --install nova ./nova \
       --namespace=openstack $values \
       --set conf.nova.libvirt.virt_type=qemu \
       --values=./tools/overrides/backends/opencontrail/nova.yaml \
-      ${OSH_EXTRA_HELM_ARGS}
+      ${OSH_EXTRA_HELM_ARGS} \
+      ${OSH_EXTRA_HELM_ARGS_NOVA}
 fi
 
 #NOTE: Deploy neutron
 helm upgrade --install neutron ./neutron \
     --namespace=openstack $values \
-    --values=/tmp/neutron.yaml \
     --values=./tools/overrides/backends/opencontrail/neutron.yaml \
-    ${OSH_EXTRA_HELM_ARGS}
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_NEUTRON}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack

tools/deployment/developer/ceph/162-neutron-rbac-opencontrail.sh

@@ -0,0 +1 @@
+../common/162-neutron-rbac-opencontrail.sh

tools/deployment/developer/common/091-heat-opencontrail.sh

@@ -25,11 +25,11 @@ if [ "$OPENSTACK_VERSION" == "ocata" ]; then
 else
   values=""
 fi
-: ${OSH_EXTRA_HELM_ARGS:=""}
 helm upgrade --install heat ./heat \
   --namespace=openstack $values \
   --values=./tools/overrides/backends/opencontrail/heat.yaml \
-  ${OSH_EXTRA_HELM_ARGS}
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_HEAT}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack

tools/deployment/developer/common/162-neutron-rbac-opencontrail.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# Copyright 2017 The Openstack-Helm Authors.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+set -xe
+
+#NOTE: Pull images and lint chart
+make pull-images neutron
+
+OPENSTACK_VERSION=${OPENSTACK_VERSION:-"ocata"}
+if [ "$OPENSTACK_VERSION" == "ocata" ]; then
+  values="--values=./tools/overrides/releases/ocata/loci.yaml "
+else
+  values=""
+fi
+
+: ${OSH_EXTRA_HELM_ARGS:-""}
+#NOTE: Upgrade neutron
+helm upgrade --install neutron ./neutron \
+    --namespace=openstack $values \
+    --values=./tools/overrides/backends/opencontrail/neutron.yaml \
+    --values=./tools/overrides/backends/opencontrail/neutron-rbac.yaml \
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_NEUTRON}
+
+#NOTE: Wait for deploy
+./tools/deployment/common/wait-for-pods.sh openstack

tools/deployment/developer/nfs/151-libvirt-opencontrail.sh

@@ -18,20 +18,20 @@ set -xe
 #NOTE: Pull images and lint chart
 make pull-images libvirt
 
-#NOTE: Deploy command
 OPENSTACK_VERSION=${OPENSTACK_VERSION:-"ocata"}
 if [ "$OPENSTACK_VERSION" == "ocata" ]; then
   values="--values=./tools/overrides/releases/ocata/loci.yaml "
 else
   values=""
 fi
-OPENSTACK_VERSION=${OPENSTACK_VERSION:-"ocata"}
-: ${OSH_EXTRA_HELM_ARGS:=""}
+
+#NOTE: Deploy command
 helm upgrade --install libvirt ./libvirt \
   --namespace=openstack $values \
   --values=./tools/overrides/backends/opencontrail/libvirt.yaml \
   --set ceph.enabled=false \
-  ${OSH_EXTRA_HELM_ARGS}
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_LIBVIRT}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack

tools/deployment/developer/nfs/161-compute-kit-opencontrail.sh

@@ -26,29 +26,32 @@ if [ "$OPENSTACK_VERSION" == "ocata" ]; then
 else
   values=""
 fi
-: ${OSH_EXTRA_HELM_ARGS:=""}
+
 if [ "x$(systemd-detect-virt)" == "xnone" ]; then
   echo 'OSH is not being deployed in virtualized environment'
   helm upgrade --install nova ./nova \
       --namespace=openstack $values \
       --values=./tools/overrides/backends/opencontrail/nova.yaml \
       --set ceph.enabled=false \
-      ${OSH_EXTRA_HELM_ARGS}
+      ${OSH_EXTRA_HELM_ARGS} \
+      ${OSH_EXTRA_HELM_ARGS_NOVA}
 else
   echo 'OSH is being deployed in virtualized environment, using qemu for nova'
   helm upgrade --install nova ./nova \
       --namespace=openstack $values \
       --values=./tools/overrides/backends/opencontrail/nova.yaml \
       --set ceph.enabled=false \
       --set conf.nova.libvirt.virt_type=qemu \
-      ${OSH_EXTRA_HELM_ARGS}
+      ${OSH_EXTRA_HELM_ARGS} \
+      ${OSH_EXTRA_HELM_ARGS_NOVA}
 fi
 
 #NOTE: Deploy neutron
 helm upgrade --install neutron ./neutron \
     --namespace=openstack $values \
     --values=./tools/overrides/backends/opencontrail/neutron.yaml \
-    ${OSH_EXTRA_HELM_ARGS}
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_NEUTRON}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack

tools/deployment/developer/nfs/162-neutron-rbac-opencontrail.sh

@@ -0,0 +1 @@
+../common/162-neutron-rbac-opencontrail.sh

tools/deployment/multinode/131-libvirt-opencontrail.sh

@@ -25,7 +25,9 @@ fi
 #NOTE: Deploy command
 helm upgrade --install libvirt ./libvirt \
   --namespace=openstack $values \
-  --values=./tools/overrides/backends/opencontrail/libvirt.yaml
+  --values=./tools/overrides/backends/opencontrail/libvirt.yaml \
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_LIBVIRT}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack

tools/deployment/multinode/141-compute-kit-opencontrail.sh

@@ -43,14 +43,18 @@ if [ "x$(systemd-detect-virt)" == "xnone" ]; then
   helm upgrade --install nova ./nova \
       --namespace=openstack $values \
       --values=/tmp/nova.yaml \
-      --values=./tools/overrides/backends/opencontrail/nova.yaml
+      --values=./tools/overrides/backends/opencontrail/nova.yaml \
+      ${OSH_EXTRA_HELM_ARGS} \
+      ${OSH_EXTRA_HELM_ARGS_NOVA}
 else
   echo 'OSH is being deployed in virtualized environment, using qemu for nova'
   helm upgrade --install nova ./nova \
       --namespace=openstack $values \
       --values=/tmp/nova.yaml \
       --values=./tools/overrides/backends/opencontrail/nova.yaml \
-      --set conf.nova.libvirt.virt_type=qemu
+      --set conf.nova.libvirt.virt_type=qemu \
+      ${OSH_EXTRA_HELM_ARGS} \
+      ${OSH_EXTRA_HELM_ARGS_NOVA}
 fi
 
 #NOTE: Deploy neutron
@@ -79,7 +83,9 @@ EOF
 helm upgrade --install neutron ./neutron \
     --namespace=openstack $values \
     --values=/tmp/neutron.yaml \
-    --values=./tools/overrides/backends/opencontrail/neutron.yaml
+    --values=./tools/overrides/backends/opencontrail/neutron.yaml \
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_NEUTRON}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack

tools/deployment/multinode/142-neutron-rbac-opencontrail.sh

@@ -0,0 +1 @@
+../developer/common/162-neutron-rbac-opencontrail.sh

tools/deployment/multinode/151-heat-opencontrail.sh

@@ -34,7 +34,9 @@ EOF
 helm upgrade --install heat ./heat \
   --namespace=openstack $values \
   --values=/tmp/heat.yaml \
-  --values=./tools/overrides/backends/opencontrail/heat.yaml
+  --values=./tools/overrides/backends/opencontrail/heat.yaml \
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_HEAT}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack

tools/overrides/backends/opencontrail/neutron-rbac.yaml

@@ -0,0 +1,20 @@
+# Copyright 2017 The Openstack-Helm Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+conf:
+  paste:
+    composite:neutronapi_v2_0:
+      keystone: user_token cors http_proxy_to_wsgi request_id catch_errors authtoken keystonecontext extensions neutronapiapp_v2_0
+    filter:user_token:
+      paste.filter_factory: neutron_plugin_contrail.plugins.opencontrail.neutron_middleware:token_factory