Merge "Fix multicloud deployment contianerPort issue"
diff --git a/kubernetes/consul/resources/config/consul-agent-config/aaf-service-health.json b/kubernetes/consul/resources/config/consul-agent-config/aaf-service-health.json
new file mode 100755
index 0000000..cd715f8
--- /dev/null
+++ b/kubernetes/consul/resources/config/consul-agent-config/aaf-service-health.json
@@ -0,0 +1,20 @@
+{
+ "service": {
+ "name": "Health Check: Application Authorization Framework",
+ "checks": [
+ {
+ "id": "aaf-service",
+ "name": "AAF Service Health Check",
+ "http": "https://aaf-service:8100/authz/perms/user/demo@people.osaaf.org",
+ "header": {
+ "Authorization": ["Basic ZGVtb0BwZW9wbGUub3NhYWYub3JnOmRlbW8xMjM0NTYh"],
+ "X-TransactionId": ["ConsulHealthCheck"],
+ "X-FromAppId": ["healthcheck"]
+ },
+ "tls_skip_verify": true,
+ "interval": "20s",
+ "timeout": "5s"
+ }
+ ]
+ }
+}
diff --git a/kubernetes/sdnc/resources/config/bin/startODL.sh b/kubernetes/sdnc/resources/config/bin/startODL.sh
index 6383853..9d1ab76 100755
--- a/kubernetes/sdnc/resources/config/bin/startODL.sh
+++ b/kubernetes/sdnc/resources/config/bin/startODL.sh
@@ -27,7 +27,8 @@
fi
echo "Installing Opendaylight cluster features"
- cat $ODL_HOME/etc/org.apache.karaf.features.cfg | sed -e "\|featuresBoot=config|s|$|,odl-mdsal-clustering,odl-jolokia|" > $ODL_HOME/etc/org.apache.karaf.features.cfg
+ mv $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig
+ cat $ODL_HOME/etc/org.apache.karaf.features.cfg.orig | sed -e "\|featuresBoot=config|s|$|,odl-mdsal-clustering,odl-jolokia|" > $ODL_HOME/etc/org.apache.karaf.features.cfg
#${ODL_HOME}/bin/client feature:install odl-mdsal-clustering
#${ODL_HOME}/bin/client feature:install odl-jolokia
@@ -118,5 +119,5 @@
echo "Installed at `date`" > ${SDNC_HOME}/.installed
fi
-exec ${ODL_HOME}/bin/karaf
+exec ${ODL_HOME}/bin/karaf server