diff options
| -rw-r--r-- | .gitreview | 1 | ||||
| -rw-r--r-- | common/deploy-steps-tasks.yaml | 1 | ||||
| -rw-r--r-- | common/deploy-steps.j2 | 6 | ||||
| -rwxr-xr-x | docker/docker-puppet.py | 1 | ||||
| -rw-r--r-- | docker/services/ceph-ansible/ceph-base.yaml | 3 | ||||
| -rw-r--r-- | docker/services/neutron-ovs-agent.yaml | 31 | ||||
| -rw-r--r-- | environments/docker-network.yaml | 4 | ||||
| -rw-r--r-- | puppet/services/ceilometer-base.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/rabbitmq.yaml | 4 | ||||
| -rw-r--r-- | releasenotes/notes/update-manage-event-pipeline-0a21e9ca92cbff4f.yaml | 6 | ||||
| -rw-r--r-- | releasenotes/source/conf.py | 4 | ||||
| -rw-r--r-- | roles/Database.yaml | 1 | ||||
| -rw-r--r-- | roles/IronicConductor.yaml | 1 | ||||
| -rw-r--r-- | roles/Messaging.yaml | 1 | ||||
| -rw-r--r-- | roles/Networker.yaml | 1 | ||||
| -rw-r--r-- | roles/Telemetry.yaml | 1 | ||||
| -rw-r--r-- | tox.ini | 2 |
17 files changed, 61 insertions, 9 deletions
@@ -2,3 +2,4 @@ host=review.openstack.org port=29418 project=openstack/tripleo-heat-templates.git +defaultbranch=stable/pike diff --git a/common/deploy-steps-tasks.yaml b/common/deploy-steps-tasks.yaml index 998bbe0c..f0729425 100644 --- a/common/deploy-steps-tasks.yaml +++ b/common/deploy-steps-tasks.yaml @@ -28,6 +28,7 @@ environment: NET_HOST: 'true' DEBUG: '{{docker_puppet_debug|default(false)}}' + PROCESS_COUNT: '{{docker_puppet_process_count|default(3)}}' when: step == "1" changed_when: false check_mode: no diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2 index db2b21c1..32d1afcf 100644 --- a/common/deploy-steps.j2 +++ b/common/deploy-steps.j2 @@ -44,6 +44,10 @@ parameters: type: string default: '' description: Set to True to enable debug logging with docker-puppet.py + DockerPuppetProcessCount: + type: number + default: 3 + description: Number of concurrent processes to use when running docker-puppet to generate config files. ctlplane_service_ips: type: json @@ -74,6 +78,7 @@ resources: - name: update_identifier - name: bootstrap_server_id - name: docker_puppet_debug + - name: docker_puppet_process_count config: str_replace: template: | @@ -273,6 +278,7 @@ resources: update_identifier: {get_param: DeployIdentifier} bootstrap_server_id: {get_param: [servers, {{primary_role_name}}, '0']} docker_puppet_debug: {get_param: DockerPuppetDebug} + docker_puppet_process_count: {get_param: DockerPuppetProcessCount} {% endfor %} # END CONFIG STEPS 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/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml index d78ff7fd..bf2c86c4 100644 --- a/docker/services/ceph-ansible/ceph-base.yaml +++ b/docker/services/ceph-ansible/ceph-base.yaml @@ -49,7 +49,7 @@ parameters: CephAnsibleUpgradePlaybook: type: string description: Path to the ceph-ansible playbook to execute on upgrade - default: /usr/share/ceph-ansible/infrastructure-playbooks/take-over-existing-cluster.yml + default: /usr/share/ceph-ansible/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml CephAnsibleExtraConfig: type: json description: Extra vars for the ceph-ansible playbook @@ -184,6 +184,7 @@ outputs: ireallymeanit: 'yes' fsid: { get_param: CephClusterFSID } docker: true + ceph_release: jewel ceph_docker_registry: {get_attr: [DockerImageUrlParts, value, host]} ceph_docker_image: {get_attr: [DockerImageUrlParts, value, image]} ceph_docker_image_tag: {get_attr: [DockerImageUrlParts, value, image_tag]} 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/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml index cdba2d3f..55ee9675 100644 --- a/puppet/services/ceilometer-base.yaml +++ b/puppet/services/ceilometer-base.yaml @@ -43,7 +43,7 @@ parameters: description: Number of workers for Ceilometer service. type: number ManageEventPipeline: - default: false + default: true description: Whether to manage event_pipeline.yaml. type: boolean EventPipelinePublishers: 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/notes/update-manage-event-pipeline-0a21e9ca92cbff4f.yaml b/releasenotes/notes/update-manage-event-pipeline-0a21e9ca92cbff4f.yaml new file mode 100644 index 00000000..f0e43323 --- /dev/null +++ b/releasenotes/notes/update-manage-event-pipeline-0a21e9ca92cbff4f.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - Change the default ManageEventPipeline to true. This is because we want + the event pipeline publishers overridden by heat templates to take + effect over the puppet defaults. Once we drop panko:// from the pipeline + we can switch this back to false. 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. diff --git a/roles/Database.yaml b/roles/Database.yaml index ffeada05..689b1617 100644 --- a/roles/Database.yaml +++ b/roles/Database.yaml @@ -12,6 +12,7 @@ - OS::TripleO::Services::CACerts - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd + - OS::TripleO::Services::Docker - OS::TripleO::Services::FluentdClient - OS::TripleO::Services::Kernel - OS::TripleO::Services::MySQL diff --git a/roles/IronicConductor.yaml b/roles/IronicConductor.yaml index d5d8ddd7..3d437aa3 100644 --- a/roles/IronicConductor.yaml +++ b/roles/IronicConductor.yaml @@ -10,6 +10,7 @@ - OS::TripleO::Services::CACerts - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd + - OS::TripleO::Services::Docker - OS::TripleO::Services::FluentdClient - OS::TripleO::Services::IronicConductor - OS::TripleO::Services::Kernel diff --git a/roles/Messaging.yaml b/roles/Messaging.yaml index cd6071c4..5c793740 100644 --- a/roles/Messaging.yaml +++ b/roles/Messaging.yaml @@ -12,6 +12,7 @@ - OS::TripleO::Services::CACerts - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd + - OS::TripleO::Services::Docker - OS::TripleO::Services::FluentdClient - OS::TripleO::Services::Kernel - OS::TripleO::Services::Ntp diff --git a/roles/Networker.yaml b/roles/Networker.yaml index 1bf58031..ac30c2fd 100644 --- a/roles/Networker.yaml +++ b/roles/Networker.yaml @@ -13,6 +13,7 @@ - OS::TripleO::Services::CACerts - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::Collectd + - OS::TripleO::Services::Docker - OS::TripleO::Services::FluentdClient - OS::TripleO::Services::Kernel - OS::TripleO::Services::MySQLClient diff --git a/roles/Telemetry.yaml b/roles/Telemetry.yaml index 1dbb887f..5cea5f45 100644 --- a/roles/Telemetry.yaml +++ b/roles/Telemetry.yaml @@ -19,6 +19,7 @@ - OS::TrieplO::Services::CeilometerCollector - OS::TripleO::Services::CeilometerExpirer - OS::TripleO::Services::CertmongerUser + - OS::TripleO::Services::Docker - OS::TripleO::Services::GnocchiApi - OS::TripleO::Services::GnocchiMetricd - OS::TripleO::Services::GnocchiStatsd @@ -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}' |