Skip to content

Updated the OHS template to handle new OHS base images #225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 7, 2022
Merged

Updated the OHS template to handle new OHS base images #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04c4e12
Updated the vmSizeSelect parameter to vmSize
Dec 7, 2022
d2810c4
Removed the data disk option
Dec 7, 2022
c69b7c0
Updated the JDK version and keytool path
Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions ...r/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/ohsNestedTemplate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
"description": "virtual network name."
}
},
"vmSizeSelect": {
"vmSize": {
"type": "string",
"defaultValue": "Standard_A3",
"metadata": {
Expand Down Expand Up @@ -222,7 +222,7 @@
}
},
"const_publicIPAddressType": "Dynamic",
"const_vmSize": "[parameters('vmSizeSelect')]",
"const_vmSize": "[parameters('vmSize')]",
"name_linuxImageOfferSKU": "[variables('name_ohsSkuUrnVersion')[1]]",
"name_linuxImageVersion": "[variables('name_ohsSkuUrnVersion')[2]]",
"name_networkSecurityGroup": "[concat(parameters('dnsLabelPrefix'), '-nsg')]",
Expand Down Expand Up @@ -327,17 +327,7 @@
"managedDisk": {
"storageAccountType": "StandardSSD_LRS"
}
},
"dataDisks": [
{
"lun": 0,
"createOption": "FromImage",
"diskSizeGB": 900,
"managedDisk": {
"storageAccountType": "StandardSSD_LRS"
}
}
]
}
},
"networkProfile": {
"networkInterfaces": [
Expand Down
10 changes: 5 additions & 5 deletions ...inux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupOHS.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,14 @@ function verifyCertValidity()

# Check whether KEYSTORE supplied can be opened for reading
# Redirecting as no need to display the contents
runuser -l oracle -c "keytool -list -v -keystore $KEYSTORE -storepass $PASSWORD -storetype $KEY_STORE_TYPE > /dev/null 2>&1"
runuser -l oracle -c "$JAVA_HOME/bin/keytool -list -v -keystore $KEYSTORE -storepass $PASSWORD -storetype $KEY_STORE_TYPE > /dev/null 2>&1"
if [ $? != 0 ];
then
echo_stderr "Error opening the keystore : $KEYSTORE"
exit 1
fi

aliasList=`runuser -l oracle -c "keytool -list -v -keystore $KEYSTORE -storepass $PASSWORD -storetype $KEY_STORE_TYPE | grep Alias" |awk '{print $3}'`
aliasList=`runuser -l oracle -c "$JAVA_HOME/bin/keytool -list -v -keystore $KEYSTORE -storepass $PASSWORD -storetype $KEY_STORE_TYPE | grep Alias" |awk '{print $3}'`
if [[ -z $aliasList ]];
then
echo_stderr "Error : No alias found in supplied certificate $KEYSTORE"
Expand All @@ -126,7 +126,7 @@ function verifyCertValidity()

for alias in $aliasList
do
VALIDITY_PERIOD=`runuser -l oracle -c "keytool -list -v -keystore $KEYSTORE -storepass $PASSWORD -storetype $KEY_STORE_TYPE -alias $alias | grep Valid"`
VALIDITY_PERIOD=`runuser -l oracle -c "$JAVA_HOME/bin/keytool -list -v -keystore $KEYSTORE -storepass $PASSWORD -storetype $KEY_STORE_TYPE -alias $alias | grep Valid"`
echo "$KEYSTORE is \"$VALIDITY_PERIOD\""
CERT_UNTIL_DATE=`echo $VALIDITY_PERIOD | awk -F'until:|\r' '{print $2}'`
CERT_UNTIL_SECONDS=`date -d "$CERT_UNTIL_DATE" +%s`
Expand Down Expand Up @@ -466,7 +466,7 @@ function addCertficateToOracleVault()
# Validate JKS file
verifyCertValidity ${OHS_VAULT_PATH}/ohsKeystore.jks $ohsKeyStorePassPhrase $CURRENT_DATE $MIN_CERT_VALIDITY "JKS"

KEY_TYPE=`keytool -list -v -keystore ${OHS_VAULT_PATH}/ohsKeystore.jks -storepass ${ohsKeyStorePassPhrase} | grep 'Keystore type:'`
KEY_TYPE=`$JAVA_HOME/bin/keytool -list -v -keystore ${OHS_VAULT_PATH}/ohsKeystore.jks -storepass ${ohsKeyStorePassPhrase} | grep 'Keystore type:'`
if [[ $KEY_TYPE == *"jks"* ]]; then
runuser -l oracle -c "${INSTALL_PATH}/oracle/middleware/oracle_home/oracle_common/bin/orapki wallet jks_to_pkcs12 -wallet ${OHS_VAULT_PATH} -pwd ${ORACLE_VAULT_PASSWORD} -keystore ${OHS_VAULT_PATH}/ohsKeystore.jks -jkspwd ${ohsKeyStorePassPhrase}"
if [[ $? == 0 ]]; then
Expand Down Expand Up @@ -537,7 +537,7 @@ MIN_CERT_VALIDITY="1"
read OHS_DOMAIN_NAME OHS_COMPONENT_NAME OHS_NM_USER OHS_NM_PSWD OHS_HTTP_PORT OHS_HTTPS_PORT WLS_REST_URL WLS_USER WLS_PASSWORD OHS_KEY_STORE_DATA OHS_KEY_STORE_PASSPHRASE ORACLE_VAULT_PASSWORD OHS_KEY_TYPE

JDK_PATH="/u01/app/jdk"
JDK_VERSION="jdk1.8.0_271"
JDK_VERSION="jdk1.8.0_291"
JAVA_HOME=$JDK_PATH/$JDK_VERSION
PATH=$JAVA_HOME/bin:$PATH
OHS_PATH="/u01/app/ohs"
Expand Down