diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-23 18:57:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-23 18:57:35 +0000 |
| commit | c0a72cefb31d06b7617c667278365916dd25e0da (patch) | |
| tree | 38313a4a886cc3b81afb2e7b8820e22bdd0acfeb /docker | |
| parent | 99995d7ae3eabdee05dd0825e53c198c72f37e9c (diff) | |
| parent | 3b30760e2d0bbc7864e54b5756be2bf2431a221d (diff) | |
| download | kolla-c0a72cefb31d06b7617c667278365916dd25e0da.tar.gz kolla-c0a72cefb31d06b7617c667278365916dd25e0da.zip | |
Merge "Fix compute permissions and start params"
Diffstat (limited to 'docker')
4 files changed, 11 insertions, 3 deletions
diff --git a/docker/centos/binary/nova/nova-compute/Dockerfile b/docker/centos/binary/nova/nova-compute/Dockerfile index 6cdd27fbe..754704ba5 100644 --- a/docker/centos/binary/nova/nova-compute/Dockerfile +++ b/docker/centos/binary/nova/nova-compute/Dockerfile @@ -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 diff --git a/docker/common/neutron/neutron-server/config-external.sh b/docker/common/neutron/neutron-server/config-external.sh index c8558ecca..574923067 100755 --- a/docker/common/neutron/neutron-server/config-external.sh +++ b/docker/common/neutron/neutron-server/config-external.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" diff --git a/docker/common/neutron/neutron-server/start.sh b/docker/common/neutron/neutron-server/start.sh index 7df950e57..97317c05b 100755 --- a/docker/common/neutron/neutron-server/start.sh +++ b/docker/common/neutron/neutron-server/start.sh @@ -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 diff --git a/docker/common/nova/nova-libvirt/start.sh b/docker/common/nova/nova-libvirt/start.sh index 00d7046d1..58ad58cb0 100755 --- a/docker/common/nova/nova-libvirt/start.sh +++ b/docker/common/nova/nova-libvirt/start.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 |