Merge "Update haproxy to use 1.4.0 docker"

diff --combined kubernetes/aai/values.yaml
index 3d13c2b,91563c2..b2e17af
--- 1/kubernetes/aai/values.yaml
--- 2/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@@ -56,15 -56,7 +56,15 @@@ global: # global default
      serverPort: 30247
  
    cassandra:
 -    serviceName: aai-cassandra
 +    #This will instantiate AAI cassandra cluster, default:shared cassandra.
 +    localCluster: false
 +
 +    #Service Name of the cassandra cluster to connect to.
 +    #Override it to aai-cassandra if localCluster is enabled.
 +    serviceName: cassandra
 +
 +    #This should be same as shared cassandra instance or if localCluster is enabled 
 +    #then it should be same as aai-cassandra replicaCount 
      replicas: 3
  
    aai:
@@@ -104,69 -96,6 +104,69 @@@
      # When enabled, it will create the widget models via REST API to haproxy
      updateQueryData:
        enabled: true
 +    #migration using helm hooks
 +    migration:
 +      enabled: false
 +      remoteCassandra:
 +        enabled: false
 +        storage:
 +          backend: cassandra
 +          hostname: 10.10.10.10
 +          connectionTimeout: 100000
 +          cacheSize: 1000000
 +          keyConsistent: true
 +
 +          #If backend is cql or cassandra it should be keyspace name
 +          #else backend is hbase it should be hbase table name
 +          name: aaigraph
 +
 +       ## CQL driver specific properties for janusgraph
 +       #  cql:
 +       #    #Name of the Cassandra Cluster
 +       #    cluster: someclustername
 +       #    readConsistency: QUORUM
 +       #    writeConsistency: QUORUM
 +       #    replicationFactor: 3
 +       #    localConsistencyForSysOps: true
 +
 +       ## Cassandra driver specific properties for janusgraph
 +          cassandra:
 +            #Name of the Cassandra Cluster
 +            clusterName: aai-cluster
 +            localDataCenter: Pod lab
 +            readConsistency: LOCAL_QUORUM
 +            writeConsistency: LOCAL_QUORUM
 +            replicationFactor: 3
 +
 +        #storage:
 +        #  backend: cassandra
 +        #  hostname: somehost1,somehost2,somehost3
 +        #  connectionTimeout: 100000
 +        #  cacheSize: 1000000
 +        #  clusterName: someClusterName
 +        #  localDataCenter: someDataCenter
 +        #  keyConsistent: true
 +        #  #If backend is cql or cassandra it should be keyspace name
 +        #  #else backend is hbase it should be hbase table name
 +        #  name: your_hbase_table_or_keyspace_name
 +
 +        ## CQL driver specific properties for janusgraph
 +        #  cql:
 +        #    #Name of the Cassandra Cluster
 +        #    cluster: someclustername
 +        #    readConsistency: QUORUM
 +        #    writeConsistency: QUORUM
 +        #    replicationFactor: 3
 +        #    localConsistencyForSysOps: true
 +
 +        ## Cassandra driver specific properties for janusgraph
 +        #  cassandra:
 +        #    #Name of the Cassandra Cluster
 +        #    cluster: someclustername
 +        #    readConsistency: LOCAL_QUORUM
 +        #    writeConsistency: LOCAL_QUORUM
 +        #    replicationFactor: 3
 +
  
    # Common configuration for resources traversal and graphadmin
    config:
@@@ -295,7 -224,7 +295,7 @@@
  
  # application image
  dockerhubRepository: registry.hub.docker.com
- image: aaionap/haproxy:1.2.4
+ image: aaionap/haproxy:1.4.0
  pullPolicy: Always
  
  flavor: small
@@@ -323,20 -252,6 +323,20 @@@ liveness
    # in debugger so K8s doesn't restart unresponsive container
    enabled: true
  
 +#This section is used when localCluster is enabled. AAI will create its own cassandra cluster for its specific use.
 +#Below command will instantiate the aai cassandra instances:
 +#helm deploy demo local/onap --version=4.0.0 --namespace onap --set aai.enabled=true \
 +#                            --set aai.global.cassandra.localCluster=true \
 +#                            --set aai.global.cassandra.serviceName=aai-cassandra
 +cassandra:
 +  nameOverride: aai-cassandra
 +  replicaCount: 3
 +  service:
 +    name: aai-cassandra
 +  persistence:
 +    mountSubPath: aai/cassandra
 +    enabled: true
 +
  readiness:
    initialDelaySeconds: 10
    periodSeconds: 10