deploy: 315722c

BeyondTheClouds · Apr 3, 2024 · 415c0ed · 415c0ed
1 parent b8b57de
commit 415c0ed
Show file tree

Hide file tree

Showing 31 changed files with 93 additions and 66 deletions.
diff --git a/.buildinfo b/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 5d99d60115a33cc8590f1ee69afa853a
+config: 930a00eb1515f687c438593a20e7fb3d
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/_sources/customization/index.rst.txt b/_sources/customization/index.rst.txt
@@ -14,7 +14,7 @@ values:
 
   .. code-block:: yaml
 
-     kolla-ansible: kolla-ansible~=10.0
+     kolla-ansible: kolla-ansible~=12.0
 
 * a git repository to the Ussuri specific version of OpenStack
 
@@ -107,6 +107,20 @@ Further information can be found : `see here
 <http://docs.ansible.com/ansible/intro_configuration.html>`_.
 
 
+Docker version customization
+----------------------------
+
+Kolla-ansible tightly integrates with the Docker API, and major versions
+of Docker have been known to cause Kolla-ansible to fail.
+
+Enos selects and installs an appropriate version of Docker on target nodes,
+but if you know what you are doing, you can force a specific version:
+
+.. code-block:: yaml
+
+    docker_version: 24.0
+
+
 Docker registry mirror configuration
 ------------------------------------
 

diff --git a/_sources/releasenotes.rst.txt b/_sources/releasenotes.rst.txt
@@ -5,11 +5,11 @@ Release notes
 
 .. _v8.0.0:
 
-8.0.0 (unreleased)
+8.0.0 (2024-04-03)
 ------------------
 
 - **Breaking change:** the format of ``enos info`` has changed
-- Fix Docker installation
+- Install a fixed version of Docker on nodes
 - Add support for kolla-ansible 12 (Openstack Wallaby), which is now the default
 - Add support for Debian 11 base image
 - Add support for Python 3.10 and 3.11

