summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2017-04-19 16:55:54 -0500
committerDan Prince <dprince@redhat.com>2017-04-19 17:20:27 -0500
commitbe27b5cb0429e0370ddb4a83a8b710bc81ec1fd2 (patch)
treeb712a5d0d43b1ce61259f5a533e97dcf0aca8e40
parentd5471212123fee21cc44175362cf36e9449a2484 (diff)
Ensure /etc/docker/daemon.json
A recent Centos docker packaging change removed the default /etc/docker/daemon.json file. As such we need to create an empty json file if none exists before running Augeas to configure the settings. Change-Id: Ibfe04b468639002f55da7bb65d2606f730c700b7 Closes-bug: #1684297
Diffstat
-rw-r--r--manifests/profile/base/docker.pp9
1 files changed, 9 insertions, 0 deletions
diff --git a/manifests/profile/base/docker.pp b/manifests/profile/base/docker.pp
index 4797d86..d035f6a 100644
--- a/manifests/profile/base/docker.pp
+++ b/manifests/profile/base/docker.pp
@@ -79,12 +79,21 @@ class tripleo::profile::base::docker (
$mirror_changes = [ 'rm dict/entry[. = "registry-mirrors"]', ]
}
+ file { '/etc/docker/daemon.json':
+ ensure => 'present',
+ content => '{}',
+ mode => '0644',
+ replace => false,
+ require => Package['docker']
+ }
+
augeas { 'docker-daemon.json':
lens => 'Json.lns',
incl => '/etc/docker/daemon.json',
changes => $mirror_changes,
subscribe => Package['docker'],
notify => Service['docker'],
+ require => File['/etc/docker/daemon.json'],
}
}
id='n168' href='#n168'>168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 
# Copyright (c) 2016-2017 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#      http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# flow definition for ACL tests - 1K flows - ipv4 only
#
# the number of flows defines the widest range of parameters
# for example if srcip_range=1.0.0.1-1.0.0.255 and dst_ip_range=10.0.0.1-10.0.1.255
# and it should define only 16 flows
#
# there is assumption that packets generated will have a random sequences of following addresses pairs
# in the packets
# 1. src=1.x.x.x(x.x.x =random from 1..255) dst=10.x.x.x (random from 1..512)
# 2. src=1.x.x.x(x.x.x =random from 1..255) dst=10.x.x.x (random from 1..512)
# ...
# 512. src=1.x.x.x(x.x.x =random from 1..255) dst=10.x.x.x (random from 1..512)
#
# not all combination should be filled
# Any other field with random range will be added to flow definition
#
# the example.yaml provides all possibilities for traffic generation
#
# the profile defines a public and private side to make limited traffic correlation
# between private and public side same way as it is made by IXIA solution.
#
---
schema: "nsb:traffic_profile:0.1"

# This file is a template, it will be filled with values from tc.yaml before passing to the traffic generator

name: rfc2544
description: Traffic profile to run RFC2544 latency
traffic_profile:
  traffic_type: RFC2544Profile # defines traffic behavior - constant or look for highest possible throughput
  frame_rate: 100  # pc of linerate
  duration: {{ duration }}

uplink_0:
  ipv4:
    id: 1
    outer_l2:
      framesize:
        64B: "{{ get(imix, 'imix.uplink.64B', '0') }}"
        128B: "{{ get(imix, 'imix.uplink.128B', '0') }}"
        256B: "{{ get(imix, 'imix.uplink.256B', '0') }}"
        373b: "{{ get(imix, 'imix.uplink.373B', '0') }}"
        512B: "{{ get(imix, 'imix.uplink.512B', '0') }}"
        570B: "{{get(imix, 'imix.uplink.570B', '0') }}"
        1024B: "{{get(imix, 'imix.uplink.1024B', '0') }}"
        1280B: "{{get(imix, 'imix.uplink.1280B', '0') }}"
        1400B: "{{get(imix, 'imix.uplink.1400B', '0') }}"
        1500B: "{{get(imix, 'imix.uplink.1500B', '0') }}"
        1518B: "{{get(imix, 'imix.uplink.1518B', '0') }}"
    outer_l3v4:
      proto: "udp"
      srcip4: "{{get(flow, 'flow.src_ip_0', '1.1.1.1-1.1.255.255') }}"
      dstip4: "{{get(flow, 'flow.dst_ip_0', '90.90.1.1-90.90.255.255') }}"
      count: "{{get(flow, 'flow.count', '1') }}"
      ttl: 32
      dscp: 0
    outer_l4:
      srcport: "{{get(flow, 'flow.src_port_0', '1234-4321') }}"
      dstport: "{{get(flow, 'flow.dst_port_0', '2001-4001') }}"
      count: "{{get(flow, 'flow.count', '1') }}"
