summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Yang <bin.yang@windriver.com>2020-02-04 21:25:21 +0800
committerBin Yang <bin.yang@windriver.com>2020-02-04 21:25:21 +0800
commit2c84ff5d8932ddb2783fcdd2ea55536a2804f1b1 (patch)
tree9739987ff39e30ef8ae6eda58e88eeb9ae73c008
parent6d8aa821b9d11a466c65098849d6d518439fcdb0 (diff)
Fix openstack plugins https endpoint issue
Add cert files into assembly Change-Id: I36dad8186a7d191e53b8e69ac56765c187b02caa Issue-ID: MULTICLOUD-978 Signed-off-by: Bin Yang <bin.yang@windriver.com>
-rw-r--r--ocata/assembly.xml2
-rwxr-xr-xocata/run.sh2
-rw-r--r--pike/assembly.xml2
-rwxr-xr-xpike/run.sh2
-rw-r--r--starlingx/assembly.xml2
5 files changed, 8 insertions, 2 deletions
diff --git a/ocata/assembly.xml b/ocata/assembly.xml
index 1c69acd6..79e10c3b 100644
--- a/ocata/assembly.xml
+++ b/ocata/assembly.xml
@@ -32,6 +32,8 @@
<include>**/*.xsd</include>
<include>**/*.bpel</include>
<include>**/*.yml</include>
+ <include>**/*.crt</include>
+ <include>**/*.key</include>
</includes>
</fileSet>
<fileSet>
diff --git a/ocata/run.sh b/ocata/run.sh
index a1f44ed2..3de3780d 100755
--- a/ocata/run.sh
+++ b/ocata/run.sh
@@ -20,7 +20,7 @@ export PYTHONPATH=lib/share
#nohup python manage.py runserver 0.0.0.0:9006 2>&1 &
if [ ${SSL_ENABLED} = "true" ]; then
- nohup uwsgi --https :9006,ocata/pub/ssl/cert/cert.crt,ocata/pub/ssl/cert/cert.key --module ocata.wsgi --master --enable-threads --processes 4 &
+ nohup uwsgi --https :9006,ocata/pub/ssl/cert/cert.crt,ocata/pub/ssl/cert/cert.key,HIGH --module ocata.wsgi --master --enable-threads --processes 4 &
else
nohup uwsgi --http :9006 --module ocata.wsgi --master --enable-threads --processes 4 &
diff --git a/pike/assembly.xml b/pike/assembly.xml
index 420c6c49..650c234d 100644
--- a/pike/assembly.xml
+++ b/pike/assembly.xml
@@ -32,6 +32,8 @@
<include>**/*.xsd</include>
<include>**/*.bpel</include>
<include>**/*.yml</include>
+ <include>**/*.crt</include>
+ <include>**/*.key</include>
</includes>
</fileSet>
<fileSet>
diff --git a/pike/run.sh b/pike/run.sh
index 3822c8a5..c3c962ee 100755
--- a/pike/run.sh
+++ b/pike/run.sh
@@ -19,7 +19,7 @@ export PYTHONPATH=lib/share
#nohup python manage.py runserver 0.0.0.0:9007 2>&1 &
if [ ${SSL_ENABLED} = "true" ]; then
- nohup uwsgi --https :9007,pike/pub/ssl/cert/cert.crt,pike/pub/ssl/cert/cert.key --module pike.wsgi --master --enable-threads --processes 4 &
+ nohup uwsgi --https :9007,pike/pub/ssl/cert/cert.crt,pike/pub/ssl/cert/cert.key,HIGH --module pike.wsgi --master --enable-threads --processes 4 &
else
nohup uwsgi --http :9007 --module pike.wsgi --master --enable-threads --processes 4 &
diff --git a/starlingx/assembly.xml b/starlingx/assembly.xml
index 150083df..be7fb4a0 100644
--- a/starlingx/assembly.xml
+++ b/starlingx/assembly.xml
@@ -32,6 +32,8 @@
<include>**/*.xsd</include>
<include>**/*.bpel</include>
<include>**/*.yml</include>
+ <include>**/*.crt</include>
+ <include>**/*.key</include>
</includes>
</fileSet>
<fileSet>