From cbfc979685f00fe760f8f0f96987c2c7d14dcbae Mon Sep 17 00:00:00 2001 From: Ilya Kharin Date: Wed, 23 Oct 2013 14:48:19 +0400 Subject: [PATCH] Make Joker as a subpackage --- .testr.conf | 2 +- joker/LICENSE | 191 ------------------ joker/README.md | 49 ----- joker/{joker => }/__init__.py | 0 joker/joker.yaml | 62 ------ joker/{joker => }/nodes.py | 0 joker/requirements.txt | 1 - joker/sandbox/bin/joker.py | 24 --- joker/sandbox/bin/vagrant-ssh-config2yaml.awk | 73 ------- joker/sandbox/ssh/config | 8 - joker/sandbox/worm.json | 1 - joker/sandbox/worm.yaml | 112 ---------- joker/setup.cfg | 11 - joker/setup.py | 14 -- joker/test-requirements.txt | 2 - joker/tox.ini | 32 --- requirements.txt | 1 + setup.cfg | 3 +- tox.ini | 2 +- 19 files changed, 5 insertions(+), 583 deletions(-) delete mode 100644 joker/LICENSE delete mode 100644 joker/README.md rename joker/{joker => }/__init__.py (100%) delete mode 100644 joker/joker.yaml rename joker/{joker => }/nodes.py (100%) delete mode 100644 joker/requirements.txt delete mode 100755 joker/sandbox/bin/joker.py delete mode 100755 joker/sandbox/bin/vagrant-ssh-config2yaml.awk delete mode 100644 joker/sandbox/ssh/config delete mode 100644 joker/sandbox/worm.json delete mode 100644 joker/sandbox/worm.yaml delete mode 100644 joker/setup.cfg delete mode 100644 joker/setup.py delete mode 100644 joker/test-requirements.txt delete mode 100644 joker/tox.ini diff --git a/.testr.conf b/.testr.conf index 2fadb2e..888f7de 100644 --- a/.testr.conf +++ b/.testr.conf @@ -2,7 +2,7 @@ test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \ OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \ OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \ - ${PYTHON:-python} -m subunit.run discover -t ./ ./ostack_validator $LISTOPT $IDOPTION + ${PYTHON:-python} -m subunit.run discover -t ./ ./ $LISTOPT $IDOPTION test_id_option=--load-list $IDFILE test_list_option=--list diff --git a/joker/LICENSE b/joker/LICENSE deleted file mode 100644 index 37ec93a..0000000 --- a/joker/LICENSE +++ /dev/null @@ -1,191 +0,0 @@ -Apache License -Version 2.0, January 2004 -http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - -"License" shall mean the terms and conditions for use, reproduction, and -distribution as defined by Sections 1 through 9 of this document. - -"Licensor" shall mean the copyright owner or entity authorized by the copyright -owner that is granting the License. - -"Legal Entity" shall mean the union of the acting entity and all other entities -that control, are controlled by, or are under common control with that entity. -For the purposes of this definition, "control" means (i) the power, direct or -indirect, to cause the direction or management of such entity, whether by -contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the -outstanding shares, or (iii) beneficial ownership of such entity. - -"You" (or "Your") shall mean an individual or Legal Entity exercising -permissions granted by this License. - -"Source" form shall mean the preferred form for making modifications, including -but not limited to software source code, documentation source, and configuration -files. - -"Object" form shall mean any form resulting from mechanical transformation or -translation of a Source form, including but not limited to compiled object code, -generated documentation, and conversions to other media types. - -"Work" shall mean the work of authorship, whether in Source or Object form, made -available under the License, as indicated by a copyright notice that is included -in or attached to the work (an example is provided in the Appendix below). - -"Derivative Works" shall mean any work, whether in Source or Object form, that -is based on (or derived from) the Work and for which the editorial revisions, -annotations, elaborations, or other modifications represent, as a whole, an -original work of authorship. For the purposes of this License, Derivative Works -shall not include works that remain separable from, or merely link (or bind by -name) to the interfaces of, the Work and Derivative Works thereof. - -"Contribution" shall mean any work of authorship, including the original version -of the Work and any modifications or additions to that Work or Derivative Works -thereof, that is intentionally submitted to Licensor for inclusion in the Work -by the copyright owner or by an individual or Legal Entity authorized to submit -on behalf of the copyright owner. For the purposes of this definition, -"submitted" means any form of electronic, verbal, or written communication sent -to the Licensor or its representatives, including but not limited to -communication on electronic mailing lists, source code control systems, and -issue tracking systems that are managed by, or on behalf of, the Licensor for -the purpose of discussing and improving the Work, but excluding communication -that is conspicuously marked or otherwise designated in writing by the copyright -owner as "Not a Contribution." - -"Contributor" shall mean Licensor and any individual or Legal Entity on behalf -of whom a Contribution has been received by Licensor and subsequently -incorporated within the Work. - -2. Grant of Copyright License. - -Subject to the terms and conditions of this License, each Contributor hereby -grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, -irrevocable copyright license to reproduce, prepare Derivative Works of, -publicly display, publicly perform, sublicense, and distribute the Work and such -Derivative Works in Source or Object form. - -3. Grant of Patent License. - -Subject to the terms and conditions of this License, each Contributor hereby -grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, -irrevocable (except as stated in this section) patent license to make, have -made, use, offer to sell, sell, import, and otherwise transfer the Work, where -such license applies only to those patent claims licensable by such Contributor -that are necessarily infringed by their Contribution(s) alone or by combination -of their Contribution(s) with the Work to which such Contribution(s) was -submitted. If You institute patent litigation against any entity (including a -cross-claim or counterclaim in a lawsuit) alleging that the Work or a -Contribution incorporated within the Work constitutes direct or contributory -patent infringement, then any patent licenses granted to You under this License -for that Work shall terminate as of the date such litigation is filed. - -4. Redistribution. - -You may reproduce and distribute copies of the Work or Derivative Works thereof -in any medium, with or without modifications, and in Source or Object form, -provided that You meet the following conditions: - -You must give any other recipients of the Work or Derivative Works a copy of -this License; and -You must cause any modified files to carry prominent notices stating that You -changed the files; and -You must retain, in the Source form of any Derivative Works that You distribute, -all copyright, patent, trademark, and attribution notices from the Source form -of the Work, excluding those notices that do not pertain to any part of the -Derivative Works; and -If the Work includes a "NOTICE" text file as part of its distribution, then any -Derivative Works that You distribute must include a readable copy of the -attribution notices contained within such NOTICE file, excluding those notices -that do not pertain to any part of the Derivative Works, in at least one of the -following places: within a NOTICE text file distributed as part of the -Derivative Works; within the Source form or documentation, if provided along -with the Derivative Works; or, within a display generated by the Derivative -Works, if and wherever such third-party notices normally appear. The contents of -the NOTICE file are for informational purposes only and do not modify the -License. You may add Your own attribution notices within Derivative Works that -You distribute, alongside or as an addendum to the NOTICE text from the Work, -provided that such additional attribution notices cannot be construed as -modifying the License. -You may add Your own copyright statement to Your modifications and may provide -additional or different license terms and conditions for use, reproduction, or -distribution of Your modifications, or for any such Derivative Works as a whole, -provided Your use, reproduction, and distribution of the Work otherwise complies -with the conditions stated in this License. - -5. Submission of Contributions. - -Unless You explicitly state otherwise, any Contribution intentionally submitted -for inclusion in the Work by You to the Licensor shall be under the terms and -conditions of this License, without any additional terms or conditions. -Notwithstanding the above, nothing herein shall supersede or modify the terms of -any separate license agreement you may have executed with Licensor regarding -such Contributions. - -6. Trademarks. - -This License does not grant permission to use the trade names, trademarks, -service marks, or product names of the Licensor, except as required for -reasonable and customary use in describing the origin of the Work and -reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. - -Unless required by applicable law or agreed to in writing, Licensor provides the -Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, -including, without limitation, any warranties or conditions of TITLE, -NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are -solely responsible for determining the appropriateness of using or -redistributing the Work and assume any risks associated with Your exercise of -permissions under this License. - -8. Limitation of Liability. - -In no event and under no legal theory, whether in tort (including negligence), -contract, or otherwise, unless required by applicable law (such as deliberate -and grossly negligent acts) or agreed to in writing, shall any Contributor be -liable to You for damages, including any direct, indirect, special, incidental, -or consequential damages of any character arising as a result of this License or -out of the use or inability to use the Work (including but not limited to -damages for loss of goodwill, work stoppage, computer failure or malfunction, or -any and all other commercial damages or losses), even if such Contributor has -been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. - -While redistributing the Work or Derivative Works thereof, You may choose to -offer, and charge a fee for, acceptance of support, warranty, indemnity, or -other liability obligations and/or rights consistent with this License. However, -in accepting such obligations, You may act only on Your own behalf and on Your -sole responsibility, not on behalf of any other Contributor, and only if You -agree to indemnify, defend, and hold each Contributor harmless for any liability -incurred by, or claims asserted against, such Contributor by reason of your -accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work - -To apply the Apache License to your work, attach the following boilerplate -notice, with the fields enclosed by brackets "[]" replaced with your own -identifying information. (Don't include the brackets!) The text should be -enclosed in the appropriate comment syntax for the file format. We also -recommend that a file or class name and description of purpose be included on -the same "printed page" as the copyright notice for easier identification within -third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/joker/README.md b/joker/README.md deleted file mode 100644 index 08b0c00..0000000 --- a/joker/README.md +++ /dev/null @@ -1,49 +0,0 @@ -Joker -===== - -Joker is a configuration data collector framework for OpenStack-based clouds. -This framework inspects hardware and software configuration of cloud components. -The results of this inspection are used to create Architecture Data Model which -could be exported and used by external services. - -Installation and configuration ------------------------------- - -Usage and integration ---------------------- - -Architecture data model produced by Joker could be consumed by configuration -validator tool (Dark Knight), by architecture graph (Stencil) and others. - -At some point it should be made convertible into format accepted by deployment -systems (e.g. Fuel or TripleO) which will allow to effectively 'clone' OpenStack -clouds using different deployment applications. - -This model could be reused by Rally project to compare benchmarking results for -different architectures. - -The model can be used to inspect existing clouds for subsequent upgrade. - -The model suits as base for questionaire to assess existing installations for -support contract pricing purposes. - -Architecture Data Model ------------------------ - -This section proposes data model which allows to describe any OpenStack -installation. The model includes data regarding physical infrastructure, logical -topology of services and mapping between the two. - -Architecture data model could be serialized as JSON or YaML document of the -following format:: - - openstack - nodes - node1 - -param1: value - -param2: value - services - nova - configuration - -param1: value - -param2: value diff --git a/joker/joker/__init__.py b/joker/__init__.py similarity index 100% rename from joker/joker/__init__.py rename to joker/__init__.py diff --git a/joker/joker.yaml b/joker/joker.yaml deleted file mode 100644 index 7a80b1b..0000000 --- a/joker/joker.yaml +++ /dev/null @@ -1,62 +0,0 @@ -templates: - tcp_socket: &tcp_socket # we accept ip4 and ipv6 - host: - port: 22 - - proxy_command: &proxy_command - cmd: - - password: &password - pass: - - public_key: &public_key - path: - - connection_layer: &connection_layer - type: "HostName" - - access_method: - type: # ssh || telnet - method: j - - node: &node - #we suppose, mac address is unique key-property inside ethernet segment - hwaddr: - - ssh_entry: &ssh_entry - name: - connection_layer: - #ProxyCommand, or HostName - type: - # connection data == ( *tcp_socket || *proxyCommand ) - data: - authentication_layer: &authentication_layer - user: - type: # password || public_key - data: # *password || *public_key - transport_layer: # XXX stub - -dkenv_entry: &dkenv_entry - <<: *ssh_entry - authentication_layer: &dkenv_authentication_layer - <<: *authentication_layer - user: "vagrant" - type: "public_key" - data: - path: "~/.vagrant.d/insecure_private_key" - connection_layer: &dkenv_connection_layer - <<: *connection_layer - type: "HostName" - data: &dkenv_connection_layer_data - <<: *tcp_socket - host: "127.0.0.1" - -controller: &controller_joker - <<: *dkenv_entry - name: "controller.joker" - connection_layer: - <<: *dkenv_connection_layer - - -nodes: - - *controller_joker diff --git a/joker/joker/nodes.py b/joker/nodes.py similarity index 100% rename from joker/joker/nodes.py rename to joker/nodes.py diff --git a/joker/requirements.txt b/joker/requirements.txt deleted file mode 100644 index d1d3b67..0000000 --- a/joker/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -paramiko==1.11.0 diff --git a/joker/sandbox/bin/joker.py b/joker/sandbox/bin/joker.py deleted file mode 100755 index 8732bc2..0000000 --- a/joker/sandbox/bin/joker.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -import json -import paramiko -import sys - - -nodes = json.loads(sys.stdin.read())['nodes']; - -ssh = paramiko.SSHClient() -ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) - - -while node = pop(nodes): - ssh.connect(node['host']['dst'], port=node['host']['port'], - username=node['user']['name'], - key_filename=node['user']['private_key_path']); - -for node in nodes: - ssh.connect(node['host']['dst'], port=node['host']['port'], - username=node['user']['name'], - key_filename=node['user']['private_key_path']); - #stdin, stdout, stderr = ssh.exec_command('arp -ad') - #print stdout.readlines() - ssh.close() diff --git a/joker/sandbox/bin/vagrant-ssh-config2yaml.awk b/joker/sandbox/bin/vagrant-ssh-config2yaml.awk deleted file mode 100755 index b687ce8..0000000 --- a/joker/sandbox/bin/vagrant-ssh-config2yaml.awk +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh - -#controller: &controller -# host: -# <<: *host -# dst: 127.0.0.1 -# port: 2222 -# user: -# <<: *user -# name: 'vagrant' -# private_key_path: '/home/ryabin/.vagrant.d/insecure_private_key' -# l7_options: -# - 'LogLevel FATAL' -# - 'IdentitiesOnly yes' -# - 'PasswordAuthentication no' -# - 'StrictHostKeyChecking no' -# - 'UserKnownHostsFile /dev/null' - -# vagrant ssh-config name | awk -f this.script -function ssh_template_yaml(env) { - - fmt = "%s_joker: &%s_joker\n" - printf fmt, env["Host"], env["Host"]; - printf " host:\n" - printf " <<: *host\n" - fmt = " %s: %s\n" - printf fmt, "dst", env["HostName"] - if (env["Port"]) { - printf fmt, "port", env["Port"] - } - printf " user:\n" - printf " <<: *user\n" - printf fmt, "name", env["User"] - printf fmt, "private_key_path", env["IdentityFile"] - printf fmt, "l7_options", "" - - fmt = " - \"%s\"\n" - for (i in l7_options) { - printf fmt, l7_options[i] - } - - exit -} - -# ssh entry is -# "^Host foobar" -# Key value -# Key value -# .... -# Key value -# "^Host foobar2" -- we got start point of new host entry -# Key value -# Key value -# .... -# Key value - -BEGIN { - # first ssh entry applies for all described after - env["Host"] = "default" -} - -# entry starts -/^Host /i { - ssh_template_yaml(env); # dump entry - delete env; # reset env -} - -env[$1] = gensub(/.*[^ ] /, "", $0) - -END { - # end of parsing, dumping last entry - #ssh_template_yaml(env) -} diff --git a/joker/sandbox/ssh/config b/joker/sandbox/ssh/config deleted file mode 100644 index 8109ae7..0000000 --- a/joker/sandbox/ssh/config +++ /dev/null @@ -1,8 +0,0 @@ -#reusable tcp connections -ControlMaster auto -ControlPath ~/.ssh/tmp/%h_%p_%r - -#describe tunnel -Host node1.joker - User joker - ProxyCommand ssh -q joker@entryPoint nc -q0 node1.customer.int 22 diff --git a/joker/sandbox/worm.json b/joker/sandbox/worm.json deleted file mode 100644 index 0f1c3c0..0000000 --- a/joker/sandbox/worm.json +++ /dev/null @@ -1 +0,0 @@ -{"controller_joker": {"host": {"ssh_ident": null, "name": null, "dst": "127.0.0.1", "ssh_ports": [22], "interfaces": [{"ip_addr": [], "link": null, "name": null, "type": null}], "hw": {"mac_addr": []}, "port": 2222}, "user": {"private_key_path": "/home/ryabin/.vagrant.d/insecure_private_key", "private_key": null, "password": "generatedByCustomer", "name": "vagrant", "l7_options": ["LogLevel FATAL", "UserKnownHostsFile /dev/null", "StrictHostKeyChecking no", "PasswordAuthentication no", "IdentitiesOnly yes"]}}, "customerStorage": {"dst": ["strangename.*", "goodName.*"], "user": {"password": "storagePassword", "name": "storageUser"}}, "controller": {"host": {"ssh_ident": null, "name": null, "dst": "127.0.0.1", "ssh_ports": [22], "interfaces": [{"ip_addr": [], "link": null, "name": null, "type": null}], "hw": {"mac_addr": []}, "port": 2222}, "user": {"private_key_path": "/home/ryabin/.vagrant.d/insecure_private_key", "private_key": null, "password": "generatedByCustomer", "name": "vagrant", "l7_options": ["LogLevel FATAL", "IdentitiesOnly yes", "PasswordAuthentication no", "StrictHostKeyChecking no", "UserKnownHostsFile /dev/null"]}}, "customerCompute": {"dst": ["compute-*.customer.int"], "user": {"private_key": null, "password": "compute-password", "name": "joker", "user": "compute-robot"}}, "template": {"interface": {"ip_addr": [], "link": null, "name": null, "type": null}, "host": {"ssh_ports": [22], "ssh_ident": null, "interfaces": [{"ip_addr": [], "link": null, "name": null, "type": null}], "hw": {"mac_addr": []}, "name": null}, "user": {"private_key": null, "password": "generatedByCustomer", "name": "joker"}}, "credentials": [{"dst": ["strangename.*", "goodName.*"], "user": {"password": "storagePassword", "name": "storageUser"}}, {"dst": ["compute-*.customer.int"], "user": {"private_key": null, "password": "compute-password", "name": "joker", "user": "compute-robot"}}], "compute1_joker": {"host": {"ssh_ident": null, "name": null, "dst": "127.0.0.1", "ssh_ports": [22], "interfaces": [{"ip_addr": [], "link": null, "name": null, "type": null}], "hw": {"mac_addr": []}, "port": 2200}, "user": {"private_key_path": "/home/ryabin/.vagrant.d/insecure_private_key", "private_key": null, "password": "generatedByCustomer", "name": "vagrant", "l7_options": ["LogLevel FATAL", "UserKnownHostsFile /dev/null", "StrictHostKeyChecking no", "PasswordAuthentication no", "IdentitiesOnly yes"]}}, "start_point": {"host": {"ssh_ident": null, "name": null, "dst": "compute42", "interfaces": [{"ip_addr": [], "link": null, "name": null, "type": null}], "hw": {"mac_addr": []}, "ssh_ports": [22]}, "user": {"private_key": null, "password": "customerPassword", "name": "customerUser"}}, "nodes": [{"host": {"ssh_ident": null, "name": null, "dst": "127.0.0.1", "ssh_ports": [22], "interfaces": [{"ip_addr": [], "link": null, "name": null, "type": null}], "hw": {"mac_addr": []}, "port": 2222}, "user": {"private_key_path": "/home/ryabin/.vagrant.d/insecure_private_key", "private_key": null, "password": "generatedByCustomer", "name": "vagrant", "l7_options": ["LogLevel FATAL", "UserKnownHostsFile /dev/null", "StrictHostKeyChecking no", "PasswordAuthentication no", "IdentitiesOnly yes"]}}, {"host": {"ssh_ident": null, "name": null, "dst": "127.0.0.1", "ssh_ports": [22], "interfaces": [{"ip_addr": [], "link": null, "name": null, "type": null}], "hw": {"mac_addr": []}, "port": 2200}, "user": {"private_key_path": "/home/ryabin/.vagrant.d/insecure_private_key", "private_key": null, "password": "generatedByCustomer", "name": "vagrant", "l7_options": ["LogLevel FATAL", "UserKnownHostsFile /dev/null", "StrictHostKeyChecking no", "PasswordAuthentication no", "IdentitiesOnly yes"]}}]} diff --git a/joker/sandbox/worm.yaml b/joker/sandbox/worm.yaml deleted file mode 100644 index f041a6a..0000000 --- a/joker/sandbox/worm.yaml +++ /dev/null @@ -1,112 +0,0 @@ -# online yaml2json converting tool present in http://yaml-online-parser.appspot.com/ -# Worm credentials definition -template: - interface: &interface - name: - type: - ip_addr: [] - link: - - user: &user - name: joker - password: generatedByCustomer - private_key: - - host: &host - name: - hw: - mac_addr: [] - interfaces: [ - *interface - ] - ssh_ident: - ssh_ports: - - 22 - -customerCompute: &customerComputeTemplate - dst: - - compute-*.customer.int - user: - <<: *user - user: compute-robot - password: compute-password - -customerStorage: &customerStorageTemplate - dst: - - strangename.* - - goodName.* - user: - name: storageUser - password: storagePassword - - -credentials: - - *customerStorageTemplate - - *customerComputeTemplate - - -# entry point for deploy -start_point: &start - host: - <<: *host - dst: compute42 - user: - <<: *user - name: 'customerUser' - password: 'customerPassword' - -# vagrant controller from deploy env - -# describe controller credentials -controller: &controller - host: - <<: *host - dst: 127.0.0.1 - port: 2222 - user: - <<: *user - name: 'vagrant' - private_key_path: '/home/ryabin/.vagrant.d/insecure_private_key' - l7_options: - - 'LogLevel FATAL' - - 'IdentitiesOnly yes' - - 'PasswordAuthentication no' - - 'StrictHostKeyChecking no' - - 'UserKnownHostsFile /dev/null' - -compute1_joker: &compute1_joker - host: - <<: *host - dst: 127.0.0.1 - port: 2200 - user: - <<: *user - name: vagrant - private_key_path: /home/ryabin/.vagrant.d/insecure_private_key - l7_options: - - "LogLevel FATAL" - - "UserKnownHostsFile /dev/null" - - "StrictHostKeyChecking no" - - "PasswordAuthentication no" - - "IdentitiesOnly yes" -controller_joker: &controller_joker - host: - <<: *host - dst: 127.0.0.1 - port: 2222 - user: - <<: *user - name: vagrant - private_key_path: /home/ryabin/.vagrant.d/insecure_private_key - l7_options: - - "LogLevel FATAL" - - "UserKnownHostsFile /dev/null" - - "StrictHostKeyChecking no" - - "PasswordAuthentication no" - - "IdentitiesOnly yes" - - -#must be updated through discovering process new network nodes - - -nodes: [ *controller_joker, *compute1_joker ] diff --git a/joker/setup.cfg b/joker/setup.cfg deleted file mode 100644 index 72f1b00..0000000 --- a/joker/setup.cfg +++ /dev/null @@ -1,11 +0,0 @@ -[metadata] -name = joker -version = 0.0.1 -author = Mirantis Labs -author-email = labs-all@mirantis.com -summary = why so serious? -#description-file = README -license = Apache - -[files] -packages = joker diff --git a/joker/setup.py b/joker/setup.py deleted file mode 100644 index a502c6f..0000000 --- a/joker/setup.py +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env python - - -try: - from setuptools import setup -except ImportError: - from distribute_setup import use_setuptools - use_setuptools() - from setuptools import setup - -setup( - setup_requires=['d2to1'], - d2to1=True -) diff --git a/joker/test-requirements.txt b/joker/test-requirements.txt deleted file mode 100644 index 554d435..0000000 --- a/joker/test-requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -hacking>=0.5.6,<0.8 - diff --git a/joker/tox.ini b/joker/tox.ini deleted file mode 100644 index 657f04b..0000000 --- a/joker/tox.ini +++ /dev/null @@ -1,32 +0,0 @@ -[tox] -minversion = 1.6 -envlist = pep8 -skipsdist = True - -[testenv] -sitepackages = True -usedevelop = True -install_command = pip install -U {opts} {packages} -setenv = VIRTUAL_ENV={envdir} - LANG=en_US.UTF-8 - LANGUAGE=en_US:en - LC_ALL=C -deps = -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt -commands = - python setup.py test --slowest --testr-args='{posargs}' - -[testenv:pep8] -sitepackages = False -commands = - flake8 {posargs} - -[testenv:venv] -commands = {posargs} - -[testenv:unittests] -commands = - python -m unittest discover {posargs} - -[flake8] -exclude = .venv,.git,.tox,dist,lib/python*,*egg,build diff --git a/requirements.txt b/requirements.txt index dc5e514..814de5f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,3 +11,4 @@ jinja2==2.7 lettuce>=0.2.19 pymongo==2.6.1 recordtype==1.1 +paramiko==1.11.0 diff --git a/setup.cfg b/setup.cfg index f1ff32b..5573bae 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,4 +18,5 @@ classifier = [files] packages = - ostack_validator + rubick + joker diff --git a/tox.ini b/tox.ini index bbba87d..ca35f00 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 1.6 -envlist = py27,pep8 +envlist = py26,py27,pep8 skipsdist = True [testenv]