downlink_0:
  ipv4:
    id: 2
    outer_l2:
      framesize:
        64B: "{{ get(imix, 'imix.downlink.64B', '0') }}"
        128B: "{{ get(imix, 'imix.downlink.128B', '0') }}"
        256B: "{{ get(imix, 'imix.downlink.256B', '0') }}"
        373b: "{{ get(imix, 'imix.downlink.373B', '0') }}"
        512B: "{{ get(imix, 'imix.downlink.512B', '0') }}"
        570B: "{{get(imix, 'imix.downlink.570B', '0') }}"
        1024B: "{{get(imix, 'imix.downlink.1024B', '0') }}"
        1280B: "{{get(imix, 'imix.downlink.1280B', '0') }}"
        1400B: "{{get(imix, 'imix.downlink.1400B', '0') }}"
        1500B: "{{get(imix, 'imix.downlink.1500B', '0') }}"
        1518B: "{{get(imix, 'imix.downlink.1518B', '0') }}"

    outer_l3v4:
      proto: "udp"
      srcip4: "{{get(flow, 'flow.dst_ip_0', '90.90.1.1-90.90.255.255') }}"
      dstip4: "{{get(flow, 'flow.src_ip_0', '1.1.1.1-1.1.255.255') }}"
      count: "{{get(flow, 'flow.count', '1') }}"
      ttl: 32
      dscp: 0
    outer_l4:
      srcport: "{{get(flow, 'flow.dst_port_0', '1234-4321') }}"
      dstport: "{{get(flow, 'flow.src_port_0', '2001-4001') }}"
      count: "{{get(flow, 'flow.count', '1') }}"
uplink_1:
  ipv4:
    id: 3
    outer_l2:
      framesize:
        64B: "{{ get(imix, 'imix.uplink.64B', '0') }}"
        128B: "{{ get(imix, 'imix.uplink.128B', '0') }}"
        256B: "{{ get(imix, 'imix.uplink.256B', '0') }}"
        373b: "{{ get(imix, 'imix.uplink.373B', '0') }}"
        512B: "{{ get(imix, 'imix.uplink.512B', '0') }}"
        570B: "{{get(imix, 'imix.uplink.570B', '0') }}"
        1024B: "{{get(imix, 'imix.uplink.1024B', '0') }}"
        1280B: "{{get(imix, 'imix.uplink.1280B', '0') }}"
        1400B: "{{get(imix, 'imix.uplink.1400B', '0') }}"
        1500B: "{{get(imix, 'imix.uplink.1500B', '0') }}"
        1518B: "{{get(imix, 'imix.uplink.1518B', '0') }}"
    outer_l3v4:
      proto: "udp"
      srcip4: "{{get(flow, 'flow.src_ip_1', '1.1.1.1-1.1.255.255') }}"
      dstip4: "{{get(flow, 'flow.dst_ip_1', '90.90.1.1-90.90.255.255') }}"
      count: "{{get(flow, 'flow.count', '1') }}"
      ttl: 32
      dscp: 0
    outer_l4:
      srcport: "{{get(flow, 'flow.src_port_1', '1234-4321') }}"
      dstport: "{{get(flow, 'flow.dst_port_1', '2001-4001') }}"
      count: "{{get(flow, 'flow.count', '1') }}"