diff --git a/_static/css/theme.css b/_static/css/theme.css
diff --git a/_static/documentation_options.js b/_static/documentation_options.js
@@ -1,6 +1,6 @@
 var DOCUMENTATION_OPTIONS = {
     URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: '8.0.0a5',
+    VERSION: '8.0.0',
     LANGUAGE: 'None',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',

diff --git a/_static/pygments.css b/_static/pygments.css
@@ -17,6 +17,7 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left:
 .highlight .cs { color: #408090; background-color: #fff0f0 } /* Comment.Special */
 .highlight .gd { color: #A00000 } /* Generic.Deleted */
 .highlight .ge { font-style: italic } /* Generic.Emph */
+.highlight .ges { font-weight: bold; font-style: italic } /* Generic.EmphStrong */
 .highlight .gr { color: #FF0000 } /* Generic.Error */
 .highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
 .highlight .gi { color: #00A000 } /* Generic.Inserted */

diff --git a/analysis/index.html b/analysis/index.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Analysis &mdash; Enos 8.0.0a5 documentation</title>
+  <title>Analysis &mdash; Enos 8.0.0 documentation</title>
       <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>
@@ -34,7 +34,7 @@
             Enos
           </a>
               <div class="version">
-                8.0.0a5
+                8.0.0
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">

diff --git a/benchmarks/index.html b/benchmarks/index.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Benchmarks &mdash; Enos 8.0.0a5 documentation</title>
+  <title>Benchmarks &mdash; Enos 8.0.0 documentation</title>
       <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>
@@ -34,7 +34,7 @@
             Enos
           </a>
               <div class="version">
-                8.0.0a5
+                8.0.0
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">

diff --git a/cli/index.html b/cli/index.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Enos command line &mdash; Enos 8.0.0a5 documentation</title>
+  <title>Enos command line &mdash; Enos 8.0.0 documentation</title>
       <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>
@@ -34,7 +34,7 @@
             Enos
           </a>
               <div class="version">
-                8.0.0a5
+                8.0.0
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">

diff --git a/contribute/index.html b/contribute/index.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Contribute &mdash; Enos 8.0.0a5 documentation</title>
+  <title>Contribute &mdash; Enos 8.0.0 documentation</title>
       <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>
@@ -34,7 +34,7 @@
             Enos
           </a>
               <div class="version">
-                8.0.0a5
+                8.0.0
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">

diff --git a/contribute/new-provider.html b/contribute/new-provider.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Write a new provider &mdash; Enos 8.0.0a5 documentation</title>
+  <title>Write a new provider &mdash; Enos 8.0.0 documentation</title>
       <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>
@@ -34,7 +34,7 @@
             Enos
           </a>
               <div class="version">
-                8.0.0a5
+                8.0.0
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
@@ -107,9 +107,9 @@
 <a class="reference internal" href="../provider/vagrant.html#vagrant-provider"><span class="std std-ref">Vagrant</span></a>, <a class="reference internal" href="../provider/grid5000.html#grid5000"><span class="std std-ref">Grid’5000</span></a> and <a class="reference internal" href="../provider/openstack.html#openstack"><span class="std std-ref">Openstack</span></a> itself. If
 you want to support another testbed, then implementing a new provider
 is easy as 500 lines of Python code.</p>
-<p>The new provider should follow the <a class="reference external" href="https://github.com/BeyondTheClouds/enos/blob/804a11a/enos/provider/provider.py">provider.py</a> interface which consists in three
+<p>The new provider should follow the <a class="reference external" href="https://github.com/BeyondTheClouds/enos/blob/315722c/enos/provider/provider.py">provider.py</a> interface which consists in three
 methods: <code class="docutils literal notranslate"><span class="pre">init</span></code>, <code class="docutils literal notranslate"><span class="pre">destroy</span></code> and <code class="docutils literal notranslate"><span class="pre">default_config</span></code>. Another good
-starting point is the simple <a class="reference external" href="https://github.com/BeyondTheClouds/enos/blob/804a11a/enos/provider/static.py">static implementation</a>.</p>
+starting point is the simple <a class="reference external" href="https://github.com/BeyondTheClouds/enos/blob/315722c/enos/provider/static.py">static implementation</a>.</p>
 <section id="init-method">
 <h2>Init Method<a class="headerlink" href="#init-method" title="Permalink to this headline">¶</a></h2>
 <p>The <code class="docutils literal notranslate"><span class="pre">init</span></code> method provides resources and provisions the environment.
@@ -123,7 +123,7 @@ <h2>Init Method<a class="headerlink" href="#init-method" title="Permalink to thi
 </pre></div>
 </div>
 <p>At the end of the <code class="docutils literal notranslate"><span class="pre">init</span></code>, the provider should return a list of
-<a class="reference external" href="https://github.com/BeyondTheClouds/enos/blob/804a11a/enos/provider/host.py">host.py</a> that Enos can SSH on,
+<a class="reference external" href="https://github.com/BeyondTheClouds/enos/blob/315722c/enos/provider/host.py">host.py</a> that Enos can SSH on,
 together with a pool of available IP for OpenStack Network.</p>
 </section>
 <section id="destroy-method">

diff --git a/customization/index.html b/customization/index.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Customizations &mdash; Enos 8.0.0a5 documentation</title>
+  <title>Customizations &mdash; Enos 8.0.0 documentation</title>
       <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>
@@ -34,7 +34,7 @@
             Enos
           </a>
               <div class="version">
-                8.0.0a5
+                8.0.0
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
@@ -59,6 +59,7 @@
 </li>
 <li class="toctree-l2"><a class="reference internal" href="#changing-the-topology">Changing the topology</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#ansible-configuration">Ansible configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#docker-version-customization">Docker version customization</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#docker-registry-mirror-configuration">Docker registry mirror configuration</a><ul>
 <li class="toctree-l3"><a class="reference internal" href="#no-registry-mirror">No Registry mirror</a></li>
 <li class="toctree-l3"><a class="reference internal" href="#internal-registry-mirror">Internal Registry mirror</a></li>
@@ -108,7 +109,7 @@ <h2>Changing Kolla version<a class="headerlink" href="#changing-kolla-version" t
 values:
 * a PyPi package</p>
 <blockquote>
-<div><div class="highlight-yaml notranslate"><div class="highlight"><pre><span></span><span class="nt">kolla-ansible</span><span class="p">:</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">kolla-ansible~=10.0</span>
+<div><div class="highlight-yaml notranslate"><div class="highlight"><pre><span></span><span class="nt">kolla-ansible</span><span class="p">:</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">kolla-ansible~=12.0</span>
 </pre></div>
 </div>
 </div></blockquote>
@@ -187,6 +188,16 @@ <h2>Ansible configuration<a class="headerlink" href="#ansible-configuration" tit
 configuration file, the <code class="docutils literal notranslate"><span class="pre">ANSIBLE_CONFIG</span></code> environment variable can be used.
 Further information can be found : <a class="reference external" href="http://docs.ansible.com/ansible/intro_configuration.html">see here</a>.</p>
 </section>
+<section id="docker-version-customization">
+<h2>Docker version customization<a class="headerlink" href="#docker-version-customization" title="Permalink to this headline">¶</a></h2>
+<p>Kolla-ansible tightly integrates with the Docker API, and major versions
+of Docker have been known to cause Kolla-ansible to fail.</p>
+<p>Enos selects and installs an appropriate version of Docker on target nodes,
+but if you know what you are doing, you can force a specific version:</p>
+<div class="highlight-yaml notranslate"><div class="highlight"><pre><span></span><span class="nt">docker_version</span><span class="p">:</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">24.0</span>
+</pre></div>
+</div>
+</section>
 <section id="docker-registry-mirror-configuration">
 <h2>Docker registry mirror configuration<a class="headerlink" href="#docker-registry-mirror-configuration" title="Permalink to this headline">¶</a></h2>
 <p>EnOS can deploy a docker registry mirror in different ways. This is controlled

diff --git a/genindex.html b/genindex.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Index &mdash; Enos 8.0.0a5 documentation</title>
+  <title>Index &mdash; Enos 8.0.0 documentation</title>
       <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>
@@ -31,7 +31,7 @@
             Enos
           </a>
               <div class="version">
-                8.0.0a5
+                8.0.0
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">

diff --git a/index.html b/index.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Welcome to Enos’s documentation! &mdash; Enos 8.0.0a5 documentation</title>
+  <title>Welcome to Enos’s documentation! &mdash; Enos 8.0.0 documentation</title>
       <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>
@@ -33,7 +33,7 @@
             Enos
           </a>
               <div class="version">
-                8.0.0a5
+                8.0.0
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">
@@ -123,7 +123,7 @@ <h2>Enos workflow<a class="headerlink" href="#enos-workflow" title="Permalink to
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="releasenotes.html">Release notes</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="releasenotes.html#unreleased">8.0.0 (unreleased)</a></li>
+<li class="toctree-l2"><a class="reference internal" href="releasenotes.html#v8-0-0">8.0.0 (2024-04-03)</a></li>
 <li class="toctree-l2"><a class="reference internal" href="releasenotes.html#v7-1-1">7.1.1 (2022-03-30)</a></li>
 <li class="toctree-l2"><a class="reference internal" href="releasenotes.html#v7-1-0">7.1.0 (2021-06-02)</a></li>
 <li class="toctree-l2"><a class="reference internal" href="releasenotes.html#older-releases">Older releases</a></li>
@@ -151,6 +151,7 @@ <h2>Enos workflow<a class="headerlink" href="#enos-workflow" title="Permalink to
 <li class="toctree-l2"><a class="reference internal" href="customization/index.html#customize-kolla-variables">Customize Kolla variables</a></li>
 <li class="toctree-l2"><a class="reference internal" href="customization/index.html#changing-the-topology">Changing the topology</a></li>
 <li class="toctree-l2"><a class="reference internal" href="customization/index.html#ansible-configuration">Ansible configuration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="customization/index.html#docker-version-customization">Docker version customization</a></li>
 <li class="toctree-l2"><a class="reference internal" href="customization/index.html#docker-registry-mirror-configuration">Docker registry mirror configuration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="customization/index.html#single-interface-deployment">Single interface deployment</a></li>
 </ul>

diff --git a/installation.html b/installation.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Getting Started &mdash; Enos 8.0.0a5 documentation</title>
+  <title>Getting Started &mdash; Enos 8.0.0 documentation</title>
       <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>
@@ -34,7 +34,7 @@
             Enos
           </a>
               <div class="version">
-                8.0.0a5
+                8.0.0
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">
@@ -170,7 +170,7 @@ <h2>Deployment<a class="headerlink" href="#deployment" title="Permalink to this
 <p class="admonition-title">Note</p>
 <p>If you don’t provide an <code class="docutils literal notranslate"><span class="pre">inventory</span></code> in your current working
 directory, then Enos uses a default one. You can view it on
-GitHub at <a class="reference external" href="https://github.com/BeyondTheClouds/enos/blob/804a11a/enos/resources/inventory.sample">enos/resources/inventory.sample</a>. Note
+GitHub at <a class="reference external" href="https://github.com/BeyondTheClouds/enos/blob/315722c/enos/resources/inventory.sample">enos/resources/inventory.sample</a>. Note
 that the produced file is available at <code class="docutils literal notranslate"><span class="pre">cwd/current/multinode</span></code>
 (with <code class="docutils literal notranslate"><span class="pre">cwd</span></code> referencing to your current working directory).</p>
 </div>

diff --git a/jenkins/index.html b/jenkins/index.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Jenkins &mdash; Enos 8.0.0a5 documentation</title>
+  <title>Jenkins &mdash; Enos 8.0.0 documentation</title>
       <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>
@@ -34,7 +34,7 @@
             Enos
           </a>
               <div class="version">
-                8.0.0a5
+                8.0.0
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">

diff --git a/network-emulation/index.html b/network-emulation/index.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Network Emulation &mdash; Enos 8.0.0a5 documentation</title>
+  <title>Network Emulation &mdash; Enos 8.0.0 documentation</title>
       <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>
@@ -34,7 +34,7 @@
             Enos
           </a>
               <div class="version">
-                8.0.0a5
+                8.0.0
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">

diff --git a/objects.inv b/objects.inv
diff --git a/provider/custom.html b/provider/custom.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Custom Provider &mdash; Enos 8.0.0a5 documentation</title>
+  <title>Custom Provider &mdash; Enos 8.0.0 documentation</title>
       <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
   <!--[if lt IE 9]>
@@ -34,7 +34,7 @@
             Enos
           </a>
               <div class="version">
-                8.0.0a5
+                8.0.0
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">