diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-23 15:01:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-23 15:01:58 +0000 |
| commit | 6b4e726bae07318417c69b490d4e0ad15230c7c1 (patch) | |
| tree | 1104d8872fa30395c49995cc0dd6a1a770652211 /docker/nova/nova-base | |
| parent | 5bf932c7b8e981a1df544c568dcbd186d790ab14 (diff) | |
| parent | ede53b1dcbd475aa0dff339ee8dffaa9008247a9 (diff) | |
| download | kolla-6b4e726bae07318417c69b490d4e0ad15230c7c1.tar.gz kolla-6b4e726bae07318417c69b490d4e0ad15230c7c1.zip | |
Merge "Remove duplicate code in nova extend_start.sh"
Diffstat (limited to 'docker/nova/nova-base')
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/nova/nova-base/extend_start.sh | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index abf8050b4..db46bc7cf 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -56,6 +56,8 @@ RUN chmod 750 /etc/sudoers.d \ {% endif %} COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start + +RUN touch /usr/local/bin/kolla_nova_extend_start \ + && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_nova_extend_start RUN usermod -a -G kolla nova diff --git a/docker/nova/nova-base/extend_start.sh b/docker/nova/nova-base/extend_start.sh index 11b4b95d6..31ac31e4b 100644 --- a/docker/nova/nova-base/extend_start.sh +++ b/docker/nova/nova-base/extend_start.sh @@ -6,3 +6,5 @@ fi if [[ $(stat -c %a /var/log/kolla/nova) != "755" ]]; then chmod 755 /var/log/kolla/nova fi + +source /usr/local/bin/kolla_nova_extend_start |