Merge "Add a Skydive composable service"

2017-10-13 20:37:59 +00:00 · 2017-10-13 20:37:59 +00:00 · efd86fb1a8
parent 532c91796b d31bc3a573
commit efd86fb1a8
14 changed files with 273 additions and 0 deletions
--- a/docker/services/skydive/skydive-agent.yaml
+++ b/docker/services/skydive/skydive-agent.yaml
@ -0,0 +1,68 @@
+heat_template_version: pike
+
+description: >
+  Skydive agent service.
+
+parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+  DockerSkydiveAgentImage:
+    description: image
+    type: string
+    default: 'tripleoupstream/centos-binary-skydive-agent:latest'
+
+resources:
+  SkydiveBase:
+    type: ./skydive-base.yaml
+    properties:
+      ServiceData: {get_param: ServiceData}
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
+      EndpointMap: {get_param: EndpointMap}
+      RoleName: {get_param: RoleName}
+      RoleParameters: {get_param: RoleParameters}
+      DockerSkydiveImage: {get_param: DockerSkydiveAgentImage}
+
+outputs:
+  role_data:
+    description: Role data for the Skydive agent service.
+    value:
+      service_name: skydive_agent
+      upgrade_tasks: []
+      step_config: ''
+      puppet_config:
+        config_image: ''
+        config_volume: ''
+        step_config: ''
+      docker_config: {}
+      workflow_tasks: {get_attr: [SkydiveBase, role_data, workflow_tasks]}
+      config_settings:
+        skydive_agent_ansible_vars:
+          map_merge:
+          - {get_attr: [SkydiveBase, role_data, config_settings, skydive_common_ansible_vars]}
+          - skydive_agent_docker_image: {get_attr: [SkydiveBase, role_data, config_settings, skydive_docker_image]}
+            skydive_agent_docker_command: "/usr/bin/skydive agent --conf /etc/skydive.yml"
--- a/docker/services/skydive/skydive-analyzer.yaml
+++ b/docker/services/skydive/skydive-analyzer.yaml
@ -0,0 +1,73 @@
+heat_template_version: pike
+
+description: >
+  Skydive analyzer service.
+
+parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+  DockerSkydiveAnalyzerImage:
+    description: image
+    type: string
+    default: 'tripleoupstream/centos-binary-skydive-analyzer:latest'
+
+resources:
+  SkydiveBase:
+    type: ./skydive-base.yaml
+    properties:
+      ServiceData: {get_param: ServiceData}
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
+      EndpointMap: {get_param: EndpointMap}
+      RoleName: {get_param: RoleName}
+      RoleParameters: {get_param: RoleParameters}
+      DockerSkydiveImage: {get_param: DockerSkydiveAnalyzerImage}
+
+outputs:
+  role_data:
+    description: Role data for the Skydive analyzer service.
+    value:
+      service_name: skydive_analyzer
+      upgrade_tasks: []
+      step_config: ''
+      puppet_config:
+        config_image: ''
+        config_volume: ''
+        step_config: ''
+      docker_config: {}
+      workflow_tasks: {get_attr: [SkydiveBase, role_data, workflow_tasks]}
+      config_settings:
+        map_merge:
+        - tripleo.skydive_analyzer.firewall_rules:
+            '150 skydive_analyzer':
+              dport: 8082
+              proto: tcp
+        - skydive_analyzer_ansible_vars:
+            map_merge:
+            - {get_attr: [SkydiveBase, role_data, config_settings, skydive_common_ansible_vars]}
+            - skydive_analyzer_docker_image: {get_attr: [SkydiveBase, role_data, config_settings, skydive_docker_image]}
+              skydive_analyzer_docker_command: "/usr/bin/skydive analyzer --conf /etc/skydive.yml"
--- a/docker/services/skydive/skydive-base.yaml
+++ b/docker/services/skydive/skydive-base.yaml
@ -0,0 +1,110 @@
+heat_template_version: pike
+
+description: >
+  Skydive base service. Shared by all Skydive services.
+
+parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+  SkydiveAnsibleWorkflowName:
+    type: string
+    description: Name of the Mistral workflow to execute
+    default: tripleo.skydive_ansible.v1.skydive_install
+  SkydiveAnsiblePlaybook:
+    type: string
+    description: Path to the skydive-ansible playbook to execute
+    default: /usr/share/skydive-ansible/playbook.yml.sample
+  SkydiveAnsibleExtraConfig:
+    type: json
+    description: Extra vars for the skydive-ansible playbook
+    default:
+      deployment_mode: container
+  DockerSkydiveImage:
+    description: image
+    type: string
+    default: 'tripleoupstream/centos-binary-skydive-base:latest'
+
+conditions:
+  custom_registry_host:
+    yaql:
+      data: {get_param: DockerSkydiveImage}
+      expression: $.data.split('/')[0].matches('(\.|:)')
+
+resources:
+  DockerImageUrlParts:
+    type: OS::Heat::Value
+    properties:
+      type: json
+      value:
+        host:
+          if:
+          - custom_registry_host
+          - yaql:
+              expression: let(location => $.data.rightSplit(':', 1)[0]) -> regex('(?:https?://)?(.*?)/(.*)').split($location)[1]
+              data: {get_param: DockerSkydiveImage}
+          - docker.io
+        image:
+          if:
+          - custom_registry_host
+          - yaql:
+              expression: let(location => $.data.rightSplit(':', 1)[0]) -> regex('(?:https?://)?(.*?)/(.*)').split($location)[2]
+              data: {get_param: DockerSkydiveImage}
+          - yaql:
+              expression: $.data.rightSplit(':', 1)[0]
+              data: {get_param: DockerSkydiveImage}
+        image_tag:
+          yaql:
+            expression: $.data.rightSplit(':', 1)[1]
+            data: {get_param: DockerSkydiveImage}
+
+outputs:
+  role_data:
+    description: Role data for the Skydive base service.
+    value:
+      service_name: skydive_base
+      upgrade_tasks: []
+      step_config: ''
+      puppet_config:
+        config_image: ''
+        config_volume: ''
+        step_config: ''
+      docker_config: {}
+      workflow_tasks:
+        step2:
+          - name: skydive_base_ansible_workflow
+            workflow: { get_param: SkydiveAnsibleWorkflowName }
+            input:
+              skydive_ansible_extra_vars: {get_param: SkydiveAnsibleExtraConfig}
+              skydive_ansible_playbook: {get_param: SkydiveAnsiblePlaybook}
+      config_settings:
+        skydive_docker_image: {get_attr: [DockerImageUrlParts, value, image]}
+        skydive_common_ansible_vars:
+          skydive_docker_registry: {get_attr: [DockerImageUrlParts, value, host]}
+          skydive_docker_image_tag: {get_attr: [DockerImageUrlParts, value, image_tag]}
+          skydive_deployment_mode: container
+          skydive_extra_config:
+            flow.protocol: websocket
--- a/environments/hyperconverged-ceph.yaml
+++ b/environments/hyperconverged-ceph.yaml
@ -33,6 +33,7 @@ parameter_defaults:
    - OS::TripleO::Services::NeutronSriovHostConfig
    - OS::TripleO::Services::OpenDaylightOvs
    - OS::TripleO::Services::SensuClient
