diff --git a/.zuul.yaml b/.zuul.yaml index 9521300c..cb9ebd56 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -219,7 +219,7 @@ Tempest job for python-tempestconf on a devstack environment as the demo user. run: playbooks/python-tempestconf-tempest-devstack.yaml vars: - aditional_tempestconf_params: "auth.tempest_roles member" + additional_tempestconf_params: "auth.tempest_roles member" user: demo cloud_user: devstack test_demo: true diff --git a/playbooks/python-tempestconf-tempest-packstack.yaml b/playbooks/python-tempestconf-tempest-packstack.yaml index 05c92a76..b64dbae0 100644 --- a/playbooks/python-tempestconf-tempest-packstack.yaml +++ b/playbooks/python-tempestconf-tempest-packstack.yaml @@ -74,7 +74,7 @@ include_role: name: generate-tempestconf-file vars: - aditional_tempestconf_params: "object-storage.operator_role Member" + additional_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 diff --git a/roles/generate-tempestconf-file/README.rst b/roles/generate-tempestconf-file/README.rst index c0a13316..e14594e7 100644 --- a/roles/generate-tempestconf-file/README.rst +++ b/roles/generate-tempestconf-file/README.rst @@ -61,7 +61,7 @@ is then copied to tempest directory. playbook where the role is called. -.. zuul:rolevar:: aditional_tempestconf_params +.. zuul:rolevar:: additional_tempestconf_params :type: string :default: "" diff --git a/roles/generate-tempestconf-file/defaults/main.yaml b/roles/generate-tempestconf-file/defaults/main.yaml index ba264ce7..55e419a0 100644 --- a/roles/generate-tempestconf-file/defaults/main.yaml +++ b/roles/generate-tempestconf-file/defaults/main.yaml @@ -2,7 +2,7 @@ devstack_base_dir: /opt/stack virtualenvs: tempestconf: ~/.virtualenvs/.tempestconf url_cirros_image: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" -aditional_tempestconf_params: "" +additional_tempestconf_params: "" test_demo_user: False test_accounts_file: /etc/openstack/accounts.yaml create_accounts_file: False diff --git a/roles/generate-tempestconf-file/tasks/generate-tempestconf.sh.j2 b/roles/generate-tempestconf-file/tasks/generate-tempestconf.sh.j2 index 84eb02b0..9aa66bac 100644 --- a/roles/generate-tempestconf-file/tasks/generate-tempestconf.sh.j2 +++ b/roles/generate-tempestconf-file/tasks/generate-tempestconf.sh.j2 @@ -17,4 +17,4 @@ discover-tempest-config \ {% elif test_demo_user and create_accounts_file %} --create-accounts-file ./etc/accounts.yaml \ {% endif %} -{{ aditional_tempestconf_params }} +{{ additional_tempestconf_params }}