openstack/kolla-ansible
Code Issues Proposed changes

Skydive: Update Keystone and Neutron configuration

Browse Source 
Skydive recently splitted the OpenStack configuration:
one for the authentication - on the analyzer - 'auth.keystone'
and an other one for the Neutron probe on the agent
'agent.topology.neutron'.

Change-Id: Idce277d30f01e7a36499b1aee24c54779c54a807
This commit is contained in:
Sylvain Baubeau 2018-07-03 16:21:17 +02:00
parent f1c6d54cef
commit d0f85e3fe5
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ansible/roles/skydive/templates/skydive-agent.conf.j2
View File

@ -1,7 +1,6 @@
### Skydive agent config file ### Skydive agent config file
auth: auth:
type: keystone
analyzer_username: {{ openstack_auth['username'] }} analyzer_username: {{ openstack_auth['username'] }}
analyzer_password: {{ openstack_auth['password'] }} analyzer_password: {{ openstack_auth['password'] }}
@ -12,15 +11,6 @@ logging:
file: file:
path: /var/log/kolla/skydive/skydive-agent.log path: /var/log/kolla/skydive/skydive-agent.log
openstack:
auth_url: {{ keystone_internal_url }}/v3
username: {{ openstack_auth['username'] }}
password: {{ openstack_auth['password'] }}
tenant_name: {{ openstack_auth['project_name'] }}
region_name: {{ openstack_region_name }}
domain_name: Default
endpoint_type: internal
etcd: etcd:
servers: servers:
{% if enable_etcd | bool %} {% if enable_etcd | bool %}
@ -55,6 +45,15 @@ agent:
- ovsdb - ovsdb
{% endif %} {% endif %}
neutron:
auth_url: {{ keystone_internal_url }}/v3
username: {{ openstack_auth['username'] }}
password: {{ openstack_auth['password'] }}
tenant_name: {{ openstack_auth['project_name'] }}
region_name: {{ openstack_region_name }}
domain_name: Default
endpoint_type: internal
netns: netns:
run_path: /host/run run_path: /host/run

12
ansible/roles/skydive/templates/skydive-analyzer.conf.j2
View File

@ -5,6 +5,11 @@ auth:
analyzer_username: {{ openstack_auth['username'] }} analyzer_username: {{ openstack_auth['username'] }}
analyzer_password: {{ openstack_auth['password'] }} analyzer_password: {{ openstack_auth['password'] }}
keystone:
auth_url: {{ keystone_internal_url }}/v3
region_name: {{ openstack_region_name }}
domain_name: Default
logging: logging:
level: INFO level: INFO
backends: backends:
@ -12,13 +17,6 @@ logging:
file: file:
path: /var/log/kolla/skydive/skydive-analyzer.log path: /var/log/kolla/skydive/skydive-analyzer.log
openstack:
auth_url: {{ keystone_internal_url }}/v3
tenant_name: {{ openstack_auth['project_name'] }}
region_name: {{ openstack_region_name }}
domain_name: Default
endpoint_type: internal
analyzers: analyzers:
{% for host in groups['skydive-analyzer'] %} {% for host in groups['skydive-analyzer'] %}
- {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ skydive_analyzer_port }} - {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ skydive_analyzer_port }}