diff options
| -rw-r--r-- | .gitreview | 1 | ||||
| -rw-r--r-- | puppet/services/rabbitmq.yaml | 4 | ||||
| -rw-r--r-- | releasenotes/source/conf.py | 4 | ||||
| -rw-r--r-- | tox.ini | 2 |
4 files changed, 6 insertions, 5 deletions
@@ -2,3 +2,4 @@ host=review.openstack.org port=29418 project=openstack/tripleo-heat-templates.git +defaultbranch=stable/pike diff --git a/puppet/services/rabbitmq.yaml b/puppet/services/rabbitmq.yaml index 5867721a..ba3a0984 100644 --- a/puppet/services/rabbitmq.yaml +++ b/puppet/services/rabbitmq.yaml @@ -88,7 +88,7 @@ outputs: - 25672 rabbitmq::delete_guest_user: false rabbitmq::wipe_db_on_cookie_change: true - rabbitmq::port: '5672' + rabbitmq::port: 5672 rabbitmq::package_provider: yum rabbitmq::package_source: undef rabbitmq::repos_ensure: false @@ -122,7 +122,7 @@ outputs: rabbitmq::interface: {get_param: [ServiceNetMap, RabbitmqNetwork]} rabbitmq::nr_ha_queues: {get_param: RabbitHAQueues} rabbitmq::ssl: {get_param: EnableInternalTLS} - rabbitmq::ssl_port: '5672' + rabbitmq::ssl_port: 5672 rabbitmq::ssl_depth: 1 rabbitmq::ssl_only: {get_param: EnableInternalTLS} rabbitmq::ssl_interface: {get_param: [ServiceNetMap, RabbitmqNetwork]} diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 9d46018a..1e0bf00a 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -52,9 +52,9 @@ copyright = u'2017, TripleO Developers' # built documents. # # The full version, including alpha/beta/rc tags. -release = '7.0.0.0rc1' +release = '' # The short X.Y version. -version = '7.0.0' +version = '' # The full version, including alpha/beta/rc tags. @@ -5,7 +5,7 @@ envlist = py35,py27,pep8 [testenv] usedevelop = True -install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} +install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike} {opts} {packages} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = python setup.py testr --slowest --testr-args='{posargs}' |