diff options
12 files changed, 22 insertions, 22 deletions
diff --git a/kubernetes/aai/templates/aai-deployment.yaml b/kubernetes/aai/templates/aai-deployment.yaml index 3f714f3e64..c2220cacde 100644 --- a/kubernetes/aai/templates/aai-deployment.yaml +++ b/kubernetes/aai/templates/aai-deployment.yaml @@ -62,7 +62,7 @@ spec: path: /etc/localtime - name: aai-service-log hostPath: - path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/haproxy/log/" + path: "/dev/log" - name: haproxy-cfg hostPath: path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/haproxy/haproxy.cfg" diff --git a/kubernetes/appc/templates/dgbuilder-deployment.yaml b/kubernetes/appc/templates/dgbuilder-deployment.yaml index b9495a740b..32ccdafc3b 100644 --- a/kubernetes/appc/templates/dgbuilder-deployment.yaml +++ b/kubernetes/appc/templates/dgbuilder-deployment.yaml @@ -51,9 +51,7 @@ spec: - name: MYSQL_ROOT_PASSWORD value: openECOMP1.0 - name: SDNC_CONFIG_DIR - value: /opt/openecomp/sdnc/data/properties - - name: APPC_CONFIG_DIR - value: /opt/openecomp/appc/data/properties + value: /opt/onap/sdnc/data/properties image: {{ .Values.image.dgbuilderSdnc }} imagePullPolicy: {{ .Values.pullPolicy }} name: appc-dgbuilder-container diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml index 624c6421d2..882267c41d 100644 --- a/kubernetes/appc/values.yaml +++ b/kubernetes/appc/values.yaml @@ -3,7 +3,7 @@ pullPolicy: Always nodePortPrefix: 302 image: readiness: oomk8s/readiness-check:1.0.0 - appc: nexus3.onap.org:10001/openecomp/appc-image:1.1-STAGING-latest + appc: nexus3.onap.org:10001/openecomp/appc-image:v1.2.0 mysqlServer: mysql/mysql-server:5.6 - dgbuilderSdnc: nexus3.onap.org:10001/onap/ccsdk-dgbuilder-image:0.1-STAGING-latest + dgbuilderSdnc: nexus3.onap.org:10001/onap/ccsdk-dgbuilder-image:v0.1.0 filebeat: docker.elastic.co/beats/filebeat:5.5.0
\ No newline at end of file diff --git a/kubernetes/config/docker/init/config-init.sh b/kubernetes/config/docker/init/config-init.sh index 0f540021d9..90e96b3946 100755 --- a/kubernetes/config/docker/init/config-init.sh +++ b/kubernetes/config/docker/init/config-init.sh @@ -41,7 +41,6 @@ mkdir -p /config-init/$NAMESPACE/sdc/logs/ASDC/ASDC-BE/ 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/ diff --git a/kubernetes/config/docker/init/src/config/aai/data-router/dynamic/conf/entity-event-policy.xml b/kubernetes/config/docker/init/src/config/aai/data-router/dynamic/conf/entity-event-policy.xml index e0dd8cb8f5..e995053f12 100644 --- a/kubernetes/config/docker/init/src/config/aai/data-router/dynamic/conf/entity-event-policy.xml +++ b/kubernetes/config/docker/init/src/config/aai/data-router/dynamic/conf/entity-event-policy.xml @@ -4,7 +4,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - <bean id="eepConfig" class="org.openecomp.datarouter.policy.EntityEventPolicyConfig" > + <bean id="eepConfig" class="org.onap.aai.datarouter.policy.EntityEventPolicyConfig" > <property name="sourceDomain" value="default" /> <property name="searchBaseUrl" value="https://search-data-service:9509" /> <property name="searchEndpoint" value="services/search-data-service/v1/search/indexes/" /> @@ -18,7 +18,7 @@ <property name="searchKeystore" value="tomcat_keystore" /> </bean> - <bean id="entityEventPolicy" class="org.openecomp.datarouter.policy.EntityEventPolicy" init-method="startup" > + <bean id="entityEventPolicy" class="org.onap.aai.datarouter.policy.EntityEventPolicy" init-method="startup" > <constructor-arg ref="eepConfig"/> </bean> -</beans> +</beans>
\ No newline at end of file diff --git a/kubernetes/config/docker/init/src/config/appc/conf/appc.properties b/kubernetes/config/docker/init/src/config/appc/conf/appc.properties index 2b27ed20b7..3ac5aaee0b 100644 --- a/kubernetes/config/docker/init/src/config/appc/conf/appc.properties +++ b/kubernetes/config/docker/init/src/config/appc/conf/appc.properties @@ -23,8 +23,8 @@ ### Properties for demo ### ### ### appc.demo.poolMembers=dmaap.onap-message-router:3904 -appc.demo.topic.read=APPC-DEMO-TOPIC -appc.demo.topic.write=APPC-DEMO-TOPIC +appc.demo.topic.read=APPC-CL +appc.demo.topic.write=APPC-CL appc.demo.client.name=appcDemoEventListener appc.demo.threads.queuesize.min=1 appc.demo.threads.queuesize.max=1000 @@ -57,6 +57,7 @@ provider1.type=OpenStackProvider provider1.name=OpenStack provider1.identity=http://localhost:8181/apidoc/explorer/index.html provider1.tenant1.name=default +provider1.tenant1.domain=default provider1.tenant1.userid=admin provider1.tenant1.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U @@ -78,12 +79,12 @@ dmaap.poolMembers=dmaap.onap-message-router:3904 # appc-event-listener-bundle properties (only defined in src/test of default.properties) appc.LCM.poolMembers=dmaap.onap-message-router:3904 -appc.LCM.topic.read=testLCM -appc.LCM.topic.write=testLCM +appc.LCM.topic.read=APPC-LCM-READ +appc.LCM.topic.write=APPC-LCM-WRITE appc.LCM.client.name=APPC-EVENT-LISTENER-TEST appc.LCM.provider.user=admin appc.LCM.provider.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U - +appc.LCM.provider.url=http://localhost:8181/restconf/operations/appc-provider-lcm # properties from appc-netconf-adapter-bundle, appc-dg-common, appc-dmaap-adapter-bundle poolMembers=dmaap.onap-message-router:3904 @@ -101,7 +102,8 @@ test.tenantid=test test.vmid=test # Port 8774 below is default port for OpenStack's Nova API Service test.url=http://api.appc.local/vm/9999999/test/99999999-9999-9999-9999-999999999999 - +#skips hypervisor check which usually occurs during iaas-adapter-bundle startup +org.openecomp.appc.iaas.skiphypervisorcheck=true # Properties from default.properties in the src/test and src/main paths of appc-asdc-listener-bundle appc.sdc.host=sdc-be.onap-sdc:8443 diff --git a/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py b/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py index f50aac973e..387a14451d 100755 --- a/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py +++ b/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py @@ -1,7 +1,7 @@ # File generated from /opt/config # GLOBAL_INJECTED_AAI1_IP_ADDR = "aai-service.onap-aai" -#GLOBAL_INJECTED_AAI2_IP_ADDR = "N/A" +GLOBAL_INJECTED_AAI2_IP_ADDR = "N/A" GLOBAL_INJECTED_APPC_IP_ADDR = "sdnhost.onap-appc" GLOBAL_INJECTED_ARTIFACTS_VERSION = "1.1.0-SNAPSHOT" GLOBAL_INJECTED_CLAMP_IP_ADDR = "clamp.onap-clamp" @@ -28,6 +28,7 @@ GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR = "drools.onap-policy" GLOBAL_INJECTED_PORTAL_IP_ADDR = "portalapps.onap-portal" GLOBAL_INJECTED_REGION = "OPENSTACK_REGION_HERE" GLOBAL_INJECTED_REMOTE_REPO = "http://gerrit.onap.org/r/testsuite/properties.git" +GLOBAL_INJECTED_SDC_IP_ADDR = "sdc-be.onap-sdc" GLOBAL_INJECTED_SDC_FE_IP_ADDR = "sdc-fe.onap-sdc" GLOBAL_INJECTED_SDC_BE_IP_ADDR = "sdc-be.onap-sdc" GLOBAL_INJECTED_SDNC_IP_ADDR = "sdnhost.onap-sdnc" diff --git a/kubernetes/config/onap-parameters-sample.yaml b/kubernetes/config/onap-parameters-sample.yaml index 081bc9d87b..51d5138c4c 100644 --- a/kubernetes/config/onap-parameters-sample.yaml +++ b/kubernetes/config/onap-parameters-sample.yaml @@ -10,6 +10,6 @@ OPENSTACK_TENANT_ID: "47899782ed714295b1151681fdfd51f5" OPENSTACK_REGION: "RegionOne" OPENSTACK_KEYSTONE_URL: "http://1.2.3.4:5000" OPENSTACK_FLAVOUR_MEDIUM: "m1.medium" -OPENSTACK_SERVICE_TENANT_NAME: "services" +OPENSTACK_SERVICE_TENANT_NAME: "service" DMAAP_TOPIC: "AUTO" DEMO_ARTIFACTS_VERSION: "1.1.0-SNAPSHOT" diff --git a/kubernetes/log/resources/logstash/pipeline/onap-pipeline.conf b/kubernetes/log/resources/logstash/pipeline/onap-pipeline.conf index b425550f5b..123ceb5f28 100644 --- a/kubernetes/log/resources/logstash/pipeline/onap-pipeline.conf +++ b/kubernetes/log/resources/logstash/pipeline/onap-pipeline.conf @@ -247,7 +247,7 @@ output { ######### Document configurations ######### - index => "onaplogs-%{+YYYY.MM.dd}" + index => "logstash-%{+YYYY.MM.dd}" document_type => "logs" ## This can be used to associate child documents with a parent using the parent ID. diff --git a/kubernetes/robot/demo-k8s.sh b/kubernetes/robot/demo-k8s.sh index a870972ed6..2836fca85d 100755 --- a/kubernetes/robot/demo-k8s.sh +++ b/kubernetes/robot/demo-k8s.sh @@ -124,4 +124,4 @@ done ETEHOME=/var/opt/OpenECOMP_ETE VARIABLEFILES="-V /share/config/vm_properties.py -V /share/config/integration_robot_properties.py -V /share/config/integration_preload_parameters.py" POD=$(kubectl --namespace onap-robot get pods | sed 's/ .*//'| grep robot) -kubectl --namespace onap-robot exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d ${ETEHOME}/html/logs/demo/${TAG} -i ${TAG} --display 89 2> ${TAG}.out +kubectl --namespace onap-robot exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/demo/${TAG} -i ${TAG} --display 89 2> ${TAG}.out diff --git a/kubernetes/robot/ete-k8s.sh b/kubernetes/robot/ete-k8s.sh index 26eedc97f7..2305a584c3 100755 --- a/kubernetes/robot/ete-k8s.sh +++ b/kubernetes/robot/ete-k8s.sh @@ -20,4 +20,4 @@ VARIABLES="-v GLOBAL_BUILD_NUMBER:$$" #docker exec openecompete_container ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} ${TAGS} --display 88 POD=$(kubectl --namespace onap-robot get pods | sed 's/ .*//'| grep robot) -kubectl --namespace onap-robot exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d ${ETEHOME}/html/logs/ete/${OUTPUT_FOLDER} ${TAGS} --display 88 +kubectl --namespace onap-robot exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} ${TAGS} --display 88 diff --git a/kubernetes/vid/templates/vid-server-deployment.yaml b/kubernetes/vid/templates/vid-server-deployment.yaml index d015135567..1c0321833b 100644 --- a/kubernetes/vid/templates/vid-server-deployment.yaml +++ b/kubernetes/vid/templates/vid-server-deployment.yaml @@ -59,7 +59,7 @@ spec: - name: VID_MSO_SERVER_URL value: http://mso.{{ .Values.nsPrefix }}-mso:8080 - name: VID_MSO_PASS - value: 51515201a8d4c5c08d533db9bd1e1a9b + value: OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz - name: MSO_DME2_SERVER_URL value: http://localhost:8081 - name: MSO_DME2_ENABLED |