+    - OS::TripleO::Services::SkydiveAgent
    - OS::TripleO::Services::FluentdClient
    - OS::TripleO::Services::AuditD
    - OS::TripleO::Services::Collectd
--- a/environments/services-docker/skydive-environment.yaml
+++ b/environments/services-docker/skydive-environment.yaml
@ -0,0 +1,3 @@
+resource_registry:
+  OS::TripleO::Services::SkydiveAgent: ../../docker/services/skydive/skydive-agent.yaml
+  OS::TripleO::Services::SkydiveAnalyzer: ../../docker/services/skydive/skydive-analyzer.yaml
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@ -295,6 +295,8 @@ resource_registry:
  OS::TripleO::Services::CertmongerUser: OS::Heat::None
  OS::TripleO::Services::Clustercheck: OS::Heat::None
  OS::TripleO::Services::VRTSHyperScale: OS::Heat::None
+  OS::TripleO::Services::SkydiveAgent: OS::Heat::None
+  OS::TripleO::Services::SkydiveAnalyzer: OS::Heat::None

 parameter_defaults:
  EnablePackageInstall: false
--- a/releasenotes/notes/integrate-skydive-900756d8870b3876.yaml
+++ b/releasenotes/notes/integrate-skydive-900756d8870b3876.yaml
@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Add support for troubleshooting network issues using `Skydive
+    <http://skydive.network>`_.
--- a/roles/Compute.yaml
+++ b/roles/Compute.yaml
@ -50,6 +50,7 @@
    - OS::TripleO::Services::OpenDaylightOvs
    - OS::TripleO::Services::Securetty
    - OS::TripleO::Services::SensuClient
