diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-21 00:50:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-21 00:50:01 +0000 |
| commit | b11421166cfb6ec9815b8badc1e9150cacebf02a (patch) | |
| tree | df18f0b599aaaf9e19e3a0202dcd55cec3b528df /docker/nova/nova-compute | |
| parent | d3756de84cc4556d964f3eae4028d7c9e68b9e12 (diff) | |
| parent | ef971bff5135b88e3451eb451418327e672f6d8b (diff) | |
| download | kolla-b11421166cfb6ec9815b8badc1e9150cacebf02a.tar.gz kolla-b11421166cfb6ec9815b8badc1e9150cacebf02a.zip | |
Merge "Fix permissions to /var/lib/nova/"
Diffstat (limited to 'docker/nova/nova-compute')
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/nova/nova-compute/extend_start.sh | 9 | ||||
| -rw-r--r-- | docker/nova/nova-compute/nova_compute_sudoers | 1 |
3 files changed, 16 insertions, 0 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 029a435c7..aad9c8ba8 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -50,6 +50,12 @@ RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements {% endif %} +COPY nova_compute_sudoers /etc/sudoers.d/nova_compute_sudoers +COPY extend_start.sh /usr/local/bin/kolla_extend_start +RUN chmod 755 /usr/local/bin/kolla_extend_start \ + && chmod 750 /etc/sudoers.d \ + && chmod 440 /etc/sudoers.d/nova_compute_sudoers + {{ include_footer }} USER nova diff --git a/docker/nova/nova-compute/extend_start.sh b/docker/nova/nova-compute/extend_start.sh new file mode 100644 index 000000000..084e76a19 --- /dev/null +++ b/docker/nova/nova-compute/extend_start.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases +# of the KOLLA_BOOTSTRAP variable being set, including empty. +if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then + sudo chown nova: /var/lib/nova/ + mkdir /var/lib/nova/instances + exit 0 +fi diff --git a/docker/nova/nova-compute/nova_compute_sudoers b/docker/nova/nova-compute/nova_compute_sudoers new file mode 100644 index 000000000..a7fb7b864 --- /dev/null +++ b/docker/nova/nova-compute/nova_compute_sudoers @@ -0,0 +1 @@ +%kolla ALL=(root) NOPASSWD: /usr/bin/chown nova\: /var/lib/nova/, /bin/chown nova\: /var/lib/nova/ |