Merge "Add PCI to nova compute container for passthrough support"

diff --combined docker/services/nova-compute.yaml
index 6b8ebac,e61cd4f..c6e848a
--- 1/docker/services/nova-compute.yaml
--- 2/docker/services/nova-compute.yaml
+++ b/docker/services/nova-compute.yaml
@@@ -4,16 -4,18 +4,16 @@@ description: 
    OpenStack containerized Nova Compute service
  
  parameters:
 -  DockerNamespace:
 -    description: namespace
 -    default: 'tripleoupstream'
 -    type: string
    DockerNovaComputeImage:
      description: image
 -    default: 'centos-binary-nova-compute:latest'
      type: string
    DockerNovaLibvirtConfigImage:
      description: The container image to use for the nova_libvirt config_volume
 -    default: 'centos-binary-nova-compute:latest'
      type: string
 +  ServiceData:
 +    default: {}
 +    description: Dictionary packing service data
 +    type: json
    ServiceNetMap:
      default: {}
      description: Mapping of service_name -> network name. Typically set
@@@ -36,11 -38,6 +36,11 @@@
      description: Mapping of service endpoint -> protocol. Typically set
                   via parameter_defaults in the resource registry.
      type: json
 +  DockerNovaMigrationSshdPort:
 +    default: 2022
 +    description: Port that dockerized nova migration target sshd service
 +                 binds to.
 +    type: number
  
  resources:
  
@@@ -51,12 -48,10 +51,12 @@@
      type: ../../puppet/services/nova-compute.yaml
      properties:
        EndpointMap: {get_param: EndpointMap}
 +      ServiceData: {get_param: ServiceData}
        ServiceNetMap: {get_param: ServiceNetMap}
        DefaultPasswords: {get_param: DefaultPasswords}
        RoleName: {get_param: RoleName}
        RoleParameters: {get_param: RoleParameters}
 +      MigrationSshPort: {get_param: DockerNovaMigrationSshdPort}
  
  outputs:
    role_data:
@@@ -64,14 -59,24 +64,14 @@@
      value:
        service_name: {get_attr: [NovaComputeBase, role_data, service_name]}
        config_settings:
 -        map_merge:
 -          - get_attr: [NovaComputeBase, role_data, config_settings]
 -          # FIXME: we need to disable migration for now as the
 -          # hieradata is common for all services, and this means nova
 -          # and nova_placement puppet runs also try to configure
 -          # libvirt, and they fail. We can remove this override when
 -          # we have hieradata separation between containers.
 -          - tripleo::profile::base::nova::manage_migration: false
 +        get_attr: [NovaComputeBase, role_data, config_settings]
        step_config: &step_config
          get_attr: [NovaComputeBase, role_data, step_config]
        puppet_config:
          config_volume: nova_libvirt
          puppet_tags: nova_config,nova_paste_api_ini
          step_config: *step_config
 -        config_image:
 -          list_join:
 -          - '/'
 -          - [ {get_param: DockerNamespace}, {get_param: DockerNovaLibvirtConfigImage} ]
 +        config_image: {get_param: DockerNovaLibvirtConfigImage}
        kolla_config:
          /var/lib/kolla/config_files/nova_compute.json:
            command: /usr/bin/nova-compute --config-file /etc/nova/nova.conf --config-file /etc/nova/rootwrap.conf
@@@ -80,14 -85,6 +80,14 @@@
                dest: "/"
                merge: true
                preserve_properties: true
 +            - source: "/var/lib/kolla/config_files/src-iscsid/*"
 +              dest: "/"
 +              merge: true
 +              preserve_properties: true
 +            - source: "/var/lib/kolla/config_files/src-ceph/"
 +              dest: "/etc/ceph/"
 +              merge: true
 +              preserve_properties: true
            permissions:
              - path: /var/log/nova
                owner: nova:nova
@@@ -99,7 -96,10 +99,7 @@@
          # FIXME: run discover hosts here
          step_4:
            nova_compute:
 -            image: &nova_compute_image
 -              list_join:
 -              - '/'
 -              - [ {get_param: DockerNamespace}, {get_param: DockerNovaComputeImage} ]
 +            image: &nova_compute_image {get_param: DockerNovaComputeImage}
              net: host
              privileged: true
              user: nova
@@@ -110,14 -110,15 +110,16 @@@
                  -
                    - /var/lib/kolla/config_files/nova_compute.json:/var/lib/kolla/config_files/config.json:ro
                    - /var/lib/config-data/puppet-generated/nova_libvirt/:/var/lib/kolla/config_files/src:ro
 +                  - /var/lib/config-data/puppet-generated/iscsid/:/var/lib/kolla/config_files/src-iscsid:ro
 +                  - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro
                    - /dev:/dev
 -                  - /etc/iscsi:/etc/iscsi
                    - /lib/modules:/lib/modules:ro
                    - /run:/run
                    - /var/lib/nova:/var/lib/nova
                    - /var/lib/libvirt:/var/lib/libvirt
                    - /var/log/containers/nova:/var/log/nova
+                   - /sys/class/net:/sys/class/net
+                   - /sys/bus/pci:/sys/bus/pci
              environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
        host_prep_tasks:
@@@ -129,10 -130,6 +131,10 @@@
              - /var/log/containers/nova
              - /var/lib/nova
              - /var/lib/libvirt
 +        - name: ensure ceph configurations exist
 +          file:
 +            path: /etc/ceph
 +            state: directory
        upgrade_tasks:
          - name: Stop and disable nova-compute service
            tags: step2