Merge "standalone: use tripleo-operator-ansible for all branches"

roles/standalone/README.md

@@ -24,7 +24,6 @@ Role Variables
 - standalone_container_prep_log: <'standalone_container_prep.log'> --  The log of the container prepa ctions
 - standalone_container_prep_updates: <'true'> --  Adds needed parameters to containers-prepare-parameters.yaml so that new container images and packages will be retrieved
 
-- standalone_deploy_script: <'standalone.sh.j2'> -- The script name use to deploy the standalone server
 - standalone_deploy_log: <'standalone_deploy.log'> --  The log of the deployment
 - standalone_ansible_lint_log: <'standalone_ansible_lint.log'> -- The ansible lint output
 

roles/standalone/defaults/main.yml

@@ -23,7 +23,6 @@ standalone_container_prep_update_repo: >-
   {%- if container_prep_additional_repos -%},{{ container_prep_additional_repos }}{%- endif -%}
 
 # deploy script
-standalone_deploy_script: standalone.sh.j2
 standalone_deploy_log: standalone_deploy.log
 standalone_ansible_lint_log: standalone_ansible_lint.log
 

roles/standalone/tasks/main.yml

@@ -185,8 +185,6 @@
     name: validate-perf
 
 - name: Run standalone via tripleo-operator-ansible
-  when:
-    - release not in ['queens', 'rocky', 'stein', 'train']
   collections:
     - tripleo.operator
   include_role:
@@ -205,24 +203,6 @@
       {% endif %}
       {{ env_files }}
 
-# TODO(mwhahaha): remove after backwards compatibility is checked. Standalone hasn't
-# changed in the few releases so we can probably just remove this.
-- name: Run standalone legacy
-  when:
-    - release in ['queens', 'rocky', 'stein', 'train']
-  block:
-  - name: Create the deploy command for standalone
-    template:
-      src: "{{ standalone_deploy_script }}"
-      dest: "{{ working_dir }}/standalone.sh"
-      mode: 0755
-
-  - name: Deploy the standalone
-    shell: >
-      set -o pipefail &&
-      {{ working_dir }}/standalone.sh 2>&1 {{ timestamper_cmd }} > {{ working_dir }}/{{ standalone_deploy_log }}
-    changed_when: true
-
 - when: standalone_ansible_lint|default(false)|bool
   vars:
     quickstart_venv: "{{ lookup('env','OPT_WORKDIR') }}"