Merge "Skydive: Update Keystone and Neutron configuration"

ansible/roles/skydive/templates/skydive-agent.conf.j2

@@ -1,7 +1,6 @@
 ### Skydive agent config file
 
 auth:
-  type: keystone
   analyzer_username: {{ openstack_auth['username'] }}
   analyzer_password: {{ openstack_auth['password'] }}
 
@@ -12,15 +11,6 @@ logging:
   file:
     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:
   servers:
 {% if enable_etcd | bool %}
@@ -55,6 +45,15 @@ agent:
       - ovsdb
 {% 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:
   run_path: /host/run
 

ansible/roles/skydive/templates/skydive-analyzer.conf.j2

@@ -5,6 +5,11 @@ auth:
   analyzer_username: {{ openstack_auth['username'] }}
   analyzer_password: {{ openstack_auth['password'] }}
 
+  keystone:
+    auth_url: {{ keystone_internal_url }}/v3
+    region_name: {{ openstack_region_name }}
+    domain_name: Default
+
 logging:
   level: INFO
   backends:
@@ -12,13 +17,6 @@ logging:
   file:
     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:
 {% for host in groups['skydive-analyzer'] %}
   - {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ skydive_analyzer_port }}