diff options
12 files changed, 29 insertions, 25 deletions
diff --git a/docs/release/installation/img/README.rst b/docs/release/installation/img/README.rst index bc8d9bede..4cb1f77d2 100644 --- a/docs/release/installation/img/README.rst +++ b/docs/release/installation/img/README.rst @@ -4,9 +4,9 @@ Image Editor ============ -All files in this directory have been created using `draw.io <http://draw.io>`_. +All files in this directory have been created using `draw.io <https://draw.io>`_. Image Sources ============= Image sources are embedded in each `png` file. -To edit an image, import the `png` file using `draw.io <http://draw.io>`_. +To edit an image, import the `png` file using `draw.io <https://draw.io>`_. diff --git a/docs/release/installation/installation.instruction.rst b/docs/release/installation/installation.instruction.rst index b7b4f6d23..9aaebdd7c 100644 --- a/docs/release/installation/installation.instruction.rst +++ b/docs/release/installation/installation.instruction.rst @@ -611,18 +611,18 @@ References OPNFV -1) `OPNFV Home Page <http://www.opnfv.org>`_ -2) `OPNFV documentation <http://docs.opnfv.org>`_ +1) `OPNFV Home Page <https://www.opnfv.org>`_ +2) `OPNFV documentation <https://docs.opnfv.org>`_ 3) `Software downloads <https://www.opnfv.org/software/download>`_ OpenStack -4) `OpenStack Queens Release Artifacts <http://www.openstack.org/software/queens>`_ -5) `OpenStack Documentation <http://docs.openstack.org>`_ +4) `OpenStack Queens Release Artifacts <https://www.openstack.org/software/queens>`_ +5) `OpenStack Documentation <https://docs.openstack.org>`_ OpenDaylight -6) `OpenDaylight Artifacts <http://www.opendaylight.org/software/downloads>`_ +6) `OpenDaylight Artifacts <https://www.opendaylight.org/software/downloads>`_ Fuel @@ -631,8 +631,8 @@ Fuel Salt 8) `Saltstack Documentation <https://docs.saltstack.com/en/latest/topics>`_ -9) `Saltstack Formulas <http://salt-formulas.readthedocs.io/en/latest/develop/overview-reclass.html>`_ +9) `Saltstack Formulas <https://salt-formulas.readthedocs.io/en/latest/develop/overview-reclass.html>`_ Reclass -10) `Reclass model <http://reclass.pantsfullofunix.net>`_ +10) `Reclass model <https://reclass.pantsfullofunix.net>`_ diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst index 9a4c8d52d..6fd007e76 100644 --- a/docs/release/release-notes/release-notes.rst +++ b/docs/release/release-notes/release-notes.rst @@ -32,7 +32,7 @@ Summary For Fraser, the typical use of Fuel as an OpenStack installer is supplemented with OPNFV unique components such as: -- `OpenDaylight <http://www.opendaylight.org/software>`_ +- `OpenDaylight <https://www.opendaylight.org/software>`_ - `Open vSwitch for NFV <https://wiki.opnfv.org/ovsnfv>`_ As well as OPNFV-unique configurations of the Hardware and Software stack. @@ -190,21 +190,21 @@ For more information on the OPNFV Fraser 6.2 release, please see: OPNFV ===== -1) `OPNFV Home Page <http://www.opnfv.org>`_ -2) `OPNFV Documentation <http://docs.opnfv.org>`_ +1) `OPNFV Home Page <https://www.opnfv.org>`_ +2) `OPNFV Documentation <https://docs.opnfv.org>`_ 3) `OPNFV Software Downloads <https://www.opnfv.org/software/download>`_ OpenStack ========= -4) `OpenStack Pike Release Artifacts <http://www.openstack.org/software/pike>`_ +4) `OpenStack Pike Release Artifacts <https://www.openstack.org/software/pike>`_ -5) `OpenStack Documentation <http://docs.openstack.org>`_ +5) `OpenStack Documentation <https://docs.openstack.org>`_ OpenDaylight ============ -6) `OpenDaylight Artifacts <http://www.opendaylight.org/software/downloads>`_ +6) `OpenDaylight Artifacts <https://www.opendaylight.org/software/downloads>`_ Fuel ==== diff --git a/docs/release/scenarios/os-nosdn-ovs-ha/os-nosdn-ovs-ha.rst b/docs/release/scenarios/os-nosdn-ovs-ha/os-nosdn-ovs-ha.rst index 73b691b92..6841c620c 100644 --- a/docs/release/scenarios/os-nosdn-ovs-ha/os-nosdn-ovs-ha.rst +++ b/docs/release/scenarios/os-nosdn-ovs-ha/os-nosdn-ovs-ha.rst @@ -39,4 +39,4 @@ References ========== For more information on the OPNFV Gambia release, please visit -http://www.opnfv.org/software +https://www.opnfv.org/software diff --git a/docs/release/scenarios/os-nosdn-ovs-noha/os-nosdn-ovs-noha.rst b/docs/release/scenarios/os-nosdn-ovs-noha/os-nosdn-ovs-noha.rst index 99a980662..edda710c1 100644 --- a/docs/release/scenarios/os-nosdn-ovs-noha/os-nosdn-ovs-noha.rst +++ b/docs/release/scenarios/os-nosdn-ovs-noha/os-nosdn-ovs-noha.rst @@ -37,4 +37,4 @@ References ========== For more information on the OPNFV Gambia release, please visit -http://www.opnfv.org/software +https://www.opnfv.org/software diff --git a/docs/release/scenarios/os-nosdn-vpp-ha/os-nosdn-vpp-ha.rst b/docs/release/scenarios/os-nosdn-vpp-ha/os-nosdn-vpp-ha.rst index cdad3b44e..eb49e3d34 100644 --- a/docs/release/scenarios/os-nosdn-vpp-ha/os-nosdn-vpp-ha.rst +++ b/docs/release/scenarios/os-nosdn-vpp-ha/os-nosdn-vpp-ha.rst @@ -39,4 +39,4 @@ References ========== For more information on the OPNFV Gambia release, please visit -http://www.opnfv.org/software +https://www.opnfv.org/software diff --git a/docs/release/scenarios/os-nosdn-vpp-noha/os-nosdn-vpp-noha.rst b/docs/release/scenarios/os-nosdn-vpp-noha/os-nosdn-vpp-noha.rst index 9154228e9..51a0000b4 100644 --- a/docs/release/scenarios/os-nosdn-vpp-noha/os-nosdn-vpp-noha.rst +++ b/docs/release/scenarios/os-nosdn-vpp-noha/os-nosdn-vpp-noha.rst @@ -37,4 +37,4 @@ References ========== For more information on the OPNFV Gambia release, please visit -http://www.opnfv.org/software +https://www.opnfv.org/software diff --git a/docs/release/scenarios/os-ovn-nofeature-ha/os-ovn-nofeature-ha.rst b/docs/release/scenarios/os-ovn-nofeature-ha/os-ovn-nofeature-ha.rst index 4e2e4169f..cb469cb3c 100644 --- a/docs/release/scenarios/os-ovn-nofeature-ha/os-ovn-nofeature-ha.rst +++ b/docs/release/scenarios/os-ovn-nofeature-ha/os-ovn-nofeature-ha.rst @@ -38,4 +38,4 @@ References ========== For more information on the OPNFV Gambia release, please visit -http://www.opnfv.org/software +https://www.opnfv.org/software diff --git a/docs/release/scenarios/os-ovn-nofeature-noha/os-ovn-nofeature-noha.rst b/docs/release/scenarios/os-ovn-nofeature-noha/os-ovn-nofeature-noha.rst index 5e6a925ce..0005f7549 100644 --- a/docs/release/scenarios/os-ovn-nofeature-noha/os-ovn-nofeature-noha.rst +++ b/docs/release/scenarios/os-ovn-nofeature-noha/os-ovn-nofeature-noha.rst @@ -37,4 +37,4 @@ References ========== For more information on the OPNFV Gambia release, please visit -http://www.opnfv.org/software +https://www.opnfv.org/software diff --git a/docs/release/userguide/userguide.rst b/docs/release/userguide/userguide.rst index 61c30bb7e..76639abcf 100644 --- a/docs/release/userguide/userguide.rst +++ b/docs/release/userguide/userguide.rst @@ -405,7 +405,7 @@ References ========== 1) :ref:`fuel-release-installation-label` -2) `Saltstack Documentation <https://docs.saltstack.com/en/latest/topics>`_ -3) `Saltstack Formulas <http://salt-formulas.readthedocs.io/en/latest/>`_ +2) `Saltstack Documentation <https://docs.saltstack.com/en/latest/topics/>`_ +3) `Saltstack Formulas <https://salt-formulas.readthedocs.io/en/latest/>`_ 4) `Virtio performance <https://mpolednik.github.io/2017/01/23/virtio-blk-vs-virtio-scsi/>`_ 5) `Virtio SCSI <https://www.ovirt.org/develop/release-management/features/storage/virtio-scsi/>`_ diff --git a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch b/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch index d8f85691e..a802bdcc8 100644 --- a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch +++ b/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch @@ -25,7 +25,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/DockerMake.yml b/DockerMake.yml -index 2c75586..8ac8f81 100644 +index 2c75586..d7d4c49 100644 --- a/DockerMake.yml +++ b/DockerMake.yml @@ -102,12 +102,46 @@ salt-formulas: @@ -33,7 +33,7 @@ index 2c75586..8ac8f81 100644 ARG RECLASS_BASE="/srv/salt/reclass" ENV RECLASS_BASE $RECLASS_BASE - RUN echo "Layer python/salt module prerequisites, formulas" \ -+ RUN echo "Layer python/salt module prerequisites, formulas (19 Sep 2018)" \ ++ RUN echo "Layer python/salt module prerequisites, formulas (25 Sep 2018)" \ && mkdir -p /srv/salt \ && curl -sSqL https://raw.githubusercontent.com/salt-formulas/salt-formulas-scripts/master/formula-fetch.sh -o /srv/salt/formula-fetch.sh \ && bash -c 'source /srv/salt/formula-fetch.sh && setupPyEnv && fetchAll' \ diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/init.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/init.yml.j2 index 894d3bcc6..54f268226 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/init.yml.j2 +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/init.yml.j2 @@ -27,3 +27,7 @@ parameters: {{key}}: {{ network | ipnet_hostaddr(i) }} {%- endfor %} {%- endfor %} + salt: + minion: + tcp_keepalive: True + tcp_keepalive_idle: 60 |