summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Venkatesh Kumar <vv770d@att.com>2021-04-16 19:54:15 +0000
committerVijay Venkatesh Kumar <vv770d@att.com>2021-04-16 20:17:23 +0000
commit40511bdccfd7a913ccd9628f2a8a950f0a47288b (patch)
treed6c04166dcf779ca5858c0f8d22570cb53e7e6f2
parentb4a9da51e706df4eeec27f2a5c75edcc9e1ccbc9 (diff)
Fix cert issue on policy-sync
Change-Id: I0396fc49a486d32d1e063ad8f2ff8dba9d51b96f Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com> Issue-ID: DCAEGEN2-2735 Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
-rw-r--r--dcae-services-policy-sync/Dockerfile7
-rw-r--r--dcae-services-policy-sync/cacert.pem31
-rw-r--r--dcae-services-policy-sync/pom.xml4
-rw-r--r--dcae-services-policy-sync/setup.py2
4 files changed, 40 insertions, 4 deletions
diff --git a/dcae-services-policy-sync/Dockerfile b/dcae-services-policy-sync/Dockerfile
index f317a85..1ad4fba 100644
--- a/dcae-services-policy-sync/Dockerfile
+++ b/dcae-services-policy-sync/Dockerfile
@@ -35,9 +35,14 @@ ADD policysync policysync
RUN /policysync/bin/pip install .
FROM nexus3.onap.org:10001/onap/integration-python:7.0.1 as runtime
-
+USER root
COPY --from=build /policysync /policysync
+# Load ONAP root CA
+COPY ./cacert.pem /usr/local/share/ca-certificates/
+RUN update-ca-certificates
+
+
USER onap
ENTRYPOINT [ "/policysync/bin/policysync" ]
diff --git a/dcae-services-policy-sync/cacert.pem b/dcae-services-policy-sync/cacert.pem
new file mode 100644
index 0000000..e9a50d7
--- /dev/null
+++ b/dcae-services-policy-sync/cacert.pem
@@ -0,0 +1,31 @@
+-----BEGIN CERTIFICATE-----
+MIIFPjCCAyagAwIBAgIJAJ6u7cCnzrWdMA0GCSqGSIb3DQEBCwUAMCwxDjAMBgNV
+BAsMBU9TQUFGMQ0wCwYDVQQKDARPTkFQMQswCQYDVQQGEwJVUzAeFw0xODA0MDUx
+NDE1MjhaFw0zODAzMzExNDE1MjhaMCwxDjAMBgNVBAsMBU9TQUFGMQ0wCwYDVQQK
+DARPTkFQMQswCQYDVQQGEwJVUzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
+ggIBAMA5pkgRs7NhGG4ew5JouhyYakgYUyFaG121+/h8qbSdt0hVQv56+EA41Yq7
+XGie7RYDQK9NmAFF3gruE+6X7wvJiChp+Cyd7sFMnb65uWhxEdxWTM2BJFrgfzUn
+H8ZCxgaCo3XH4PzlKRy2LQQJEJECwl/RZmRCXijMt5e9h8XoZY/fKkKcZZUsWNCM
+pTo266wjvA9MXLmdgReRj0+vrCjrNqy+htwJDztoiHWiYPqT6o8EvGcgjNqjlZx7
+NUNf8MfLDByqKF6+wRbHv1GKjn3/Vijd45Fv8riyRYROiFanvbV6jIfBkv8PZbXg
+2VDWsYsgp8NAvMxK+iV8cO+Ck3lBI2GOPZbCEqpPVTYbLUz6sczAlCXwQoPzDIZY
+wYa3eR/gYLY1gP2iEVHORag3bLPap9ZX5E8DZkzTNTjovvLk8KaCmfcaUMJsBtDd
+ApcUitz10cnRyZc1sX3gE1f3DpzQM6t9C5sOVyRhDcSrKqqwb9m0Ss04XAS9FsqM
+P3UWYQyqDXSxlUAYaX892u8mV1hxnt2gjb22RloXMM6TovM3sSrJS0wH+l1nznd6
+aFXftS/G4ZVIVZ/LfT1is4StoyPWZCwwwly1z8qJQ/zhip5NgZTxQw4mi7ww35DY
+PdAQOCoajfSvFjqslQ/cPRi/MRCu079heVb5fQnnzVtnpFQRAgMBAAGjYzBhMB0G
+A1UdDgQWBBRTVTPyS+vQUbHBeJrBKDF77+rtSTAfBgNVHSMEGDAWgBRTVTPyS+vQ
+UbHBeJrBKDF77+rtSTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAN
+BgkqhkiG9w0BAQsFAAOCAgEAPx/IaK94n02wPxpnYTy+LVLIxwdq/kawNd6IbiMz
+L87zmNMDmHcGbfoRCj8OkhuggX9Lx1/CkhpXimuYsZOFQi5blr/u+v4mIbsgbmi9
+7j+cUHDP0zLycvSvxKHty51LwmaX9a4wkJl5zBU4O1sd/H9tWcEmwJ39ltKoBKBx
+c94Zc3iMm5ytRWGj+0rKzLDAXEWpoZ5bE5PLJauA6UDCxDLfs3FwhbS7uDggxYvf
+jySF5FCNET94oJ+m8s7VeHvoa8iPGKvXrIqdd7XDHnqJJlVKr7m9S0fMbyEB8ci2
+RtOXDt93ifY1uhoEtEykn4dqBSp8ezvNMnwoXdYPDvTd9uCAFeWFLVreBAWxd25h
+PsBTkZA5hpa/rA+mKv6Af4VBViYr8cz4dZCsFChuioVebe9ighrfjB//qKepFjPF
+CyjzKN1u0JKm/2x/ORqxkTONG8p3uDwoIOyimUcTtTMv42bfYD88RKakqSFXE9G+
+Z0LlaKABqfjK49o/tsAp+c5LoNlYllKhnetO3QAdraHwdmC36BhoghzR1jpX751A
+cZn2VH3Q4XKyp01cJNCJIrua+A+bx6zh3RyW6zIIkbRCbET+UD+4mr8WIcSE3mtR
+ZVlnhUDO4z9//WKMVzwS9Rh8/kuszrGFI1KQozXCHLrce3YP6RYZfOed79LXaRwX
+dYY=
+-----END CERTIFICATE-----
diff --git a/dcae-services-policy-sync/pom.xml b/dcae-services-policy-sync/pom.xml
index f5d38d8..d314b58 100644
--- a/dcae-services-policy-sync/pom.xml
+++ b/dcae-services-policy-sync/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
<groupId>org.onap.dcaegen2.deployments</groupId>
<artifactId>dcae-services-policy-sync</artifactId>
<name>dcaegen2-deployments-dcae-services-policy-sync</name>
- <version>1.0.0</version>
+ <version>1.0.1</version>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -169,4 +169,4 @@ limitations under the License.
</plugin>
</plugins>
</build>
-</project> \ No newline at end of file
+</project>
diff --git a/dcae-services-policy-sync/setup.py b/dcae-services-policy-sync/setup.py
index f5de9a2..9ad9308 100644
--- a/dcae-services-policy-sync/setup.py
+++ b/dcae-services-policy-sync/setup.py
@@ -19,7 +19,7 @@ from setuptools import setup, find_packages
setup(
name="policysync",
author="Chris Luckenbaugh",
- version="1.0.0",
+ version="1.0.1",
packages=find_packages(),
include_package_data=True,
install_requires=["aiohttp>=2.3", "PyYAML", "prometheus_client"],