+    - OS::TripleO::Services::SkydiveAgent
    - OS::TripleO::Services::Snmp
    - OS::TripleO::Services::Sshd
    - OS::TripleO::Services::Timezone
--- a/roles/ComputeHCI.yaml
+++ b/roles/ComputeHCI.yaml
@ -41,6 +41,7 @@
    - OS::TripleO::Services::OpenDaylightOvs
    - OS::TripleO::Services::Securetty
    - OS::TripleO::Services::SensuClient
+    - OS::TripleO::Services::SkydiveAgent
    - OS::TripleO::Services::Snmp
    - OS::TripleO::Services::Sshd
    - OS::TripleO::Services::Timezone
--- a/roles/ComputeOvsDpdk.yaml
+++ b/roles/ComputeOvsDpdk.yaml
@ -36,6 +36,7 @@
    - OS::TripleO::Services::OpenDaylightOvs
    - OS::TripleO::Services::Securetty
    - OS::TripleO::Services::SensuClient
+    - OS::TripleO::Services::SkydiveAgent
    - OS::TripleO::Services::Snmp
    - OS::TripleO::Services::Sshd
    - OS::TripleO::Services::Timezone
--- a/roles/Controller.yaml
+++ b/roles/Controller.yaml
@ -135,6 +135,8 @@
    - OS::TripleO::Services::SaharaEngine
    - OS::TripleO::Services::Securetty
    - OS::TripleO::Services::SensuClient
+    - OS::TripleO::Services::SkydiveAgent
+    - OS::TripleO::Services::SkydiveAnalyzer
    - OS::TripleO::Services::Snmp
    - OS::TripleO::Services::Sshd
    - OS::TripleO::Services::SwiftProxy
--- a/roles/ControllerOpenstack.yaml
+++ b/roles/ControllerOpenstack.yaml
@ -105,6 +105,8 @@
    - OS::TripleO::Services::SaharaApi
    - OS::TripleO::Services::SaharaEngine
    - OS::TripleO::Services::SensuClient
+    - OS::TripleO::Services::SkydiveAgent
+    - OS::TripleO::Services::SkydiveAnalyzer
    - OS::TripleO::Services::Snmp
    - OS::TripleO::Services::Sshd
    - OS::TripleO::Services::SwiftProxy
--- a/roles/Networker.yaml
+++ b/roles/Networker.yaml
@ -30,6 +30,7 @@
    - OS::TripleO::Services::ContainersLogrotateCrond
    - OS::TripleO::Services::OpenDaylightOvs
    - OS::TripleO::Services::SensuClient
+    - OS::TripleO::Services::SkydiveAgent
    - OS::TripleO::Services::Snmp
    - OS::TripleO::Services::Timezone
    - OS::TripleO::Services::TripleoFirewall
--- a/roles_data.yaml
+++ b/roles_data.yaml
@ -138,6 +138,8 @@
    - OS::TripleO::Services::SaharaEngine
    - OS::TripleO::Services::Securetty
    - OS::TripleO::Services::SensuClient
+    - OS::TripleO::Services::SkydiveAgent
+    - OS::TripleO::Services::SkydiveAnalyzer
    - OS::TripleO::Services::Snmp
    - OS::TripleO::Services::Sshd
    - OS::TripleO::Services::SwiftProxy
@ -203,6 +205,7 @@
    - OS::TripleO::Services::OpenDaylightOvs
    - OS::TripleO::Services::Securetty
    - OS::TripleO::Services::SensuClient
+    - OS::TripleO::Services::SkydiveAgent
    - OS::TripleO::Services::Snmp
    - OS::TripleO::Services::Sshd
    - OS::TripleO::Services::Timezone