From 7b2c156d5212fb498fc4140781146b5307a02d3c Mon Sep 17 00:00:00 2001 From: Martin Kopec Date: Tue, 19 Jun 2018 10:19:05 +0000 Subject: [PATCH] Fix operator_role value for account-generator When a tempest.conf is generated with admin credentials and swift is enabled, object-storage.operator_role is set to admin. This behavior is not wanted, when we generate tempest.conf for tempest account-generator. In this case the operator_role will be overriden in cli and set to Member (the same value as tempest.conf with demo credentials contains) Change-Id: I8b6e6a814a7cb96ef47bc6d3a8edc3f6a29aebfa --- playbooks/python-tempestconf-tempest-devstack.yaml | 2 +- playbooks/python-tempestconf-tempest-packstack.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/playbooks/python-tempestconf-tempest-devstack.yaml b/playbooks/python-tempestconf-tempest-devstack.yaml index 04d0c72e..c8271acc 100644 --- a/playbooks/python-tempestconf-tempest-devstack.yaml +++ b/playbooks/python-tempestconf-tempest-devstack.yaml @@ -44,7 +44,7 @@ include_role: name: generate-tempestconf-file vars: - aditional_tempestconf_params: "auth.tempest_roles Member" + aditional_tempestconf_params: "auth.tempest_roles Member object-storage.operator_role Member" output_path: "/etc/openstack/tempest_admin.conf" source_credentials_commands: "export HOST_IP={{ ansible_default_ipv4.address }}; source {{ devstack_base_dir }}/devstack/openrc admin admin; {{ set_auth_url }}" test_demo_user: False diff --git a/playbooks/python-tempestconf-tempest-packstack.yaml b/playbooks/python-tempestconf-tempest-packstack.yaml index 42cc4c3b..8fbab7a9 100644 --- a/playbooks/python-tempestconf-tempest-packstack.yaml +++ b/playbooks/python-tempestconf-tempest-packstack.yaml @@ -49,6 +49,7 @@ include_role: name: generate-tempestconf-file vars: + aditional_tempestconf_params: "object-storage.operator_role Member" output_path: "/etc/openstack/tempest_admin.conf" source_credentials_commands: "source {{ ansible_user_dir }}/keystonerc_admin" test_demo_user: False