Merge "Implement clouds.yaml for root user"

This commit is contained in:
Zuul 2018-08-01 00:02:54 +00:00 committed by Gerrit Code Review
commit ca68eafc06
2 changed files with 14 additions and 3 deletions

View File

@ -26,7 +26,7 @@
become: True
gather_facts: true
any_errors_fatal: true
roles:
- role: "{{ swift_rolename | default('os_swift') }}"
vars_files:
- test-vars.yml
roles:
- role: "os_swift"

View File

@ -61,7 +61,7 @@
set_fact:
package_state: "{{ (ansible_pkg_mgr in ['dnf', 'yum', 'zypper']) | ternary('present', 'latest') }}"
- name: Setup clouds.yaml
- name: Setup clouds.yaml for the test user
include_role:
name: openstack_openrc
private: yes
@ -72,6 +72,17 @@
openrc_openstack_client_config_dir_owner: "{{ lookup('env', 'USER') }}"
openrc_clouds_yml_file_owner: "{{ lookup('env', 'USER') }}"
- name: Setup clouds.yaml for the root user
include_role:
name: openstack_openrc
private: yes
vars:
openrc_file_dest: "/root/openrc"
openrc_file_owner: "root"
openrc_openstack_client_config_dir_dest: "/root/.config/openstack"
openrc_openstack_client_config_dir_owner: "root"
openrc_clouds_yml_file_owner: "root"
- include: test-install-openstack-hosts.yml
- name: Playbook for configuring the LXC host