Merge pull request #7070 from JoelKle/fix_rerun_ability

Installer - local_docker - fixed the ability to rerun the playbook

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul

installer/inventory

@@ -119,6 +119,11 @@ create_preload_data=True
 # your credentials
 secret_key=awxsecret
 
+# By default a broadcast websocket secret will be generated.
+# If you would like to *rerun the playbook*, you need to set a unique password.
+# Otherwise it would generate a new one every playbook run.
+# broadcast_websocket_secret=
+
 # Build AWX with official logos
 # Requires cloning awx-logos repo as a sibling of this project.
 # Review the trademark guidelines at https://github.com/ansible/awx-logos/blob/master/TRADEMARKS.md

installer/roles/kubernetes/tasks/main.yml

@@ -4,6 +4,7 @@
     broadcast_websocket_secret: "{{ lookup('password', '/dev/null', length=128) }}"
   run_once: true
   no_log: true
+  when: broadcast_websocket_secret is not defined
 
 - fail:
     msg: "Only set one of kubernetes_context or openshift_host"

installer/roles/local_docker/tasks/compose.yml

@@ -12,22 +12,22 @@
 
 - name: Create Docker Compose Configuration
   template:
-    src: "{{ item }}.j2"
+    src: "{{ item.file }}.j2"
-    dest: "{{ docker_compose_dir }}/{{ item }}"
+    dest: "{{ docker_compose_dir }}/{{ item.file }}"
-    mode: 0600
+    mode: "{{ item.mode }}"
-  with_items:
+  loop:
-    - environment.sh
+    - file: environment.sh
-    - credentials.py
+      mode: "0600"
-    - docker-compose.yml
+    - file: credentials.py
-    - nginx.conf
+      mode: "0600"
-    - redis.conf
+    - file: docker-compose.yml
+      mode: "0600"
+    - file: nginx.conf
+      mode: "0600"
+    - file: redis.conf
+      mode: "0664"
   register: awx_compose_config
 
-- name: Set redis config to other group readable to satisfy redis-server
-  file:
-    path: "{{ docker_compose_dir }}/redis.conf"
-    mode: 0666
-
 - name: Render SECRET_KEY file
   copy:
     content: "{{ secret_key }}"

installer/roles/local_docker/tasks/main.yml

@@ -4,6 +4,7 @@
     broadcast_websocket_secret: "{{ lookup('password', '/dev/null', length=128) }}"
   run_once: true
   no_log: true
+  when: broadcast_websocket_secret is not defined
 
 - import_tasks: upgrade_postgres.yml
   when: