openstack/openstack-ansible
Code Issues Proposed changes

Use plugins repo as collection

Browse Source 
Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-plugins/+/824148
Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-os_keystone/+/824183
Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-lxc_container_create/+/824195
Depends-On: https://review.opendev.org/c/openstack/ansible-role-systemd_networkd/+/824198
Depends-On: https://review.opendev.org/c/openstack/ansible-role-systemd_service/+/824197
Depends-On: https://review.opendev.org/c/openstack/ansible-role-systemd_mount/+/824196
Change-Id: Ic22ffe8e450bc11602749cdb36dffac7f7ac3721
This commit is contained in:
Dmitriy Rabotyagov 2022-01-11 16:01:11 +02:00 committed by Dmitriy Rabotyagov
parent f0ed7234cb
commit db1555018a
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ansible-role-requirements.yml
View File

@ -208,11 +208,6 @@
src: https://opendev.org/openstack/openstack-ansible-os_zun
version: master
trackbranch: master
- name: plugins
scm: git
src: https://opendev.org/openstack/openstack-ansible-plugins
version: master
trackbranch: master
- name: qdrouterd
scm: git
src: https://opendev.org/openstack/ansible-role-qdrouterd

2
playbooks/galera-install.yml
View File

@ -53,7 +53,7 @@
tags:
- crontab
vars:
galera_server_id: "{{ inventory_hostname | string_2_int }}"
galera_server_id: "{{ inventory_hostname | openstack.osa.string_2_int }}"
galera_wsrep_node_name: "{{ container_name | default(inventory_hostname) }}"
environment: "{{ deployment_environment_variables | default({}) }}"
tags:

16
scripts/openstack-ansible.rc
View File

@ -26,13 +26,10 @@ export ANSIBLE_ROLES_PATH="${ANSIBLE_ROLES_PATH:-/etc/ansible/roles:OSA_PLAYBOOK
export ANSIBLE_COLLECTIONS_PATHS="${ANSIBLE_COLLECTIONS_PATHS:-/etc/ansible}"
export ANSIBLE_COLLECTIONS_PATH="${ANSIBLE_COLLECTIONS_PATH:-/etc/ansible}"
export ANSIBLE_LIBRARY="${ANSIBLE_LIBRARY:-OSA_PLAYBOOK_PATH/library:/etc/ansible/roles/plugins/library:/etc/ansible/roles/ceph-ansible/library}"
export ANSIBLE_LOOKUP_PLUGINS="${ANSIBLE_LOOKUP_PLUGINS:-/etc/ansible/roles/plugins/lookup}"
export ANSIBLE_FILTER_PLUGINS="${ANSIBLE_FILTER_PLUGINS:-/etc/ansible/roles/plugins/filter:/etc/ansible/roles/ceph-ansible/plugins/filter}"
export ANSIBLE_ACTION_PLUGINS="${ANSIBLE_ACTION_PLUGINS:-/etc/ansible/roles/plugins/action:/etc/ansible/roles/ceph-ansible/plugins/actions}"
export ANSIBLE_CALLBACK_PLUGINS="${ANSIBLE_CALLBACK_PLUGINS:-/etc/ansible/roles/plugins/callback:/etc/ansible/roles/ceph-ansible/plugins/callback}"
export ANSIBLE_TEST_PLUGINS="${ANSIBLE_TEST_PLUGINS:-/etc/ansible/roles/plugins/test}"
export ANSIBLE_VARS_PLUGINS="${ANSIBLE_VARS_PLUGINS:-/etc/ansible/roles/plugins/vars_plugins}"
export ANSIBLE_LIBRARY="${ANSIBLE_LIBRARY:-OSA_PLAYBOOK_PATH/library:/etc/ansible/roles/ceph-ansible/library}"
export ANSIBLE_FILTER_PLUGINS="${ANSIBLE_FILTER_PLUGINS:-/etc/ansible/roles/ceph-ansible/plugins/filter}"
export ANSIBLE_ACTION_PLUGINS="${ANSIBLE_ACTION_PLUGINS:-/etc/ansible/roles/ceph-ansible/plugins/actions}"
export ANSIBLE_CALLBACK_PLUGINS="${ANSIBLE_CALLBACK_PLUGINS:-/etc/ansible/roles/ceph-ansible/plugins/callback}"
export ANSIBLE_MODULE_UTILS="${ANSIBLE_MODULE_UTILS:-/etc/ansible/roles/ceph-ansible/module_utils}"
export ANSIBLE_GATHERING="${ANSIBLE_GATHERING:-smart}"
@ -50,14 +47,13 @@ fi
export ANSIBLE_HOST_KEY_CHECKING="${ANSIBLE_HOST_KEY_CHECKING:-False}"
export ANSIBLE_TIMEOUT="${ANSIBLE_TIMEOUT:-5}"
export ANSIBLE_TRANSPORT="${ANSIBLE_TRANSPORT:-ssh}"
export ANSIBLE_TRANSPORT="${ANSIBLE_TRANSPORT:-openstack.osa.ssh}"
export ANSIBLE_SSH_PIPELINING="${ANSIBLE_SSH_PIPELINING:-True}"
export ANSIBLE_SSH_RETRIES="${ANSIBLE_SSH_RETRIES:-5}"
export ANSIBLE_PIPELINING="${ANSIBLE_SSH_PIPELINING}"
export ANSIBLE_FORKS="${ANSIBLE_FORKS:-OSA_ANSIBLE_FORKS}"
export ANSIBLE_STRATEGY_PLUGINS="${ANSIBLE_STRATEGY_PLUGINS:-/etc/ansible/roles/plugins/strategy}"
export ANSIBLE_CONNECTION_PLUGINS="${ANSIBLE_CONNECTION_PLUGINS:-/etc/ansible/roles/plugins/connection}"
export ANSIBLE_STRATEGY="${ANSIBLE_STRATEGY:-openstack.osa.linear}"
export ANSIBLE_FORCE_HANDLERS="${ANSIBLE_FORCE_HANDLERS:-True}"
export ANSIBLE_PYTHON_INTERPRETER="${ANSIBLE_PYTHON_INTERPRETER:-OSA_ANSIBLE_PYTHON_INTERPRETER}"

13
scripts/run-upgrade.sh
View File

@ -161,10 +161,19 @@ function main {
tar zcf ${source_series_backup_file} /etc/openstack_deploy /etc/ansible/ /usr/local/bin/openstack-ansible.rc
fi
# ANSIBLE_INVENTORY may be set to a previous/incorrect location. To
# ensure this is not the case, we unset the environment variable.
# Environment variables may be set to a previous/incorrect location.
# To ensure this is not the case, we unset the environment variable.
unset ANSIBLE_INVENTORY
# TODO(noonedeadpunk): Remove after Y release
unset ANSIBLE_LIBRARY
unset ANSIBLE_FILTER_PLUGINS
unset ANSIBLE_ACTION_PLUGINS
unset ANSIBLE_CALLBACK_PLUGINS
unset ANSIBLE_TRANSPORT
unset ANSIBLE_STRATEGY_PLUGINS
unset ANSIBLE_CONNECTION_PLUGINS
bootstrap_ansible
pushd ${MAIN_PATH}/playbooks