fix ohs issue

merative · Jun 6, 2024 · 6e80783 · 6e80783
1 parent eb6f0bc
commit 6e80783
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -15,7 +15,6 @@
  "features": {
  "ghcr.io/devcontainers/features/docker-in-docker:2": {},
  "ghcr.io/devcontainers-contrib/features/curl-apt-get:1": {},
- "ghcr.io/devcontainers-contrib/features/jfrog-cli-npm:1": {},
  "ghcr.io/devcontainers/features/python:1": {}
  },
  "postCreateCommand": "mkdir -p /home/vscode/.ansible/plugins/ && cp -r plugins/* /home/vscode/.ansible/plugins/ && pip install -r requirements.txt",

diff --git a/galaxy.yml b/galaxy.yml
@@ -11,7 +11,7 @@ name: spm_middleware
 
 # The version of the collection. Must be compatible with semantic versioning
 # Please note. version also exists in /github/workflows/release.yml and will need to be update also
-version: 1.6.2
+version: 1.6.3
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md

diff --git a/roles/ohs/tasks/config.yml b/roles/ohs/tasks/config.yml
@@ -328,7 +328,7 @@
  - name: Stop Component
  become: yes
  become_user: "{{ ohs_user }}"
- shell: "./stopComponent.sh ohs1"
+ shell: "echo {{ weblogic_password }} | ./stopComponent.sh ohs1"
  args:
  chdir: "{{ ohs_home }}/user_projects/domains/ohs_{{ ansible_hostname }}/bin"
  environment:

diff --git a/roles/ohs/templates/ohsNM.service.j2 b/roles/ohs/templates/ohsNM.service.j2
@@ -2,11 +2,11 @@
 Description=Oracle HTTP Server service
 
 [Service]
-User={{ ohs_user }}
+User=root
 Group={{ ohs_group }}
 Environment="ORACLE_HOME={{ ohs_home }}"
-ExecStart={{ ohs_home }}/user_projects/domains/ohs_{{ ansible_hostname }}/bin/startNodeManager.sh
-ExecStop={{ ohs_home }}/user_projects/domains/ohs_{{ ansible_hostname }}/bin/stopNodeManager.sh
+ExecStart=/bin/bash {{ ohs_home }}/user_projects/domains/ohs_{{ ansible_hostname }}/bin/startNodeManager.sh
+ExecStop=/bin/bash {{ ohs_home }}/user_projects/domains/ohs_{{ ansible_hostname }}/bin/stopNodeManager.sh
 Restart=always
 
 [Install]

diff --git a/roles/weblogic/vars/v14.1.1.0.240328.yml b/roles/weblogic/vars/v14.1.1.0.240328.yml
@@ -5,7 +5,7 @@ opatch: 'p28186730_1394215_Generic.zip'
 opatch_version: 13.9.4.2.15
 patch: 'p36454290_141100_Generic.zip'
 patch_number: 36454290
-napply: false
+napply: False
 patch_folder: '36454290'
 java_archive_file: jdk-8u411-linux-x64.tar.gz
 java_version_path: 'jdk1.8.0_411'