diff options
Diffstat (limited to 'auth')
| -rw-r--r-- | auth/docker/agent.sh | 18 | ||||
| -rwxr-xr-x | auth/sample/bin/client.sh | 5 | ||||
| -rw-r--r-- | auth/sample/etc/org.osaaf.aaf.gui.props | 2 | ||||
| -rw-r--r-- | auth/sample/local/initialConfig.props | 12 |
4 files changed, 24 insertions, 13 deletions
diff --git a/auth/docker/agent.sh b/auth/docker/agent.sh index c330b1ce..d319de4d 100644 --- a/auth/docker/agent.sh +++ b/auth/docker/agent.sh @@ -48,15 +48,21 @@ for V in VERSION DOCKER_REPOSITORY HOSTNAME AAF_FQDN AAF_FQDN_IP DEPLOY_FQI APP_ # Need AAF_FQDN's IP, because not might not be available in mini-container PROMPT="AAF FQDN IP" LOOKUP=$(host "${AAF_FQDN}" | grep "has address") - if [ -z ${LOOKUP} ]; then - DEF= - else + if [ -n "${LOOKUP}" ]; then DEF=$(echo ${LOOKUP} | tail -1 | cut -f 4 -d ' ') fi ;; - APP_FQI) PROMPT="App's FQI";; - APP_FQDN) PROMPT="App's Root FQDN";; - VOLUME) PROMPT="APP's AAF Configuration Volume";; + APP_FQDN) PROMPT="App's Root FQDN";; + APP_FQI) PROMPT="App's FQI" + if [[ "${APP_FQDN}" != *"."* ]]; then + DEF="${APP_FQDN}@${APP_FQDN}.onap.org" + fi + ;; + VOLUME) PROMPT="APP's AAF Configuration Volume" + if [[ "${APP_FQDN}" != *"."* ]]; then + DEF="${APP_FQDN}_config" + fi + ;; DRIVER) PROMPT=$V;DEF=local;; VERSION) PROMPT="CADI Version";DEF=$CADI_VERSION;; LATITUDE|LONGITUDE) PROMPT="$V of Node";; diff --git a/auth/sample/bin/client.sh b/auth/sample/bin/client.sh index 7af8a974..9b146c5f 100755 --- a/auth/sample/bin/client.sh +++ b/auth/sample/bin/client.sh @@ -158,12 +158,17 @@ else $JAVA_AGENT showpass ${APP_FQI} ${APP_FQDN} ;; check) + echo "## Check Certificate" $JAVA_AGENT check ${APP_FQI} ${APP_FQDN} ;; validate) echo "## validate requested" $JAVA_AGENT_SELF validate ;; + renew) + echo "## Renew Certificate" + $JAVA_AGENT place ${APP_FQI} ${APP_FQDN} + ;; bash) shift cd $LOCAL || exit diff --git a/auth/sample/etc/org.osaaf.aaf.gui.props b/auth/sample/etc/org.osaaf.aaf.gui.props index b6e9072b..caad2080 100644 --- a/auth/sample/etc/org.osaaf.aaf.gui.props +++ b/auth/sample/etc/org.osaaf.aaf.gui.props @@ -30,7 +30,7 @@ aaf_locator_port.helm=30083 aaf_gui_title=AAF aaf_gui_copyright=(c) 2018 AT&T Intellectual Property. All rights reserved. aaf_gui_theme=theme/onap -cadi_loginpage_url=https://AAF_LOCATE_URL/AAF_NS.gui:2.0/login +cadi_loginpage_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.gui:2.0/login # GUI URLS and Help URLS aaf_url.gui_onboard=https://wiki.onap.org/display/DW/Client+Onboarding diff --git a/auth/sample/local/initialConfig.props b/auth/sample/local/initialConfig.props index 91d5338f..93cfae56 100644 --- a/auth/sample/local/initialConfig.props +++ b/auth/sample/local/initialConfig.props @@ -41,10 +41,10 @@ aaf_locator_fqdn.oom=aaf-%N.%CNS # AAF URLs
################################
aaf_locate_url=https://localhost:8095
-aaf_url=https://AAF_LOCATE_URL/%C.%AAF_NS.service:2.1
-aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/%C.%AAF_NS.oauth:2.1/introspect
-aaf_oauth2_token_url=https://AAF_LOCATE_URL/%C.%AAF_NS.oauth:2.1/token
-cm_url=https://AAF_LOCATE_URL/%C.%AAF_NS.cm:2.1
-gui_url=https://AAF_LOCATE_URL/%C.%AAF_NS.gui.2.1
-fs_url=https://AAF_LOCATE_URL/%C.%AAF_NS.fs.2.1
+aaf_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.service:2.1
+aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.oauth:2.1/introspect
+aaf_oauth2_token_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.oauth:2.1/token
+cm_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.cm:2.1
+gui_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.gui.2.1
+fs_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.fs.2.1
|