downlink_1:
  ipv4:
    id: 4
    outer_l2:
      framesize:
        64B: "{{ get(imix, 'imix.downlink.64B', '0') }}"
        128B: "{{ get(imix, 'imix.downlink.128B', '0') }}"
        256B: "{{ get(imix, 'imix.downlink.256B', '0') }}"
        373b: "{{ get(imix, 'imix.downlink.373B', '0') }}"
        512B: "{{ get(imix, 'imix.downlink.512B', '0') }}"
        570B: "{{get(imix, 'imix.downlink.570B', '0') }}"
        1024B: "{{get(imix, 'imix.downlink.1024B', '0') }}"
        1280B: "{{get(imix, 'imix.downlink.1280B', '0') }}"
        1400B: "{{get(imix, 'imix.downlink.1400B', '0') }}"
        1500B: "{{get(imix, 'imix.downlink.1500B', '0') }}"
        1518B: "{{get(imix, 'imix.downlink.1518B', '0') }}"

    outer_l3v4:
      proto: "udp"
      srcip4: "{{get(flow, 'flow.dst_ip_1', '90.90.1.1-90.90.255.255') }}"
      dstip4: "{{get(flow, 'flow.src_ip_1', '1.1.1.1-1.1.255.255') }}"
      count: "{{get(flow, 'flow.count', '1') }}"
      ttl: 32
      dscp: 0
    outer_l4:
      srcport: "{{get(flow, 'flow.dst_port_1', '1234-4321') }}"
      dstport: "{{get(flow, 'flow.src_port_1', '2001-4001') }}"
      count: "{{get(flow, 'flow.count', '1') }}"
uplink_2:
  ipv4:
    id: 5
    outer_l2:
      framesize:
        64B: "{{ get(imix, 'imix.uplink.64B', '0') }}"
        128B: "{{ get(imix, 'imix.uplink.128B', '0') }}"
        256B: "{{ get(imix, 'imix.uplink.256B', '0') }}"
        373b: "{{ get(imix, 'imix.uplink.373B', '0') }}"
        512B: "{{ get(imix, 'imix.uplink.512B', '0') }}"
        570B: "{{get(imix, 'imix.uplink.570B', '0') }}"
        1024B: "{{get(imix, 'imix.uplink.1024B', '0') }}"
        1280B: "{{get(imix, 'imix.uplink.1280B', '0') }}"
        1400B: "{{get(imix, 'imix.uplink.1400B', '0') }}"
        1500B: "{{get(imix, 'imix.uplink.1500B', '0') }}"
        1518B: "{{get(imix, 'imix.uplink.1518B', '0') }}"
    outer_l3v4:
      proto: "udp"
      srcip4: "{{get(flow, 'flow.src_ip_1', '1.1.1.1-1.1.255.255') }}"
      dstip4: "{{get(flow, 'flow.dst_ip_1', '90.90.1.1-90.90.255.255') }}"
      count: "{{get(flow, 'flow.count', '1') }}"
      ttl: 32
      dscp: 0
    outer_l4:
      srcport: "{{get(flow, 'flow.src_port_1', '1234-4321') }}"
      dstport: "{{get(flow, 'flow.dst_port_1', '2001-4001') }}"
      count: "{{get(flow, 'flow.count', '1') }}"
downlink_2:
  ipv4:
    id: 6
    outer_l2:
      framesize:
        64B: "{{ get(imix, 'imix.downlink.64B', '0') }}"
        128B: "{{ get(imix, 'imix.downlink.128B', '0') }}"
        256B: "{{ get(imix, 'imix.downlink.256B', '0') }}"
        373b: "{{ get(imix, 'imix.downlink.373B', '0') }}"
        512B: "{{ get(imix, 'imix.downlink.512B', '0') }}"
        570B: "{{get(imix, 'imix.downlink.570B', '0') }}"
        1024B: "{{get(imix, 'imix.downlink.1024B', '0') }}"
        1280B: "{{get(imix, 'imix.downlink.1280B', '0') }}"
        1400B: "{{get(imix, 'imix.downlink.1400B', '0') }}"
        1500B: "{{get(imix, 'imix.downlink.1500B', '0') }}"
        1518B: "{{get(imix, 'imix.downlink.1518B', '0') }}"

    outer_l3v4:
      proto: "udp"
      srcip4: "{{get(flow, 'flow.dst_ip_1', '90.90.1.1-90.90.255.255') }}"
      dstip4: "{{get(flow, 'flow.src_ip_1', '1.1.1.1-1.1.255.255') }}"
      count: "{{get(flow, 'flow.count', '1') }}"
      ttl: 32
      dscp: 0
    outer_l4:
      srcport: "{{get(flow, 'flow.dst_port_1', '1234-4321') }}"
      dstport: "{{get(flow, 'flow.src_port_1', '2001-4001') }}"
      count: "{{get(flow, 'flow.count', '1') }}"