diff --git a/ansible/install/group_vars/all.yml b/ansible/install/group_vars/all.yml index 45be88a64..b4b815c7e 100644 --- a/ansible/install/group_vars/all.yml +++ b/ansible/install/group_vars/all.yml @@ -560,3 +560,6 @@ nginx_kibana_port: 80 # default is no (set to blank) or false # set the below variable to 'true' to activate install_curator_tool: false + +# pass rhos_release url +rhos_release: diff --git a/ansible/install/roles/collectd/tasks/main.yml b/ansible/install/roles/collectd/tasks/main.yml index ebc1b6aed..ecea4df1f 100644 --- a/ansible/install/roles/collectd/tasks/main.yml +++ b/ansible/install/roles/collectd/tasks/main.yml @@ -3,6 +3,10 @@ include_vars: file: "vars/{{ rhosp_major }}.yml" +- name: Fetch vars + include_vars: + file: vars/defaults.yml + - name: (Undercloud) Get ctlplane ip address shell: ip r | egrep 'br-ctlplane\s*proto kernel' | awk '{print $NF}' register: undercloud_ctlplane_ip_address @@ -64,8 +68,6 @@ - name: install sqlalchemy collectd package inside the containers block: - name: packages needed for installing sqlalchemy collectd - vars: - rhos_release: http://download-node-02.eng.bos.redhat.com/rcm-guest/puddles/OpenStack/rhos-release/rhos-release-latest.noarch.rpm set_fact: packages_sqlalchemy_collectd: dnf install -y {{ rhos_release }} && rhos-release {{ rhosp_major }} && dnf install -y python3-sqlalchemy-collectd