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
This commit is contained in:
Sam Yaple 2015-07-23 17:19:44 +00:00
parent 63035f7ce4
commit 3b30760e2d
7 changed files with 30 additions and 17 deletions
ansible/roles
docker
centos/binary/nova/nova-compute
common
neutron/neutron-server
nova/nova-libvirt

@ -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 }}

@ -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 }}

@ -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']

@ -2,6 +2,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-nova-compute \
openvswitch \
sysfsutils && yum clean all
COPY config-nova-compute.sh /opt/kolla/config-nova-compute.sh

@ -9,8 +9,7 @@ if [[ -f "$SOURCE" ]]; then
chmod 0644 $TARGET
fi
# TODO(SamYaple): Remove this from neutron-server once bootstrap is understood
SOURCE="/opt/kolla/neutron-openvswitch-agent/ml2_conf.ini"
SOURCE="/opt/kolla/neutron-server/ml2_conf.ini"
TARGET="/etc/neutron/plugins/ml2/ml2_conf.ini"
OWNER="neutron"

@ -2,7 +2,7 @@
set -o errexit
CMD="/usr/bin/neutron-server"
ARGS="--config-file /etc/neutron/neutron.conf"
ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini"
# Loading common functions.
source /opt/kolla/kolla-common.sh

@ -10,4 +10,12 @@ source /opt/kolla/kolla-common.sh
# Config-internal script exec out of this function, it does not return here.
set_configs
# TODO(SamYaple): Unify this with config-internal. Tweak libvirt.conf rather
# than change permissions.
# Fix permissions for libvirt
if [[ -c /dev/kvm ]]; then
chmod 660 /dev/kvm
chown root:kvm /dev/kvm
fi
exec $CMD $ARGS