summaryrefslogtreecommitdiffstats
path: root/kernel/net/rxrpc/ar-ack.c
diff options
context:
space:
mode:
authorJosé Pekkarinen <jose.pekkarinen@nokia.com>2015-10-09 08:42:44 +0300
committerJosé Pekkarinen <jose.pekkarinen@nokia.com>2015-10-09 08:52:35 +0300
commitfdb8b20906f3546ba6c2f9f0686d8a5189516ba3 (patch)
tree6bb43dc8a42d6e9403763bc749f706939dd2bc60 /kernel/net/rxrpc/ar-ack.c
parentcc84a1f21026270463b580f2564f9d71912b20db (diff)
Kernel bump from 4.1.3-rt to 4.1.7-rt.
These changes brings a vanilla kernel from kernel.org, and the patch applied for rt is patch-4.1.7-rt8.patch. No further changes needed. Change-Id: Id8dd03c2ddd971e4d1d69b905f3069737053b700 Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/net/rxrpc/ar-ack.c')
0 files changed, 0 insertions, 0 deletions
5' href='#n155'>155 156 157 158 159 160 161 162 163 164 165 166 167 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 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305
# vim: set ts=2 et:
openstack-phase1:
  series: trusty
  services:
    nodes-api:
      charm: "cs:trusty/ubuntu"
      num_units: 1
      constraints: tags=control
    nodes-compute:
      charm: "cs:trusty/ubuntu"
      num_units: 1
      constraints: tags=compute
    "ntp":
      charm: "cs:trusty/ntp"
  relations:
    - - "ntp:juju-info"
      - "nodes-api:juju-info"
    - - "ntp:juju-info"
      - "nodes-compute:juju-info"
openstack-phase2:
  inherits: openstack-phase1
  services:
    "mysql":
      branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
      num_units: 1
      options:
        "dataset-size": 2G
        "max-connections": 10000
      to:
        - "lxc:nodes-api=0"
    "ceilometer":
      branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
      num_units: 1
      to:
        - "lxc:nodes-api=0"
    "ceilometer-agent":
      branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
    "mongodb":
      charm: "cs:trusty/mongodb"
      num_units: 1
      to:
        - "lxc:nodes-api=0"
    "heat":
      branch: "lp:~openstack-charmers/charms/trusty/heat/next"
      to:
        - "lxc:nodes-api=0"
    ceph:
      branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
      num_units: 1
      options:
        fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
        monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
        osd-devices: ""
        monitor-count: 1
#        osd-reformat: 'no'
#        ceph-cluster-network: 192.168.0.0/24
#        ceph-public-network: 192.168.0.0/24
      to:
        - "lxc:nodes-api=0"
    ceph-osd:
      charm: cs:trusty/ceph-osd
      num_units: 1
      options:
        osd-devices: /srv
        osd-reformat: 'yes'
      to:
        - "nodes-compute=0"
    ceph-radosgw:
      charm: cs:trusty/ceph-radosgw
      num_units: 1
      options:
        use-embedded-webserver: true
      to:
        - "lxc:nodes-api=0"
    cinder:
      branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
      num_units: 1
      options:
        block-device: None
        glance-api-version: 2
#        ha-mcastport: 5401
#        openstack-origin-git: include-file://cinder-master.yaml
      to:
        - "lxc:nodes-api=0"
    cinder-ceph:
      branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next"
    "rabbitmq-server":
      branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
      num_units: 1
      to:
        - "lxc:nodes-api=0"
    "keystone":
      branch: lp:~openstack-charmers/charms/trusty/keystone/next
      num_units: 1
      options:
        openstack-origin-git: include-file://keystone-master.yaml
        "admin-password": openstack
        "admin-token": admin
      to:
        - "lxc:nodes-api=0"
    "openstack-dashboard":
      branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
      num_units: 1
      options:
        openstack-origin-git: include-file://horizon-master.yaml
        secret: admin
      to:
        - "lxc:nodes-api=0"
    "nova-compute":
      branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
      num_units: 1
      options:
        openstack-origin-git: include-file://nova-master.yaml
        "enable-live-migration": False
        "manage-neutron-plugin-legacy-mode": False
      to:
        - "nodes-compute=0"
#        - "nodes-compute=1"
    "nova-cloud-controller":
      branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
      num_units: 1
      options:
        openstack-origin-git: include-file://nova-master.yaml
        "console-access-protocol": novnc
        "network-manager": Neutron
        "quantum-security-groups": "yes"
      to:
        - "lxc:nodes-api=0"
    "neutron-api":
      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
      num_units: 1
      options:
        neutron-security-groups: True
        manage-neutron-plugin-legacy-mode: False
      to:
        - "lxc:nodes-api=0"
    neutron-gateway:
      branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next
      options:
        openstack-origin-git: include-file://neutron-master.yaml
