diff options
| -rw-r--r-- | .gitreview | 1 | ||||
| -rwxr-xr-x | docker/docker-puppet.py | 1 | ||||
| -rw-r--r-- | docker/services/neutron-ovs-agent.yaml | 31 | ||||
| -rw-r--r-- | environments/docker-network.yaml | 4 | ||||
| -rw-r--r-- | puppet/services/rabbitmq.yaml | 4 | ||||
| -rw-r--r-- | releasenotes/source/conf.py | 4 | ||||
| -rw-r--r-- | tox.ini | 2 |
7 files changed, 40 insertions, 7 deletions
@@ -2,3 +2,4 @@ host=review.openstack.org port=29418 project=openstack/tripleo-heat-templates.git +defaultbranch=stable/pike diff --git a/docker/docker-puppet.py b/docker/docker-puppet.py index fadd12d3..4659cf53 100755 --- a/docker/docker-puppet.py +++ b/docker/docker-puppet.py @@ -248,6 +248,7 @@ def mp_puppet_config((config_volume, puppet_tags, manifest, config_image, volume dcmd = ['/usr/bin/docker', 'run', '--user', 'root', '--name', 'docker-puppet-%s' % config_volume, + '--health-cmd', '/bin/true', '--env', 'PUPPET_TAGS=%s' % puppet_tags, '--env', 'NAME=%s' % config_volume, '--env', 'HOSTNAME=%s' % short_hostname(), diff --git a/docker/services/neutron-ovs-agent.yaml b/docker/services/neutron-ovs-agent.yaml index 4cce23d9..81bb1c20 100644 --- a/docker/services/neutron-ovs-agent.yaml +++ b/docker/services/neutron-ovs-agent.yaml @@ -78,6 +78,37 @@ outputs: owner: neutron:neutron recurse: true docker_config: + step_3: + neutron_ovs_bridge: + detach: false + image: {get_param: DockerNeutronConfigImage} + net: host + pid: host + user: root + privileged: true + command: + - puppet + - apply + - --modulepath + - /etc/puppet/modules:/usr/share/openstack-puppet/modules + - --tags + - file,file_line,concat,augeas,neutron::plugins::ovs::bridge + - -v + - -e + - include neutron::agents::ml2::ovs + volumes: + list_concat: + - {get_attr: [ContainersCommon, volumes]} + - + - /var/lib/kolla/config_files/neutron_ovs_agent.json:/var/lib/kolla/config_files/config.json:ro + - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro + - /lib/modules:/lib/modules:ro + - /run:/run + - /etc/puppet:/etc/puppet:ro + - /usr/share/openstack-puppet/modules/:/usr/share/openstack-puppet/modules/:ro + - /var/run/openvswitch/db.sock:/var/run/openvswitch/db.sock + environment: + - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS step_4: neutron_ovs_agent: image: {get_param: DockerOpenvswitchImage} diff --git a/environments/docker-network.yaml b/environments/docker-network.yaml index f10ec389..bd73d4b3 100644 --- a/environments/docker-network.yaml +++ b/environments/docker-network.yaml @@ -1,2 +1,2 @@ -resource_registry: - OS::TripleO::Compute::Net::SoftwareConfig: ../net-config-bridge.yaml +# TODO(sbaker) Remove once CI and documentation no longer use this file +resource_registry: {} 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}' |