diff options
| author | Sam Yaple <sam@yaple.net> | 2015-07-23 17:19:44 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-07-23 18:20:42 +0000 |
| commit | 3b30760e2d0bbc7864e54b5756be2bf2431a221d (patch) | |
| tree | 473aa8e8b2dbaaed0729c6462c3f40f5bf4e95c9 /ansible | |
| parent | 63035f7ce428188a5c667ccf273a5f91e75f0ea5 (diff) | |
| download | kolla-3b30760e2d0bbc7864e54b5756be2bf2431a221d.tar.gz kolla-3b30760e2d0bbc7864e54b5756be2bf2431a221d.zip | |
Fix compute permissions and start params
neutron-server was not properly using ml2_conf.ini
nova did not have ovs utils, and it had incorrect libvirt permissions
Change-Id: I43d2110d0b5fc1940d887dace95787e1ebbe142d
Partitially-Implements: blueprint ansible-service
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/neutron/templates/metadata_agent.ini.j2 | 14 | ||||
| -rw-r--r-- | ansible/roles/neutron/templates/neutron.conf.j2 | 15 | ||||
| -rw-r--r-- | ansible/roles/nova/tasks/start.yml | 4 |
3 files changed, 19 insertions, 14 deletions
diff --git a/ansible/roles/neutron/templates/metadata_agent.ini.j2 b/ansible/roles/neutron/templates/metadata_agent.ini.j2 index cce556950..39ee0e4bc 100644 --- a/ansible/roles/neutron/templates/metadata_agent.ini.j2 +++ b/ansible/roles/neutron/templates/metadata_agent.ini.j2 @@ -10,17 +10,3 @@ user_domain_id = default project_name = service username = neutron password = {{ neutron_keystone_password }} - -nova_url = http://{{ kolla_internal_address }}:{{ nova_api_port }}/v2 -notify_nova_on_port_data_changes = True -notify_nova_on_port_status_change = True - -[nova] -auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }} -auth_plugin = password -project_domain_id = default -user_domain_id = default -region_name = {{ openstack_region_name }} -project_name = service -username = nova -password = {{ nova_keystone_password }} diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2 index 8c9961fd6..7d0313d1f 100644 --- a/ansible/roles/neutron/templates/neutron.conf.j2 +++ b/ansible/roles/neutron/templates/neutron.conf.j2 @@ -15,6 +15,21 @@ allow_overlapping_ips = true core_plugin = ml2 service_plugins = router + +nova_url = http://{{ kolla_internal_address }}:{{ nova_api_port }}/v2 +notify_nova_on_port_data_changes = True +notify_nova_on_port_status_change = True + +[nova] +auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }} +auth_plugin = password +project_domain_id = default +user_domain_id = default +region_name = {{ openstack_region_name }} +project_name = service +username = nova +password = {{ nova_keystone_password }} + [oslo_messaging_rabbit] rabbit_host = {{ kolla_internal_address }} rabbit_userid = {{ rabbitmq_user }} diff --git a/ansible/roles/nova/tasks/start.yml b/ansible/roles/nova/tasks/start.yml index 1d1c92356..ebe17a16e 100644 --- a/ansible/roles/nova/tasks/start.yml +++ b/ansible/roles/nova/tasks/start.yml @@ -10,6 +10,7 @@ container_volumes: - "/run:/run" - "/lib/modules:/lib/modules:ro" + - "/var/lib/nova/instances" when: inventory_hostname in groups['compute'] - include: ../../start.yml @@ -70,8 +71,11 @@ KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" container_image: "{{ docker_nova_compute_image_full }}" container_name: "nova_compute" + container_privileged: "True" container_volumes: - "{{ node_config_directory }}/nova-compute/:/opt/kolla/nova-compute/:ro" - "/run:/run" - "/lib/modules:/lib/modules:ro" + container_volumes_from: + - "nova_libvirt" when: inventory_hostname in groups['compute'] |