Skip to content

Conversation

@srinath-janakiraman
Copy link
Contributor

25.1.1 merge to main

skommala and others added 30 commits July 27, 2023 10:27
Fix the connection string provisioning issues

1. Created JRF instance with rac database without providing db
connecting string.
2. Created JRF instance with rac database with providing db connect
string.
Fixed bug Certificate on LB is reset in scaling operation.
Test
-----

    Create a single VM instance with load balancer.
    Create a new certificate to the load balancer.
Note that you can generate a keypair from any OCI compute instance with
'openssl req -new -sha256 -newkey rsa:2048 -nodes -keyout testssl.key
-x509 -days 365 -out testssl.crt'
Note that you'll need to add both the certificate and private key pems
that are generated to the certificate.
Associate the certificate you added to the listener for the load
balancer.
Delete the demo certificate that was generated by the Stack from the
load balancer.
    Edit the stack and add a node.
    Make sure that new certificate is assigned to the listener.
    Demo certificate will be recreated but not assigned to any.

The certificate created and added by a customer is not reset, but will
still restore the cert created by terraform if it is deleted.
Uptake 23.3.2 marketplace values.
Implement -
[JCS-14015](https://jira.oraclecorp.com/jira/browse/JCS-14015) - Bug -
load-balancer policy required for instance creation

Created provisioning instance without load balancer and non admin user. 
Created provisioning instance with load balancer and non admin user.

---------

Co-authored-by: Abhijit Paranjpe <109541284+abhijit-paranjpe@users.noreply.github.com>
#225)

Bug - Fail to get password expiry date for OPSS user when using connect
string

Note that since the DB service name is not guaranteed to include the PDB
name ( I proved this by using a connect string w/o the PDB name in it to
successfully create a WLS for OCI instance). Therefore, the PDB name
must be asked for.

Also note that the validation change added will not be executed, but to
limit the scope of the changes I updated the validation only and didn't
try to also add in the validator. I suspect that the validation was
never added in order to ensure that 11g databases, which don't have a
PDB can be allowed.

Tested that when setting a connect string the error occurred. After the
fix, with PDB name provided, the error did not occur.
…#224)

validate_vcn_cidr.py always returning errors in bootstrap log due to
wls_vcn_cidr being empty with existing subnets.

Note that this is essentially a revert to the previous commit. The
checkin log for the commit states, "Use customer provided NSGs for
existing subnet provisioning". Therefore, I tested with existing subnet
and NSGs provided with the reversion of this line change and there were
no issues. Other tests in addition to existing subnet with NSGs
provided:
1. New VCN.
2. Existing VCN, new subnet
3. Existing subnet with security rules. In each case I tested with IDCS
added so the call to validate_vcn_cidr.py would occur. I not only made
sure the error no longer appeared, but verified that the metadata value
was present and ran validate_vcn_cidr.py by hand.
Verified issue by creating stack in a compartment without dynamic group
policies set and selecting OCI Policies checkbox. Clicked on
Instances|Instance Details and navigate to the OS Management and saw:
"No OS management information is available for this resource."
After fix ran same test and OS Managment information appears.
Uptake 23.3.3 release image values.

---------

Co-authored-by: Abhijit Paranjpe <109541284+abhijit-paranjpe@users.noreply.github.com>
#230)

JCS-14046 Support VM.Standard.E5.Flex shape, but not as default shape.
Testing using E5.Flex shape (requires OL8.8 image):
- 14.1.1.0 JDK11 with IDCS. idcs-sample-app logged into.
- 12.2.1.4 JRF on ATP with IDCS (2 OCPU count). idcs-sample-app logged
into.
- 14.1.1.0 JDK8 with IDCS validated cloning.

Testing max cpu utilization (E5.Flex allows 94 ocpu max):
- Using same logic changes in this MR built stack with:
-- max OCPUs for Flex5 to 1
-- max OCPUs for Flex4 to 2
-- Set 2 OCPUs for Flex 5 and ran tf plan. Confirmed validation error
fired.
-- Set 3 OCPUs for Flex 4 and ran tf plan. Confirmed validation error
fired. This shows no regression in the logic changes.
Uptake marketplace image values into 23.4.3 reelase
Uptake 24.1.1 marketplace values..
JCS-14023 Status check missing from public subnet provisioning
Verified status check now showing for public subnet, private endpoint
and bastion still showing status check, and that private subnet w/o
bastion still does not attempt to get status check. Verified all
conditions using both ORM UI and CLI.
Uptake 24.1.2 mp values..
- Make the keys of the maps of compute and volumes resources to have 2
digits at the end, to conserve the iteration order, which is
lexicographical, to prevent volume attachments from being reassigned to
other instances because of the iteration order in the list of compute
instances

Tests:
- Created a non-JRF stack with new VCN, and two nodes
- Scaled up the stack to 4 nodes, verified the apply job completed
successfully and that all servers were added.
- Scaled up the stack to 10 nodes, and verified the same points above
- Scaled up the stack to 11 nodes, and made the same verifications
above, and verified that the existing block volume attachments and block
volumes where not affected
- Scaled up the stack to 20 nodes, and made the same verifications above
- Scaled up the stack to 30 nodes, and made the same verifications above
- Scaled down the stack to 10 nodes. Verified that only the artifacts 29
to 10 are deleted, and the rest of the servers are still running
Sarada Kommalapati and others added 24 commits July 2, 2024 22:48
The monitoring alarm is being created as enabled only when the option
"Create OCI policies" checkbox is selected. The problem seems to be in
monitoring_alarms.tf line 11 because the flag "is_enabled" is associated
directly to var.create_policies which doesn't make sense. This PR is to
add a new variable independent to var.create_policies so when customer
clear the "Create OCI policies" checkbox the alarms created for
autoscaling remain enabled.

This option is intentionally hidden to the customer as we don't have a
use case for customers to create autoscaling with disabled alarms and
these are defaulted to true. The variables are configured in case of
advanced customers who may want to customize the stack can easily
override those variables.

Testing with OCI Checkbox enabled:

-     Verify new variable is not shown in ORM UI.
**12.2.1.4**

![345111004-d5f0e922-7f4f-4300-8d04-ca16f03dd73c](https://github.com/oracle-quickstart/oci-weblogic-server/assets/44181317/490e30e1-a844-4ad8-9418-a98f7f7d16e5)

**14.1.1**
<img width="772" alt="image"
src="https://github.com/oracle-quickstart/oci-weblogic-server/assets/106961326/f14cf051-00c5-4f8b-a06c-c3493b129e3d">

Usually undefined variables are shown at the bottom, this image is
evidence that new variable is hidden from customer and default value
(true) is used.

- Verify that provisioning succeed with OCI policy checkbox enabled and
when autosacling is enabled alarms are enabled after provisioning

![345111695-9cd6395d-ccc1-439e-8ab7-31f498a31e0d](https://github.com/oracle-quickstart/oci-weblogic-server/assets/44181317/d43eef16-d2cf-438b-979b-30b0841d8f86)

![345111870-864383e0-e987-416b-a2c0-44251b024c1f](https://github.com/oracle-quickstart/oci-weblogic-server/assets/44181317/779cc653-aa9a-452a-9d04-38199d29730b)

- Verify that provisioning succeed with OCI policy checkbox disabled and
when autosacling is enabled alarms are enabled after provisioning

![345112076-4af137ca-707c-4f82-b977-7d73c0389cd9-1](https://github.com/oracle-quickstart/oci-weblogic-server/assets/44181317/a97ff757-5af2-4453-b2e0-56e4fbcaed34)

![345112160-0c45d6ef-8037-49b9-8cd0-6886ac7dd9f5](https://github.com/oracle-quickstart/oci-weblogic-server/assets/44181317/b9915eb2-979f-4cfb-a4a3-4654f52ad5f3)

---------

Co-authored-by: Mahuwa-Barman <mahuwa.barman@oracle.com>
uptake new mp values

Co-authored-by: Sarada Kommalapati <sarada.kommlapati@oracle.com>
Update IDCS appgateway to 23.4.44-2310291619. This container image
version in 23.4.44 changed to idcs-appgateway-docker.
Tested multi-node 12.2.1.4 and 14.1.1.0 in secured production mode and
non-secured production mode by accessing IDCS sample app.
Uptake 24.3.1 mp values.

Co-authored-by: Sarada Kommalapati <sarada.kommlapati@oracle.com>
JCS-14582 - WLS for OCI dynamic group policy for instances does not
allow volumes to be added to the instance. This causes issues for
cloning scripts when volumes need to be added and removed from the
instances using the OCI API. Verified by creating a WLS for OCI instance
with "OCI Polcies" checkbox enabled and cloning that instance.
Set is_rms_private_endpoint_required to true by so CLI users do not have
to set this to false. Since a true value is only relevant to ORM
execution the default of true was causing issues for CLI users. Verified
that default value of false in terraform while ORM UI YAMLs have a
default true does not cause any regressions.
Uptake mp values.

Co-authored-by: Sarada Kommalapati <sarada.kommlapati@oracle.com>
uptake oct psus to all 5 images
In the UI show that there is an option to put all the Compute instances
in the same AD.
Show that the option is not selected by default. 

check box : **Use Same Availability Domain for all Compute Instances**
![Screenshot 2024-12-05 at 10 30
13 PM](https://github.com/user-attachments/assets/bd32f71f-81f4-4713-b710-e56a15b49e57)



Show that if the option is selected in the UI that the Compute instances
are all in the same AD.
![Screenshot 2024-12-02 at 5 02
04 PM](https://github.com/user-attachments/assets/bcd71402-9276-4af2-b511-72762d55da01)

IDCS instance with this option selected has the IDCS sample app added
correctly.
![Screenshot 2024-12-02 at 5 57
42 PM](https://github.com/user-attachments/assets/5fdaa374-974f-4b71-9cea-0d8ea564920d)

Show that the backends for the load balancer are set up correctly.
![Screenshot 2024-12-02 at 6 00
48 PM](https://github.com/user-attachments/assets/614763d4-caa0-4865-b59a-48ae3f9ed5f0)

Perform and scale out and show that the additional instance is added in
the same AD.
![Screenshot 2024-12-02 at 5 50
36 PM](https://github.com/user-attachments/assets/9f2fdf86-e354-4fe7-b75b-e4b7c85368bc)

Show that there are no issues with cloning.
![Screenshot 2024-11-29 at 11 34
23 PM](https://github.com/user-attachments/assets/188798e9-e9fa-40b7-bf41-c75fa72ed739)
![Screenshot 2024-11-29 at 11 43
21 PM](https://github.com/user-attachments/assets/d089337a-bdaf-43ae-ba63-4f9c7d6eedb0)
![Screenshot 2024-11-29 at 11 48
23 PM](https://github.com/user-attachments/assets/8c6938be-3fd8-4286-80ca-8f9f3b460ade)

Show that there are no issues with autoscaling.

`Apply complete! Resources: 65 added, 0 changed, 0 destroyed.

Outputs:
autoscaling_function_application_id =
"ocid1.fnapp.oc1.iad.aaaaaaaaazznl7uei34qyfl4sxxvvyelkmd5ufm6dw6zcw7bjpcioygt7e3q"
autoscaling_scalein_monitoring_alarm_id =
"ocid1.alarm.oc1.iad.aaaaaaaajhkebpkshceyjvv6wcp64o5idne6clphnpqmtbjak5z5awuexqlq"
autoscaling_scaleout_monitoring_alarm_id =
"ocid1.alarm.oc1.iad.aaaaaaaatrkvqzy3chqsipyjfckky7z6yl7xbt27t7iqp5s442a6n4nrkpna"
bastion_instance_id =
"ocid1.instance.oc1.iad.anuwcljsncovviycmzj4xxabupcceaqv37c4jcx3uzjldozfhge3hpg2z34q"
bastion_instance_public_ip = "158.101.110.29"
fss_system_id = ""
fusion_middleware_control_console = ""
is_vcn_peered = false
jdk_version = "JDK 8"
listing_version = "21.3.1-210716051200"
load_balancer_id =
"ocid1.loadbalancer.oc1.iad.aaaaaaaalicohve6qymbik76b62h3x6aksdd356yy2vwjdxtw3wh5rwe67ca"
load_balancer_ip = "150.136.31.236"
mount_target_id = ""
provisioning_status = "Asynchronous provisioning is enabled. Connect to
each compute instance and confirm that the file
/u01/data/domains/adauto_domain/provCompletedMarker exists. Details are
found in the file /u01/logs/provisioning.log."
resource_identifier_value = tolist([
  "adauto-b57a7325",
  "ccbhat",
])
rms_private_endpoint_id = ""
sample_application = "https://150.136.31.236/sample-app"
sample_application_protected_by_idcs = ""
ssh_command = ""
ssh_command_with_dynamic_port_forwarding = ""
virtual_cloud_network_cidr = "10.0.0.0/16"
virtual_cloud_network_id =
"ocid1.vcn.oc1.iad.amaaaaaancovviyaisnuupkdcpktyck2ygy4q2et4slpostpkrrhp7medutq"
webLogic_server_domain_configuration = "Production Mode"
weblogic_agent_configuration_id = ""
weblogic_instances = "[\""{ Instance
Id:ocid1.instance.oc1.iad.anuwcljsncovviychbkobah2k27m4efwq6wjt3h2v356xuckue3xdzajc7bq,
Instance name:adauto-wls-0, Availability Domain:PEKi:US-ASHBURN-AD-2,
Instance Shape:VM.Standard.E4.Flex, Private IP:10.0.2.211, Public IP:
}\"",\""{ Instance
Id:ocid1.instance.oc1.iad.anuwcljsncovviycif6fifncrtlfebdykgvuadfam6jjz7rvatkj63mlqs3a,
Instance name:adauto-wls-1, Availability Domain:PEKi:US-ASHBURN-AD-2,
Instance Shape:VM.Standard.E4.Flex, Private IP:10.0.2.157, Public IP:
}\""]"
weblogic_log_group_id = ""
weblogic_log_id = ""
weblogic_server_administration_console =
"https://10.0.2.211:7002/console"
weblogic_version = "12.2.1.4 Enterprise Edition (Non JRF)" `

if the option is not selected in the UI that the Compute instances are
still spread across ADs (regression test).
![Screenshot 2024-12-02 at 6 16
45 PM](https://github.com/user-attachments/assets/c6aafd3d-1688-45af-808c-ec16ca510cd7)
Set policies for enabling WLMS plugin
PR for merging changes for 25.1.1 psu into development branch
@oracle-contributor-agreement
Copy link

Thank you for your pull request and welcome to our community! To contribute, please sign the Oracle Contributor Agreement (OCA).
The following contributors of this PR have not signed the OCA:

To sign the OCA, please create an Oracle account and sign the OCA in Oracle's Contributor Agreement Application.

When signing the OCA, please provide your GitHub username. After signing the OCA and getting an OCA approval from Oracle, this PR will be automatically updated.

If you are an Oracle employee, please make sure that you are a member of the main Oracle GitHub organization, and your membership in this organization is public.

@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Required At least one contributor does not have an approved Oracle Contributor Agreement. label Jan 24, 2025
Copy link
Contributor

@Mahuwa-Barman Mahuwa-Barman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved as per discussion with Sarada

@skommala skommala merged commit f8ef6b0 into main Jan 24, 2025
1 check failed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

OCA Required At least one contributor does not have an approved Oracle Contributor Agreement.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants