diff --git a/roles/generate-tempestconf-file-cloud/README.rst b/roles/generate-tempestconf-file-cloud/README.rst index 7f9f06d6..e41f44ee 100644 --- a/roles/generate-tempestconf-file-cloud/README.rst +++ b/roles/generate-tempestconf-file-cloud/README.rst @@ -23,12 +23,6 @@ to the output after that. A path to the virtual environment of python-tempestconf tool. -.. zuul:rolevar:: url_cirros_image - :type: string - :default: http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img - - A URL address of the cirros image. - .. zuul:rolevar:: tempestconf_src_relative_path :type: string diff --git a/roles/generate-tempestconf-file-cloud/defaults/main.yaml b/roles/generate-tempestconf-file-cloud/defaults/main.yaml index 40c69f34..c06b9570 100644 --- a/roles/generate-tempestconf-file-cloud/defaults/main.yaml +++ b/roles/generate-tempestconf-file-cloud/defaults/main.yaml @@ -1,4 +1,3 @@ cloud_user: "devstack" virtualenvs: tempestconf: "~/.virtualenvs/.tempestconf" -url_cirros_image: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" diff --git a/roles/generate-tempestconf-file-cloud/tasks/main.yaml b/roles/generate-tempestconf-file-cloud/tasks/main.yaml index 9e9489e5..ed75bc68 100644 --- a/roles/generate-tempestconf-file-cloud/tasks/main.yaml +++ b/roles/generate-tempestconf-file-cloud/tasks/main.yaml @@ -37,7 +37,6 @@ --os-cloud {{ cloud_user }} \ auth.tempest_roles Member \ service_available.swift False \ - image.http_image {{ url_cirros_image }} args: chdir: "{{ tempestconf_src_relative_path }}" executable: /bin/bash diff --git a/roles/generate-tempestconf-file/tasks/generate-tempestconf.sh.j2 b/roles/generate-tempestconf-file/tasks/generate-tempestconf.sh.j2 index 6e576f21..54b1c655 100644 --- a/roles/generate-tempestconf-file/tasks/generate-tempestconf.sh.j2 +++ b/roles/generate-tempestconf-file/tasks/generate-tempestconf.sh.j2 @@ -19,4 +19,3 @@ identity.uri $OS_AUTH_URL \ identity.admin_password $OS_PASSWORD \ service_available.swift False \ {{ aditional_tempestconf_params }} \ -image.http_image {{ url_cirros_image }}