Merge pull request CentOS-PaaS-SIG#628 from herlo/release-1.5.4

herlo · Jul 24, 2018 · e616960 · e616960
2 parents 5af7777 + be3a060
commit e616960
Show file tree

Hide file tree

Showing 476 changed files with 16,026 additions and 11,538 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,8 @@
 ansible.cfg
 *.swp
 .fuse*
+.cache
+.pytest_cache
 
 # generated files
 docs/build/
@@ -23,8 +25,6 @@ MANIFEST
 # local inventory files containing user-specific environment data
 configure/inventory/local/
 
-*workspace*
-
 .coverage
 *coverage*
 nosetests.xml
@@ -34,6 +34,10 @@ nosetests.xml
 .idea
 .pydevproject
 
-Dockerfiles/pip_install.sh
-Dockerfiles/lp_test_workspace
-Dockerfiles/duffy-ansible-module
+config/Dockerfiles/pip_install.sh
+config/Dockerfiles/duffy-ansible-module
+
+.rundb
+
+# Credential files for testing drivers
+keys/
diff --git a/.travis.yml b/.travis.yml
@@ -16,4 +16,5 @@ install:
 
 script:
   - flake8 --exclude=\.eggs,tests,docs --ignore=E124,E303 --max-line-length 80 .
-  - nosetests -s linchpin/tests/{cli,api}/*
+  - $(which python) setup.py test
+#  - $(which python) $(which nosetests) -s linchpin/tests/*
diff --git a/Dockerfiles/Makefile b/Dockerfiles/Makefile
diff --git a/Dockerfiles/centos6/Dockerfile b/Dockerfiles/centos6/Dockerfile
diff --git a/Dockerfiles/centos6/start_libvirtd.sh b/Dockerfiles/centos6/start_libvirtd.sh
diff --git a/Dockerfiles/fedora25/Dockerfile b/Dockerfiles/fedora25/Dockerfile
diff --git a/Dockerfiles/gen_pip_install.sh b/Dockerfiles/gen_pip_install.sh
diff --git a/Dockerfiles/linchpin-test.sh b/Dockerfiles/linchpin-test.sh
diff --git a/Dockerfiles/run_tests.sh b/Dockerfiles/run_tests.sh
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,7 +2,7 @@ include requirements.txt
 include README.rst
 include LICENSE
 
-include linchpin/linchpin.conf
+include linchpin/linchpin.constants
 
 recursive-include docs *
 recursive-include linchpin/examples *

diff --git a/README.rst b/README.rst
@@ -28,21 +28,6 @@ QuickStart
 
 The `Getting Started Guide <http://linchpin.readthedocs.io/en/develop/getting_started.html>`_ is a quick guide for LinchPin from the Command-Line.
 
-General Configuration
-+++++++++++++++++++++
-
-`General Configuration documentation <http://linchpin.readthedocs.io/en/latest/config_general.html>`_
-
-Example Topologies
-+++++++++++++++++++++
-
-`Example Topologies <http://linchpin.readthedocs.io/en/latest/topologies.html>`_
-
-Example Inventory Layout (openshift 3 node cluster)
-+++++++++++++++++++++++++++++++++++++++++++++++++++
-
-`Example Layouts <http://linchpin.readthedocs.io/en/latest/config_layout.html>`_
-
 Using LinchPin
 +++++++++++++++