devops-controller fix s3 bucket path

ansible · Aug 2, 2023 · dcab0a0 · dcab0a0
1 parent af7f4c9
commit dcab0a0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/images/ansible/common/70_controller_post_install.yml b/images/ansible/common/70_controller_post_install.yml
@@ -102,7 +102,7 @@
     cmd: /tmp/aws/install --install-dir /usr/local/aws --bin-dir /usr/bin/ --update
     creates: /usr/bin/aws
 
-- name: Download setup scripts to controller /opt directory - {{ lab.s3_bucket_name }}
+- name: Download setup scripts to controller /opt directory - {{ lab.s3.bucket_path }}
   ansible.builtin.command:
     cmd: "/usr/bin/aws s3 sync --no-sign-request {{ lab.s3.bucket_path }} /opt/setup-scripts/{{ track_slug }}"
   register: __s3_sync_output

diff --git a/images/ansible/devops-controller-setup.yml b/images/ansible/devops-controller-setup.yml
@@ -325,12 +325,6 @@
     - name: Include common controller install tasks
       ansible.builtin.include_tasks:
         file: "{{ playbook_dir }}/common/50_install_controller.yml"
-        apply:
-          tags:
-            - controller-install
-          become: false
-      tags:
-        - controller-install
 
     - name: Include common controller post install tasks
       ansible.builtin.include_tasks:

diff --git a/images/ansible/vars/devops-controller_vars.yml b/images/ansible/vars/devops-controller_vars.yml
@@ -110,11 +110,11 @@ lab:
     name: ACME Corp EE
     image: quay.io/acme_corp/instruqt-devops-ee
   s3:
-    bucket_name: tmm-instruqt-content.demoredhat.com.private
+    # bucket_name: tmm-instruqt-content.demoredhat.com.private
     # Dev
     # bucket_path: s3://{{ lab.s3.bucket_name }}/{{ track_slug }}-dev
     # Prod
-    bucket_path: s3://{{ lab.s3.bucket_name }}/{{ track_slug }}
+    bucket_path: "s3://tmm-instruqt-content.demoredhat.com.private/{{ track_slug }}"
   acme_venv: "/home/{{ student_username }}/.virtualenvs/acme_corp"
   workflow_name: DevOps Workflow
   default_tag_name: "0.0.1"