Browse Source

Remove in-repo ARA implementation

Since upstream fixes[0] have merged, we can now leverage the OSA scripts
to install ARA into the venv.

[0] https://review.openstack.org/#/c/603699/

Change-Id: Ic95f22448fa693041ba0de8b2d1c79660a3aef6c
Logan V 7 months ago
parent
commit
6aabc3da95
3 changed files with 0 additions and 36 deletions
  1. 0
    1
      .zuul.d/playbooks-deploy/run.yml
  2. 0
    29
      scripts/functions.sh
  3. 0
    6
      scripts/run_deploy.sh

+ 0
- 1
.zuul.d/playbooks-deploy/run.yml View File

@@ -6,7 +6,6 @@
6 6
   environment:
7 7
     SSH_AUTH_SOCK: "{{ ssh_agent_sock }}"
8 8
     ANSIBLE_VAULT_PASSWORD_FILE: "{{ vault_key_path }}"
9
-    LSN_RUN_ARA: 'true'
10 9
   tasks:
11 10
     - name: Run the deploy job
12 11
       command: scripts/run_deploy.sh

+ 0
- 29
scripts/functions.sh View File

@@ -1,29 +0,0 @@
1
-#!/usr/bin/env bash
2
-
3
-LSN_RUN_ARA="${LSN_RUN_ARA:-false}"
4
-
5
-# The vars used to prepare the Ansible runtime venv
6
-PIP_COMMAND="/opt/ansible-runtime/bin/pip"
7
-
8
-# NOTE(logan): Remove once https://review.openstack.org/#/c/602461/
9
-# has merged.
10
-function setup_ara {
11
-  # Install ARA and add it to the callback path provided by bootstrap-ansible.sh/openstack-ansible.rc
12
-  # This is added *here* instead of bootstrap-ansible so it's used for CI purposes only.
13
-  ARA_SRC_HOME="${HOME}/src/git.openstack.org/openstack/ara"
14
-  if [[ -d "${ARA_SRC_HOME}" ]]; then
15
-    # This installs from a git checkout
16
-    # PIP_COMMAND and PIP_OPTS are exported by the bootstrap-ansible script.
17
-    # PIP_OPTS contains the whole set of constraints that need to be applied.
18
-    ${PIP_COMMAND} install --isolated ${PIP_OPTS} ${ARA_SRC_HOME} "${ANSIBLE_PACKAGE:-ansible}"
19
-  else
20
-    # This installs from pypi
21
-    # PIP_COMMAND and PIP_OPTS are exported by the bootstrap-ansible script.
22
-    # PIP_OPTS contains the whole set of constraints that need to be applied.
23
-    ${PIP_COMMAND} install --isolated ${PIP_OPTS} ara==0.14.0 "${ANSIBLE_PACKAGE:-ansible}"
24
-  fi
25
-  # Dynamically retrieve the location of the ARA callback so we are able to find
26
-  # it on both py2 and py3
27
-  ara_location=$(/opt/ansible-runtime/bin/python -c "import os,ara; print(os.path.dirname(ara.__file__))")
28
-  export ANSIBLE_CALLBACK_PLUGINS="/etc/ansible/roles/plugins/callback:${ara_location}/plugins/callbacks"
29
-}

+ 0
- 6
scripts/run_deploy.sh View File

@@ -5,15 +5,9 @@ set -e
5 5
 export SCRIPT_PATH=$(dirname $(readlink -f "$0"))
6 6
 export PROJECT_PATH=$(dirname "$SCRIPT_PATH")
7 7
 
8
-source "${SCRIPT_PATH}/functions.sh"
9
-
10 8
 cp -R ${PROJECT_PATH}/openstack_deploy /etc
11 9
 pushd ${PROJECT_PATH}/openstack-ansible
12 10
 scripts/bootstrap-ansible.sh
13
-
14
-if [ "$LSN_RUN_ARA" == true ]; then
15
-    setup_ara
16
-fi
17 11
 popd
18 12
 
19 13
 pushd ${PROJECT_PATH}/openstack-ansible/playbooks

Loading…
Cancel
Save