Repository: libcloud Updated Branches: refs/heads/trunk ddfddf5fe -> 241b7b473
'Fixing the build' by removing graphviz dependencies from the docs. Travis doesn't support it, even though it's a standard extension Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/241b7b47 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/241b7b47 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/241b7b47 Branch: refs/heads/trunk Commit: 241b7b47355430f8a05f9fe58a349a80952cd045 Parents: ddfddf5 Author: anthony-shaw <[email protected]> Authored: Wed Jan 27 11:22:22 2016 +1100 Committer: anthony-shaw <[email protected]> Committed: Wed Jan 27 11:22:22 2016 +1100 ---------------------------------------------------------------------- docs/conf.py | 2 +- docs/container/index.rst | 58 ------------------------------------------- 2 files changed, 1 insertion(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/241b7b47/docs/conf.py ---------------------------------------------------------------------- diff --git a/docs/conf.py b/docs/conf.py index 0d9acf0..c79010a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -44,7 +44,7 @@ sys.path.insert(0, os.path.abspath('../')) # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', - 'sphinx.ext.viewcode', 'sphinx.ext.graphviz'] + 'sphinx.ext.viewcode'] # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] http://git-wip-us.apache.org/repos/asf/libcloud/blob/241b7b47/docs/container/index.rst ---------------------------------------------------------------------- diff --git a/docs/container/index.rst b/docs/container/index.rst index 27b6aa5..7a9fde8 100644 --- a/docs/container/index.rst +++ b/docs/container/index.rst @@ -12,37 +12,6 @@ Container Container API allows users to install and deploy containers onto container based virtualization platforms. This is designed to target both on-premise installations of software like Docker as well as interfacing with Cloud Service Providers that offer Container-as-a-Service APIs. - -.. graphviz:: - - digraph G { - graph [ fontname = "Roboto Slab", - fontsize = 18, - label = "Using the driver to deploy containers with or without clusters" ]; - - subgraph noncluster { - style=filled; - color=lightgrey; - node [style=filled,color=white]; - list_images -> install_image -> deploy_container; - label = "Non-Cluster Container Driver"; - } - - subgraph cluster { - node [style=filled]; - list_locations -> list_clusters -> create_cluster; - label = "Cluster supported Container Driver"; - color=blue - } - __init__ -> list_images; - __init__ -> list_locations; - create_cluster -> list_images; - deploy_container -> end; - - __init__ [shape=square]; - end [shape=squae]; - } - For a working example of the container driver with cluster support, see the example for Amazon's Elastic Container Service: .. literalinclude:: /examples/container/ecs/deploy_container.py @@ -90,33 +59,6 @@ Bootstrapping Docker with Compute Drivers The compute and container drivers can be combined using the :doc:`deployment </compute/deployment>` feature of the compute driver to bootstrap an installation of a container virtualization provider like Docker. Then using the Container driver, you can connect to that API and install images and deploy containers. -.. graphviz:: - - digraph G2 { - - subgraph compute { - style=filled; - color=lightgrey; - node [style=filled,color=white]; - create_node -> deploy_node; - label = "Compute API"; - } - - subgraph container { - node [style=filled]; - __init__ -> install_image -> deploy_container; - label = "Container API"; - color=blue - } - start -> create_node; - deploy_node -> __init__; - deploy_container -> end; - - start [shape=Mdiamond]; - end [shape=Msquare]; - } - - Supported Providers -------------------
