Merge "Fix: AAI HAProxy syslog are not monitored" into release-1.1.0
authorMike Elliott <mike.elliott@amdocs.com>
Thu, 30 Nov 2017 02:56:52 +0000 (02:56 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 30 Nov 2017 02:56:52 +0000 (02:56 +0000)
1  2 
kubernetes/config/docker/init/config-init.sh

@@@ -41,7 -41,6 +41,6 @@@ mkdir -p /config-init/$NAMESPACE/sdc/lo
  mkdir -p /config-init/$NAMESPACE/sdc/logs/ASDC/ASDC-FE/
  mkdir -p /config-init/$NAMESPACE/aai/opt/aai/logroot/
  mkdir -p /config-init/$NAMESPACE/aai/model-loader/logs/
- mkdir -p /config-init/$NAMESPACE/aai/haproxy/log/
  mkdir -p /config-init/$NAMESPACE/aai/aai-traversal/logs/
  mkdir -p /config-init/$NAMESPACE/aai/aai-resources/logs/
  mkdir -p /config-init/$NAMESPACE/aai/sparky-be/logs/
@@@ -113,7 -112,7 +112,7 @@@ find /config-init/$NAMESPACE/ -type f -
  
  # MSO post install steps to encrypt openstack password
  MSO_ENCRYPTION_KEY=$(cat /config-init/$NAMESPACE/mso/mso/encryption.key)
 -OPENSTACK_API_ENCRYPTED_KEY=`echo -n "$OPENSTACK_API_KEY" | openssl aes-128-ecb -e -K $MSO_ENCRYPTION_KEY -nosalt | xxd -c 25 -p`
 +OPENSTACK_API_ENCRYPTED_KEY=`echo -n "$OPENSTACK_API_KEY" | openssl aes-128-ecb -e -K $MSO_ENCRYPTION_KEY -nosalt | xxd -c 256 -p`
  find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/OPENSTACK_ENCRYPTED_PASSWORD_HERE/$OPENSTACK_API_ENCRYPTED_KEY/g" {} \;
  
  find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/OPENSTACK_TENANT_NAME_HERE/$OPENSTACK_TENANT_NAME/g" {} \;