Merge "Replace git.openstack.org URLs with opendev.org URLs"
This commit is contained in:
commit
7b7c9baa2c
@ -15,7 +15,7 @@ Heat templates to deploy OpenStack using OpenStack.
|
|||||||
|
|
||||||
* Free software: Apache License (2.0)
|
* Free software: Apache License (2.0)
|
||||||
* Documentation: https://docs.openstack.org/tripleo-docs/latest/
|
* Documentation: https://docs.openstack.org/tripleo-docs/latest/
|
||||||
* Source: https://git.openstack.org/cgit/openstack/tripleo-heat-templates
|
* Source: https://opendev.org/openstack/tripleo-heat-templates
|
||||||
* Bugs: https://bugs.launchpad.net/tripleo
|
* Bugs: https://bugs.launchpad.net/tripleo
|
||||||
* Release notes: https://docs.openstack.org/releasenotes/tripleo-heat-templates/
|
* Release notes: https://docs.openstack.org/releasenotes/tripleo-heat-templates/
|
||||||
|
|
||||||
|
@ -19,12 +19,12 @@ resources:
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
cd /etc/yum.repos.d
|
cd /etc/yum.repos.d
|
||||||
echo 'nameserver 1.1.1.1' > /etc/resolv.conf
|
echo 'nameserver 1.1.1.1' > /etc/resolv.conf
|
||||||
curl https://git.openstack.org/cgit/openstack/tripleo-repos/plain/tripleo_repos/main.py | python - current-tripleo
|
curl https://opendev.org/openstack/tripleo-repos/raw/branch/master/tripleo_repos/main.py | python - current-tripleo
|
||||||
yum install -y python2-virtualbmc epel-release libvirt-client libvirt-daemon libvirt qemu-kvm-ev
|
yum install -y python2-virtualbmc epel-release libvirt-client libvirt-daemon libvirt qemu-kvm-ev
|
||||||
yum install -y qemu-system-x86 # <-- needs epel
|
yum install -y qemu-system-x86 # <-- needs epel
|
||||||
yum remove -y epel-release
|
yum remove -y epel-release
|
||||||
systemctl start libvirtd
|
systemctl start libvirtd
|
||||||
git clone https://git.openstack.org/openstack/ironic /tmp/ironic
|
git clone https://opendev.org/openstack/ironic /tmp/ironic
|
||||||
mkdir -p /var/log/bmlogs
|
mkdir -p /var/log/bmlogs
|
||||||
chmod 777 /var/log/bmlogs
|
chmod 777 /var/log/bmlogs
|
||||||
|
|
||||||
|
@ -84,7 +84,7 @@ outputs:
|
|||||||
- service_debug_unset
|
- service_debug_unset
|
||||||
- {get_param: Debug }
|
- {get_param: Debug }
|
||||||
- {get_param: SaharaDebug }
|
- {get_param: SaharaDebug }
|
||||||
# Remove admin_password when https://review.openstack.org/442619 is merged.
|
# Remove admin_password when https://review.opendev.org/#/c/442619/ is merged.
|
||||||
sahara::admin_password: {get_param: SaharaPassword}
|
sahara::admin_password: {get_param: SaharaPassword}
|
||||||
sahara::default_ntp_server: {get_param: NtpServer}
|
sahara::default_ntp_server: {get_param: NtpServer}
|
||||||
sahara::use_neutron: true
|
sahara::use_neutron: true
|
||||||
|
@ -3,7 +3,7 @@ resource_registry:
|
|||||||
OS::TripleO::Services::Docker: ../deployment/deprecated/docker/docker-baremetal-ansible.yaml
|
OS::TripleO::Services::Docker: ../deployment/deprecated/docker/docker-baremetal-ansible.yaml
|
||||||
# Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
|
# Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
|
||||||
# FIXME(bogdando): can not be switched yet due to puppet-base issues
|
# FIXME(bogdando): can not be switched yet due to puppet-base issues
|
||||||
# see https://review.openstack.org/#/c/563443
|
# see https://review.opendev.org/#/c/563443
|
||||||
OS::TripleO::Docker::NeutronMl2PluginBase: ../deployment/neutron/neutron-plugin-ml2.yaml
|
OS::TripleO::Docker::NeutronMl2PluginBase: ../deployment/neutron/neutron-plugin-ml2.yaml
|
||||||
|
|
||||||
OS::TripleO::Services::ContainersLogrotateCrond: ../deployment/logrotate/logrotate-crond-container-puppet.yaml
|
OS::TripleO::Services::ContainersLogrotateCrond: ../deployment/logrotate/logrotate-crond-container-puppet.yaml
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
resource_registry:
|
resource_registry:
|
||||||
# Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
|
# Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
|
||||||
# FIXME(bogdando): can not be switched yet due to puppet-base issues
|
# FIXME(bogdando): can not be switched yet due to puppet-base issues
|
||||||
# see https://review.openstack.org/#/c/563443
|
# see https://review.opendev.org/#/c/563443
|
||||||
OS::TripleO::Docker::NeutronMl2PluginBase: ../deployment/neutron/neutron-plugin-ml2.yaml
|
OS::TripleO::Docker::NeutronMl2PluginBase: ../deployment/neutron/neutron-plugin-ml2.yaml
|
||||||
|
|
||||||
OS::TripleO::Services::NeutronServer: ../deployment/neutron/neutron-api-container-puppet.yaml
|
OS::TripleO::Services::NeutronServer: ../deployment/neutron/neutron-api-container-puppet.yaml
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
resource_registry:
|
resource_registry:
|
||||||
# Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
|
# Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
|
||||||
# FIXME(bogdando): can not be switched yet due to puppet-base issues
|
# FIXME(bogdando): can not be switched yet due to puppet-base issues
|
||||||
# see https://review.openstack.org/#/c/563443
|
# see https://review.opendev.org/#/c/563443
|
||||||
OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
|
OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
|
||||||
|
|
||||||
OS::TripleO::Services::NeutronServer: ../../deployment/neutron/neutron-api-container-puppet.yaml
|
OS::TripleO::Services::NeutronServer: ../../deployment/neutron/neutron-api-container-puppet.yaml
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
resource_registry:
|
resource_registry:
|
||||||
# Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
|
# Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
|
||||||
# FIXME(bogdando): can not be switched yet due to puppet-base issues
|
# FIXME(bogdando): can not be switched yet due to puppet-base issues
|
||||||
# see https://review.openstack.org/#/c/563443
|
# see https://review.opendev.org/#/c/563443
|
||||||
OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
|
OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
|
||||||
|
|
||||||
OS::TripleO::Services::NeutronServer: ../../deployment/neutron/neutron-api-container-puppet.yaml
|
OS::TripleO::Services::NeutronServer: ../../deployment/neutron/neutron-api-container-puppet.yaml
|
||||||
|
@ -100,7 +100,7 @@ def create_nova_connection(options):
|
|||||||
# the [placement]/os_interface key.
|
# the [placement]/os_interface key.
|
||||||
if 'os_interface' in options and len(options["os_interface"]) == 1:
|
if 'os_interface' in options and len(options["os_interface"]) == 1:
|
||||||
nova_endpoint_type = options["os_interface"][0]
|
nova_endpoint_type = options["os_interface"][0]
|
||||||
# Via https://review.openstack.org/#/c/492247/ os_interface has been deprecatd in queens
|
# Via https://review.opendev.org/#/c/492247/ os_interface has been deprecatd in queens
|
||||||
# and we need to use 'valid_interfaces' which is a:
|
# and we need to use 'valid_interfaces' which is a:
|
||||||
# "List of interfaces, in order of preference, for endpoint URL. (list value)"
|
# "List of interfaces, in order of preference, for endpoint URL. (list value)"
|
||||||
# Since it is not explicitely set in nova.conf we still keep the check for os_interface
|
# Since it is not explicitely set in nova.conf we still keep the check for os_interface
|
||||||
|
@ -335,7 +335,7 @@ resource_registry:
|
|||||||
|
|
||||||
# Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
|
# Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
|
||||||
# FIXME(bogdando): can not be switched yet due to puppet-base issues
|
# FIXME(bogdando): can not be switched yet due to puppet-base issues
|
||||||
# see https://review.openstack.org/#/c/563443
|
# see https://review.opendev.org/#/c/563443
|
||||||
OS::TripleO::Docker::NeutronMl2PluginBase: deployment/neutron/neutron-plugin-ml2-ovn.yaml
|
OS::TripleO::Docker::NeutronMl2PluginBase: deployment/neutron/neutron-plugin-ml2-ovn.yaml
|
||||||
OS::TripleO::Services::Multipathd: OS::Heat::None
|
OS::TripleO::Services::Multipathd: OS::Heat::None
|
||||||
|
|
||||||
|
@ -122,6 +122,6 @@ fixes:
|
|||||||
- Fixes `bug 1662344
|
- Fixes `bug 1662344
|
||||||
<https://bugs.launchpad.net/tripleo/+bug/1662344>`__ by stopping
|
<https://bugs.launchpad.net/tripleo/+bug/1662344>`__ by stopping
|
||||||
to set bind_address on nova db uri.
|
to set bind_address on nova db uri.
|
||||||
This reverts the changes in https://review.openstack.org/414629 for nova as
|
This reverts the changes in https://review.opendev.org/#/c/414629/ for nova as
|
||||||
they are incompatible with cell_v2.
|
they are incompatible with cell_v2.
|
||||||
This is a temporary fix for HA while a long-term solution is developed.
|
This is a temporary fix for HA while a long-term solution is developed.
|
||||||
|
@ -8,5 +8,5 @@ fixes:
|
|||||||
|
|
||||||
Also, moves openDaylight karaf log file location to
|
Also, moves openDaylight karaf log file location to
|
||||||
/var/log/containers/opendaylight/karaf/logs/karaf.log.
|
/var/log/containers/opendaylight/karaf/logs/karaf.log.
|
||||||
Reference https://review.openstack.org/#/c/603907/ for
|
Reference https://review.opendev.org/#/c/603907/ for
|
||||||
more details.
|
more details.
|
||||||
|
@ -7,4 +7,4 @@ fixes:
|
|||||||
replacement mechanism used previously was replaced by a yaql expression
|
replacement mechanism used previously was replaced by a yaql expression
|
||||||
that will do exact matching only. If no matching key is in the
|
that will do exact matching only. If no matching key is in the
|
||||||
HostnameMap, the default hostname is returned.
|
HostnameMap, the default hostname is returned.
|
||||||
`bug 1781560 <https://review.openstack.org/#/c/582475/>`_.
|
`bug 1781560 <https://review.opendev.org/#/c/582475/>`_.
|
||||||
|
@ -3,5 +3,5 @@ features:
|
|||||||
- |
|
- |
|
||||||
Usage of eventlet of all the WSGI-run nova services get
|
Usage of eventlet of all the WSGI-run nova services get
|
||||||
deprecated, including nova-api and nova-metadata-api.
|
deprecated, including nova-api and nova-metadata-api.
|
||||||
See https://review.openstack.org/#/c/549510/ for more details.
|
See https://review.opendev.org/#/c/549510/ for more details.
|
||||||
With this change we move nova-metadata to run via httpd wsgi.
|
With this change we move nova-metadata to run via httpd wsgi.
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
---
|
---
|
||||||
fixes:
|
fixes:
|
||||||
- |
|
- |
|
||||||
With https://review.openstack.org/#/c/561784 we change the default
|
With https://review.opendev.org/#/c/561784 we change the default
|
||||||
migration port range to '61152-61215'.
|
migration port range to '61152-61215'.
|
||||||
nova::migration::qemu::configure_qemu needs to be set to true that
|
nova::migration::qemu::configure_qemu needs to be set to true that
|
||||||
the config gets applied via puppet-nova.
|
the config gets applied via puppet-nova.
|
||||||
|
@ -7,4 +7,4 @@ features:
|
|||||||
be a simpler and less obscure method of configuring things like
|
be a simpler and less obscure method of configuring things like
|
||||||
the per-node bind_address necessary for director's HA arrangement.
|
the per-node bind_address necessary for director's HA arrangement.
|
||||||
This patch addresses the templated DB urls as part 1.
|
This patch addresses the templated DB urls as part 1.
|
||||||
Nova support added here - https://review.openstack.org/578163
|
Nova support added here - https://review.opendev.org/#/c/578163/
|
||||||
|
@ -7,4 +7,4 @@ features:
|
|||||||
be a simpler and less obscure method of configuring things like
|
be a simpler and less obscure method of configuring things like
|
||||||
the per-node bind_address necessary for director's HA arrangement.
|
the per-node bind_address necessary for director's HA arrangement.
|
||||||
This patch addresses the templated transport urls as part 2.
|
This patch addresses the templated transport urls as part 2.
|
||||||
Nova support added here - https://review.openstack.org/578163
|
Nova support added here - https://review.opendev.org/578163
|
||||||
|
@ -4,7 +4,7 @@ fixes:
|
|||||||
With OOO we configure a separate DB for placement for the undercloud and
|
With OOO we configure a separate DB for placement for the undercloud and
|
||||||
overcloud since the beginning.
|
overcloud since the beginning.
|
||||||
But the placement_database config options were reverted with
|
But the placement_database config options were reverted with
|
||||||
https://review.openstack.org/#/c/442762/1 , which means so far even if
|
https://review.opendev.org/#/c/442762/1 , which means so far even if
|
||||||
the config option was set, it was not used. With rocky the options were
|
the config option was set, it was not used. With rocky the options were
|
||||||
introduced again which is not a problem on a fresh installed env, but on
|
introduced again which is not a problem on a fresh installed env, but on
|
||||||
upgrades from queens to rocky.
|
upgrades from queens to rocky.
|
||||||
|
@ -6,7 +6,7 @@ description-file =
|
|||||||
author = OpenStack
|
author = OpenStack
|
||||||
author_email = openstack-discuss@lists.openstack.org
|
author_email = openstack-discuss@lists.openstack.org
|
||||||
license = Apache License (2.0)
|
license = Apache License (2.0)
|
||||||
home-page = https://git.openstack.org/cgit/openstack/tripleo-heat-templates
|
home-page = https://opendev.org/openstack/tripleo-heat-templates
|
||||||
classifier =
|
classifier =
|
||||||
Environment :: OpenStack
|
Environment :: OpenStack
|
||||||
Development Status :: 3 - Alpha
|
Development Status :: 3 - Alpha
|
||||||
|
2
tox.ini
2
tox.ini
@ -7,7 +7,7 @@ envlist = pep8,py37,py36,py35,py27
|
|||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command = pip install {opts} {packages}
|
install_command = pip install {opts} {packages}
|
||||||
deps =
|
deps =
|
||||||
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
|
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
|
||||||
-r{toxinidir}/requirements.txt
|
-r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
commands = python setup.py testr --slowest --testr-args='{posargs}'
|
commands = python setup.py testr --slowest --testr-args='{posargs}'
|
||||||
|
Loading…
Reference in New Issue
Block a user