#        "ext-port": "eth1"
        plugin: ovs-odl
        instance-mtu: 1400
      to:
        - "nodes-api=0"
    odl-controller:
      branch: lp:~openstack-charmers/charms/trusty/odl-controller/next
      options:
        #install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.4-Helium-SR4/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
        install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.3.3-Lithium-SR3/distribution-karaf-0.3.3-Lithium-SR3.tar.gz"
        profile: "openvswitch-odl-lithium"
        http-proxy: "http://squid.internal:3128"
        https-proxy: "http://squid.internal:3128"
      to:
        - "lxc:nodes-api=1"
    "glance":
      branch: lp:~openstack-charmers/charms/trusty/glance/next
      num_units: 1
      options:
        openstack-origin-git: include-file://glance-master.yaml
      to:
        - "lxc:nodes-api=0"
    opnfv-promise:
      branch: lp:~narindergupta/charms/trusty/promise/trunk
      num_units: 1
      to:
        - "lxc:nodes-api=0"
    neutron-api-odl:
      branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp
      options:
        overlay-network-type: 'vxlan gre'
        security-groups: True
    openvswitch-odl:
      branch: lp:~openstack-charmers/charms/trusty/openvswitch-odl/trunk
  relations:
    - - "neutron-api:neutron-plugin-api-subordinate"
      - "neutron-api-odl:neutron-plugin-api-subordinate"
    - - "nova-compute:neutron-plugin"
      - "openvswitch-odl:neutron-plugin"
    - - "neutron-gateway"
      - "openvswitch-odl"
    - - "openvswitch-odl:ovsdb-manager"
      - "odl-controller:ovsdb-manager"
    - - "neutron-api-odl:odl-controller"
      - "odl-controller:controller-api"
    - - "keystone:shared-db"
      - "mysql:shared-db"
    - - "nova-cloud-controller:shared-db"
      - "mysql:shared-db"
    - - "nova-cloud-controller:amqp"
      - "rabbitmq-server:amqp"
    - - "nova-cloud-controller:image-service"
      - "glance:image-service"
    - - "nova-cloud-controller:identity-service"
      - "keystone:identity-service"
    - - "nova-cloud-controller:cloud-compute"
      - "nova-compute:cloud-compute"
    - - "nova-compute:amqp"
      - "rabbitmq-server:amqp"
    - - "nova-compute:image-service"
      - "glance:image-service"
    - - "glance:shared-db"
      - "mysql:shared-db"
    - - "glance:identity-service"
      - "keystone:identity-service"
    - - "glance:amqp"
      - "rabbitmq-server:amqp"
    - - "openstack-dashboard:identity-service"
      - "keystone:identity-service"
    - - "neutron-api:shared-db"
      - "mysql:shared-db"
    - - "neutron-api:amqp"
      - "rabbitmq-server:amqp"
    - - "nova-cloud-controller:neutron-api"
      - "neutron-api:neutron-api"
    - - "neutron-api:identity-service"
      - "keystone:identity-service"
    - - "neutron-gateway:amqp"
      - "rabbitmq-server:amqp"
    - - "neutron-gateway:neutron-plugin-api"
      - "neutron-api:neutron-plugin-api"
    - - "nova-cloud-controller:quantum-network-service"
      - "neutron-gateway:quantum-network-service"
    - - "ceilometer:amqp"
      - "rabbitmq-server:amqp"
    - - "ceilometer-agent:ceilometer-service"
      - "ceilometer:ceilometer-service"
    - - "ceilometer:identity-service"
      - "keystone:identity-service"
    - - "ceilometer:identity-notifications"
      - "keystone:identity-notifications"
    - - "ceilometer-agent:nova-ceilometer"
      - "nova-compute:nova-ceilometer"
    - - "ceilometer:shared-db"
      - "mongodb:database"
    - - "heat:shared-db"
      - "mysql:shared-db"
    - - "heat:identity-service"
      - "keystone:identity-service"
    - - "heat:amqp"
      - "rabbitmq-server:amqp"
    - - "cinder:image-service"
      - "glance:image-service"
    - - "cinder:amqp"
      - "rabbitmq-server:amqp"
    - - "cinder:identity-service"
      - "keystone:identity-service"
    - - "cinder:cinder-volume-service"
      - "nova-cloud-controller:cinder-volume-service"
    - - "cinder-ceph:storage-backend"
      - "cinder:storage-backend"
    - - "ceph:client"
      - "nova-compute:ceph"
    - - "cinder:shared-db"
      - "mysql:shared-db"
    - - "ceph:client"
      - "cinder-ceph:ceph"
    - - "ceph:client"
      - "glance:ceph"
    - - "ceph-osd:mon"
      - "ceph:osd"
    - - "ceph-radosgw:mon"
      - "ceph:radosgw"
    - - "ceph-radosgw:identity-service"
      - "keystone:identity-service"
trusty-liberty-nodes:
  inherits: openstack-phase1
  overrides:
    series: trusty

trusty-liberty:
  inherits: openstack-phase2
  overrides:
    #os-data-network: 10.4.8.0/21
    #ceph-cluster-network: 10.4.0.0/21
    #prefer-ipv6: true
    region: Canonical
    source: "cloud:trusty-liberty"
    "openstack-origin": "cloud:trusty-liberty"
    series: trusty
    ceph-osd-replication-count: 1
    admin-role: admin
    keystone-admin-role: admin

trusty-kilo-nodes:
  inherits: openstack-phase1
  overrides:
    series: trusty

# master
trusty-kilo:
  inherits: openstack-phase2
  series: trusty
  overrides:
    region: Canonical
    #os-data-network: 10.4.8.0/21
    #ceph-cluster-network: 10.4.0.0/21
    #prefer-ipv6: true
    openstack-origin: cloud:trusty-kilo
    source: cloud:trusty-kilo
    series: trusty
    ceph-osd-replication-count: 1
    admin-role: admin
    keystone-admin-role: admin