Var renaming as requested in hitachienergy#2983 (comment)

rafzei · Mar 28, 2022 · b272dde · b272dde
1 parent 70bce42
commit b272dde
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/ansible/playbooks/roles/opensearch_dashboards/tasks/dashboards.yml b/ansible/playbooks/roles/opensearch_dashboards/tasks/dashboards.yml
@@ -8,22 +8,22 @@
 
 - name: Create OpenSearch Dashboards user
   user:
-    name: "{{ specification.dashboards_user }}"
+    name: "{{ specification.dashboards_os_user }}"
     state: present
     shell: /bin/bash
 
 - name: Create home directory
   file:
     path: "{{ specification.paths.opensearchdash_home }}"
     state: directory
-    owner: "{{ specification.dashboards_user }}"
-    group: "{{ specification.dashboards_user }}"
+    owner: "{{ specification.dashboards_os_user }}"
+    group: "{{ specification.dashboards_os_user }}"
 
 - name: Extract OpenSearch Dashboards tar file
   unarchive:
     src: "/tmp/{{ file_name_version.opensearch_dashboards[ansible_architecture] }}"
     dest: "{{ specification.paths.opensearchdash_home }}"
-    owner: "{{ specification.dashboards_user }}"
+    owner: "{{ specification.dashboards_os_user }}"
     remote_src: yes
     extra_opts:
     - --strip-components=1
@@ -32,8 +32,8 @@
   template:
     src: opensearch_dashboards.yml.j2
     dest: "{{ specification.paths.opensearchdash_conf_dir }}/opensearch_dashboards.yml"
-    owner: "{{ specification.dashboards_user }}"
-    group: "{{ specification.dashboards_user }}"
+    owner: "{{ specification.dashboards_os_user }}"
+    group: "{{ specification.dashboards_os_user }}"
     mode: 0644
     backup: yes
 

diff --git a/ansible/playbooks/roles/opensearch_dashboards/templates/opensearch-dashboards.service.j2 b/ansible/playbooks/roles/opensearch_dashboards/templates/opensearch-dashboards.service.j2
@@ -9,8 +9,8 @@ PrivateTmp=true
 
 WorkingDirectory={{ specification.paths.opensearchdash_home }}
 
-User={{ specification.dashboards_user }}
-Group={{ specification.dashboards_user }}
+User={{ specification.dashboards_os_user }}
+Group={{ specification.dashboards_os_user }}
 
 ExecStart={{ specification.paths.opensearchdash_home }}/bin/opensearch-dashboards -q
 

diff --git a/ansible/playbooks/roles/opensearch_dashboards/templates/opensearch_dashboards.yml.j2 b/ansible/playbooks/roles/opensearch_dashboards/templates/opensearch_dashboards.yml.j2
@@ -2,7 +2,7 @@ server.port: 5601
 server.host: "{{ ansible_host }}"
 opensearch.hosts: ["{{ opensearch_nodes_dashboards }}"]
 opensearch.ssl.verificationMode: none
-opensearch.username: "{{ specification.dashboards_user }}"
+opensearch.username: "{{ specification.dashboards_os_user }}"
 opensearch.password: "{{ specification.dashboards_password }}"
 opensearch.requestHeadersWhitelist: [ authorization,securitytenant ]
 

diff --git a/ansible/playbooks/roles/upgrade/tasks/opensearch/migrate-kibana.yml b/ansible/playbooks/roles/upgrade/tasks/opensearch/migrate-kibana.yml
@@ -22,7 +22,7 @@
 
 - name: Kibana migr | Create opensearch-dashboards user
   user:
-    name: "{{ specification.dashboards_user }}"
+    name: "{{ specification.dashboards_os_user }}"
     password: "{{ specification.dashboards_password }}"
     state: present
     shell: /bin/bash
@@ -31,8 +31,8 @@
   file:
     path: "{{ item }}"
     state: directory
-    owner: "{{ specification.dashboards_user }}"
-    group: "{{ specification.dashboards_user }}"
+    owner: "{{ specification.dashboards_os_user }}"
+    group: "{{ specification.dashboards_os_user }}"
     mode: ug=rwx,o=rx
   with_items:
     - "{{ specification.paths.opensearchdash_log_dir }}"
@@ -42,7 +42,7 @@
   unarchive:
     src: "/tmp/{{ file_name_version.opensearch_dashboards[ansible_architecture] }}"
     dest: "{{ specification.paths.opensearchdash_home }}"
-    owner: "{{ specification.dashboards_user }}"
+    owner: "{{ specification.dashboards_os_user }}"
     remote_src: yes
     extra_opts:
     - --strip-components=1
@@ -52,7 +52,7 @@
     src: /etc/kibana/kibana.yml
     dest: "{{ specification.paths.opensearchdash_conf_dir }}/opensearch_dashboards.yml"
     remote_src: yes
-    owner: "{{ specification.dashboards_user }}"
+    owner: "{{ specification.dashboards_os_user }}"
     group: root
     mode: ug=rw,o=
     backup: yes

diff --git a/ansible/playbooks/roles/upgrade/tasks/opensearch/migrate-odfe.yml b/ansible/playbooks/roles/upgrade/tasks/opensearch/migrate-odfe.yml
@@ -28,7 +28,7 @@
     fail:
       msg: "Are you trying to migrate from ODFE ( opensearch_vars.specification.odfe_migration: true ) on an already migrated server?"
     when:
-    - opensearch_vars.specification.odfe_migration == true
+    - opensearch_vars.specification.odfe_migration
 
 
 - name: ODFE migr | Set existing_config facts

diff --git a/schema/common/defaults/configuration/opensearch-dashboards.yml b/schema/common/defaults/configuration/opensearch-dashboards.yml
@@ -2,7 +2,7 @@ kind: configuration/opensearch-dashboards
 title: "OpenSearch-Dashboards"
 name: default
 specification:
-  dashboards_user: opensearchdboard
+  dashboards_os_user: opensearchdboard
   dashboards_password: PASSWORD_TO_CHANGE
   paths:
     opensearchdash_home: /usr/share/opensearch-dashboards