diff options
| -rw-r--r-- | auth/helm/aaf/templates/aaf-cm.yaml | 4 | ||||
| -rw-r--r-- | auth/helm/aaf/templates/aaf-fs.yaml | 4 | ||||
| -rw-r--r-- | auth/helm/aaf/templates/aaf-gui.yaml | 4 | ||||
| -rw-r--r-- | auth/helm/aaf/templates/aaf-locate.yaml | 8 | ||||
| -rw-r--r-- | auth/helm/aaf/templates/aaf-oauth.yaml | 4 | ||||
| -rw-r--r-- | auth/helm/aaf/templates/aaf-service.yaml | 2 | ||||
| -rw-r--r-- | auth/helm/aaf/values.yaml | 2 | ||||
| -rw-r--r-- | auth/sample/bin/service.sh | 21 | ||||
| -rw-r--r-- | auth/sample/local/aaf.props | 1 |
9 files changed, 28 insertions, 22 deletions
diff --git a/auth/helm/aaf/templates/aaf-cm.yaml b/auth/helm/aaf/templates/aaf-cm.yaml index ccc2e559..6542440b 100644 --- a/auth/helm/aaf/templates/aaf-cm.yaml +++ b/auth/helm/aaf/templates/aaf-cm.yaml @@ -62,10 +62,12 @@ spec: - name: aaf-config-container image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }} imagePullPolicy: IfNotPresent - command: ["bash","/opt/app/aaf_config/bin/agent.sh"] + command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service rm && bin/agent.sh"] volumeMounts: - mountPath: "/opt/app/osaaf" name: aaf-config-vol + - mountPath: "/opt/app/aaf/status" + name: aaf-status-vol env: - name: AAF_ENV value: "{{ .Values.services.aaf_env }}" diff --git a/auth/helm/aaf/templates/aaf-fs.yaml b/auth/helm/aaf/templates/aaf-fs.yaml index 7677b269..51c33672 100644 --- a/auth/helm/aaf/templates/aaf-fs.yaml +++ b/auth/helm/aaf/templates/aaf-fs.yaml @@ -62,10 +62,12 @@ spec: - name: aaf-config-container image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }} imagePullPolicy: IfNotPresent - command: ["bash","/opt/app/aaf_config/bin/agent.sh"] + command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service rm && bin/agent.sh"] volumeMounts: - mountPath: "/opt/app/osaaf" name: aaf-config-vol + - mountPath: "/opt/app/aaf/status" + name: aaf-status-vol env: - name: AAF_ENV value: "{{ .Values.services.aaf_env }}" diff --git a/auth/helm/aaf/templates/aaf-gui.yaml b/auth/helm/aaf/templates/aaf-gui.yaml index c7fb2a20..c31496fc 100644 --- a/auth/helm/aaf/templates/aaf-gui.yaml +++ b/auth/helm/aaf/templates/aaf-gui.yaml @@ -63,10 +63,12 @@ spec: - name: aaf-config-container image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }} imagePullPolicy: IfNotPresent - command: ["bash","/opt/app/aaf_config/bin/agent.sh"] + command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service rm && bin/agent.sh"] volumeMounts: - mountPath: "/opt/app/osaaf" name: aaf-config-vol + - mountPath: "/opt/app/aaf/status" + name: aaf-status-vol env: - name: AAF_ENV value: "{{ .Values.services.aaf_env }}" diff --git a/auth/helm/aaf/templates/aaf-locate.yaml b/auth/helm/aaf/templates/aaf-locate.yaml index b48c072b..c0bb3f92 100644 --- a/auth/helm/aaf/templates/aaf-locate.yaml +++ b/auth/helm/aaf/templates/aaf-locate.yaml @@ -62,7 +62,7 @@ spec: - name: aaf-config-container image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }} imagePullPolicy: IfNotPresent - command: ["bash","/opt/app/aaf_config/bin/agent.sh"] + command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service rm && bin/agent.sh"] volumeMounts: - mountPath: "/opt/app/osaaf" name: aaf-config-vol @@ -114,9 +114,3 @@ spec: - name: {{.Values.services.locate.fqdn}} protocol: TCP containerPort: {{.Values.services.locate.internal_port}} - env: - - name: aaf_locator_ns - valueFrom: - fieldRef: - fieldPath: metadata.namespace - diff --git a/auth/helm/aaf/templates/aaf-oauth.yaml b/auth/helm/aaf/templates/aaf-oauth.yaml index 3e36d29c..de66b4f1 100644 --- a/auth/helm/aaf/templates/aaf-oauth.yaml +++ b/auth/helm/aaf/templates/aaf-oauth.yaml @@ -62,10 +62,12 @@ spec: - name: aaf-config-container image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }} imagePullPolicy: IfNotPresent - command: ["bash","/opt/app/aaf_config/bin/agent.sh"] + command: ["bash","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service rm && bin/agent.sh"] volumeMounts: - mountPath: "/opt/app/osaaf" name: aaf-config-vol + - mountPath: "/opt/app/aaf/status" + name: aaf-status-vol env: - name: AAF_ENV value: "{{ .Values.services.aaf_env }}" diff --git a/auth/helm/aaf/templates/aaf-service.yaml b/auth/helm/aaf/templates/aaf-service.yaml index 5b9fe186..2b274984 100644 --- a/auth/helm/aaf/templates/aaf-service.yaml +++ b/auth/helm/aaf/templates/aaf-service.yaml @@ -65,6 +65,8 @@ spec: volumeMounts: - mountPath: "/opt/app/osaaf" name: aaf-config-vol + - mountPath: "/opt/app/aaf/status" + name: aaf-status-vol env: - name: aaf_env value: "{{ .Values.services.aaf_env }}" diff --git a/auth/helm/aaf/values.yaml b/auth/helm/aaf/values.yaml index 79194601..5cd676aa 100644 --- a/auth/helm/aaf/values.yaml +++ b/auth/helm/aaf/values.yaml @@ -114,7 +114,7 @@ image: # When using Docker Repo, add, and include trailing "/" # repository: nexus3.onap.org:10003/ # repository: localhost:5000/ - version: 2.1.11-SNAPSHOT + version: 2.1.12-SNAPSHOT resources: {} # We usually recommend not to specify default resources and to leave this as a conscious diff --git a/auth/sample/bin/service.sh b/auth/sample/bin/service.sh index a4d2aba1..29d9f967 100644 --- a/auth/sample/bin/service.sh +++ b/auth/sample/bin/service.sh @@ -81,6 +81,14 @@ if [ ! -e $FILE ]; then INITIALIZED="true" fi +# Should we clean up? +if [ ! -e "${LOCAL}/VERSION" ] || [ "${VERSION}" != "$(cat ${LOCAL}/VERSION)" ]; then + echo "Clean up directory ${LOCAL}" + rm -Rf ${LOCAL}/org.osaaf.aaf.*props ${LOCAL}/org.osaaf.aaf.p12 + ls ${LOCAL} +fi +echo "${VERSION}" > $LOCAL/VERSION + # Load up Cert/X509 Artifacts # echo "Check Signer Keyfile" FILE="$LOCAL/org.osaaf.aaf.signer.p12" @@ -99,19 +107,11 @@ if [ ! -e $FILE ]; then ln -s $PUBLIC/truststoreONAPall.jks $LOCAL cp $CONFIG/cert/AAF_RootCA.cer $PUBLIC CM_TRUST_CAS="$PUBLIC/AAF_RootCA.cer" - echo "cadi_keystore_password=something easy" >> $CONFIG/local/aaf.props echo "Setup ONAP Test CAs and Signers" INITIALIZED="true" fi fi -# Should we clean up? -if [ "${VERSION}" != "$(cat ${LOCAL}/VERSION)" ]; then - echo "Clean up directory ${LOCAL}" - rm -Rf ${LOCAL}/* -fi -echo "${VERSION}" > $LOCAL/VERSION - FILE="$LOCAL/org.osaaf.aaf.p12" if [ ! -e $FILE ]; then if [ -e $CONFIG/cert/org.osaaf.aaf.p12 ]; then @@ -122,8 +122,9 @@ if [ ! -e $FILE ]; then echo "Bootstrap Creation of Keystore from Signer" cd $CONFIG/CA - # Remove this after Casablanca - CADI_X509_ISSUERS="CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US" + # Redo all of this after Dublin + export cadi_x509_issuers="CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US" + export signer_subj="/CN=intermediateCA_9/OU=OSAAF/O=ONAP/C=US" bash bootstrap.sh $LOCAL/org.osaaf.aaf.signer.p12 'something easy' cp aaf.bootstrap.p12 $FILE if [ -n "$CADI_X509_ISSUERS" ]; then diff --git a/auth/sample/local/aaf.props b/auth/sample/local/aaf.props index 4eb70a9b..022ca4eb 100644 --- a/auth/sample/local/aaf.props +++ b/auth/sample/local/aaf.props @@ -31,6 +31,7 @@ aaf_default_realm=people.osaaf.org aaf_password=startup cadi_alias=aaf@aaf.osaaf.org cadi_keystore=/opt/app/osaaf/local/org.osaaf.aaf.p12 +cadi_keystore_password=something easy cadi_truststore=/opt/app/osaaf/public/truststoreONAPall.jks cadi_truststore_password=changeit cadi_x509_issuers= |