Remove special handling for the development environment

deploy/ansible/development.yml

@@ -1,5 +1,6 @@
-- name: laravel-bjyblog-ansible
+- name: Laravel Bjyblog Ansible
   hosts: development
   tasks:
-    - import_role:
+    - name: Import the laravel role
+      ansible.builtin.import_role:
         name: laravel

deploy/ansible/local.yml

@@ -1,5 +1,6 @@
-- name: laravel-bjyblog-ansible
+- name: Laravel Bjyblog Ansible
   hosts: local
   tasks:
-    - import_role:
+    - name: Import the laravel role
+      ansible.builtin.import_role:
         name: laravel

deploy/ansible/production.yml

@@ -1,5 +1,6 @@
-- name: laravel-bjyblog-ansible
+- name: Laravel Bjyblog Ansible
   hosts: production
   tasks:
-    - import_role:
+    - name: Import the laravel role
+      ansible.builtin.import_role:
         name: laravel

deploy/ansible/roles/laravel/tasks/main.yml

@@ -56,11 +56,12 @@
 
 - name: Install k3s
   when: not k3s_install_stat.stat.exists
+  changed_when: false
+  ansible.builtin.command: /tmp/k3s-install.sh --write-kubeconfig-mode 644
   environment:
     INSTALL_K3S_MIRROR: cn
-    INSTALL_K3S_SKIP_START: true
+    INSTALL_K3S_SKIP_START: "true"
     INSTALL_K3S_VERSION: 'v1.20.15+k3s1'
-  ansible.builtin.command: /tmp/k3s-install.sh --write-kubeconfig-mode 644
 
 - name: Start k3s
   ansible.builtin.systemd:
@@ -161,6 +162,7 @@
 
 - name: Build helm diff
   when: not remote_helm_diff_stat.stat.exists
+  changed_when: false
   ansible.builtin.shell: |
     export GOPROXY=https://mirrors.aliyun.com/goproxy/
     cd /tmp/helm-diff
@@ -203,6 +205,7 @@
 
 - name: Generate kube config
   when: not kube_config_stat.stat.exists
+  changed_when: false
   ansible.builtin.shell: kubectl config view --raw > ~/.kube/config
 
 - name: Create laravel-bjyblog path
@@ -246,13 +249,6 @@
     regexp: '^host: '
     line: 'host: {{ app_host }}'
 
-- name: Change elasticsearch.enabled to false
-  when: inventory_hostname == 'development'
-  ansible.builtin.replace:
-    path: /laravel-bjyblog/site/deploy/helm/custom.yaml
-    regexp: "^elasticsearch:\n  enabled: true"
-    replace: 'elasticsearch:\n  enabled: false'
-
 - name: Check that the ssl key exists
   delegate_to: localhost
   ansible.builtin.stat:
@@ -306,18 +302,17 @@
     name: openshift
 
 - name: Read /laravel-bjyblog/site/deploy/helm/custom.yaml
-  when: inventory_hostname != 'development'
   ansible.builtin.command: cat /laravel-bjyblog/site/deploy/helm/custom.yaml
   register: helm_custom_value
+  changed_when: false
 
 - name: Set elasticsearch_value variable
-  when: inventory_hostname != 'development'
   ansible.builtin.set_fact:
     elasticsearch_value: "{{ (helm_custom_value.stdout | from_yaml_all).0.elasticsearch }}"
 
 - name: Get Elasticsearch pod name
   when:
-    - inventory_hostname != 'development'
+    - elasticsearch_value.enabled
     - not elasticsearch_value.password
   kubernetes.core.k8s_info:
     api_version: v1
@@ -334,7 +329,7 @@
 
 - name: Elasticsearch setup passwords
   when:
-    - inventory_hostname != 'development'
+    - elasticsearch_value.enabled
     - not elasticsearch_value.password
   kubernetes.core.k8s_exec:
     namespace: blog
@@ -344,14 +339,14 @@
 
 - name: Set elasticsearch_value variable
   when:
-    - inventory_hostname != 'development'
+    - elasticsearch_value.enabled
     - not elasticsearch_value.password
   ansible.builtin.set_fact:
     elasticsearch_password: "{{ elasticsearch_setup_passwords.stdout | regex_search('(?<=PASSWORD elastic = )\\w+') | trim }}"
 
 - name: Set elasticsearch.password
   when:
-    - inventory_hostname != 'development'
+    - elasticsearch_value.enabled
     - not elasticsearch_value.password
     - elasticsearch_password != 'None'
   ansible.builtin.replace:
@@ -361,7 +356,7 @@
 
 - name: Change kibana.enabled to true
   when:
-    - inventory_hostname != 'development'
+    - elasticsearch_value.enabled
     - not elasticsearch_value.password
     - elasticsearch_password != 'None'
   ansible.builtin.replace:
@@ -371,7 +366,7 @@
 
 - name: Change fluentd.enabled to true
   when:
-    - inventory_hostname != 'development'
+    - elasticsearch_value.enabled
     - not elasticsearch_value.password
     - elasticsearch_password != 'None'
   ansible.builtin.replace:
@@ -381,7 +376,7 @@
 
 - name: Helm upgrade
   when:
-    - inventory_hostname != 'development'
+    - elasticsearch_value.enabled
     - not elasticsearch_value.password
     - elasticsearch_password != 'None'
   kubernetes.core.helm:

deploy/ansible/staging.yml

@@ -1,5 +1,6 @@
-- name: laravel-bjyblog-ansible
+- name: Laravel Bjyblog Ansible
   hosts: staging
   tasks:
-    - import_role:
+    - name: Import the laravel role
+      ansible.builtin.import_role:
         name: laravel