diff options
| author | xiabing.yao <yao.xiabing@99cloud.net> | 2015-08-06 17:32:56 +0800 |
|---|---|---|
| committer | xiabing.yao <yao.xiabing@99cloud.net> | 2015-08-06 22:27:28 +0800 |
| commit | b11321cedcfca8c394eefffae9589eba9b470fa2 (patch) | |
| tree | 14a01751c09f58588daa1cf2206126b8a24b53e8 /docker/common/keystone | |
| parent | 20deecda98f457fdff7ae5bb41fcdd3f0ff5362f (diff) | |
| download | kolla-b11321cedcfca8c394eefffae9589eba9b470fa2.tar.gz kolla-b11321cedcfca8c394eefffae9589eba9b470fa2.zip | |
update config-external.sh in galera,keystone,rabbitmq,swift
Use variables like SOURCE,TARGET in config-external.sh, so
it will easy to modify in future.
Closes-Bug: #1485710
Change-Id: I3880a2cbca8a80d36e84a797fcfb943e43b88bd5
Diffstat (limited to 'docker/common/keystone')
| -rw-r--r-- | docker/common/keystone/config-external.sh | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/docker/common/keystone/config-external.sh b/docker/common/keystone/config-external.sh index 54df0f3a1..9742e3b12 100644 --- a/docker/common/keystone/config-external.sh +++ b/docker/common/keystone/config-external.sh @@ -1,13 +1,18 @@ #!/bin/bash +SOURCE="/opt/kolla/keystone/keystone.conf" +TARGET="/etc/keystone/keystone.conf" +SOURCE_WSGI="/opt/kolla/keystone/wsgi-keystone.conf" +TARGET_WSGI="/etc/httpd/conf.d/wsgi-keystone.conf" +OWNER="keystone" -if [[ -f /opt/kolla/keystone/wsgi-keystone.conf ]]; then - cp /opt/kolla/keystone/wsgi-keystone.conf /etc/httpd/conf.d/ - chown root:keystone /etc/httpd/conf.d/wsgi-keystone.conf - chmod 0644 /etc/httpd/conf.d/wsgi-keystone.conf +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0644 $TARGET fi -if [[ -f /opt/kolla/keystone/keystone.conf ]]; then - cp /opt/kolla/keystone/keystone.conf /etc/keystone/keystone.conf - chown keystone: /etc/keystone/keystone.conf - chmod 0644 /etc/keystone/keystone.conf +if [[ -f "$SOURCE_WSGI" ]]; then + cp $SOURCE_WSGI $TARGET_WSGI + chown ${OWNER}: $TARGET_WSGI + chmod 0644 $TARGET_WSGI fi |