This repository was archived by the owner on Nov 16, 2020. It is now read-only.
File tree Expand file tree Collapse file tree 5 files changed +1
-57
lines changed Expand file tree Collapse file tree 5 files changed +1
-57
lines changed Original file line number Diff line number Diff line change @@ -79,7 +79,7 @@ function set_base() {
7979
8080 log3 " installing package dependencies"
8181 tdnf install --installroot " ${rt} /" --refresh -y \
82- docker openjre8 python-pip
82+ docker
8383
8484 log3 " installing ${brprpl} root${reset} "
8585 cp -a " ${src} /root/." " ${rt} /"
Original file line number Diff line number Diff line change 77 "type" : " shell" ,
88 "script" : " scripts/provisioners/filesystem_provisioning.sh"
99 },
10- {
11- "type" : " shell" ,
12- "script" : " scripts/provisioners/provision_govc.sh"
13- },
1410 {
1511 "type" : " file" ,
1612 "source" : " ../bin/ovfenv" ,
Original file line number Diff line number Diff line change 1414# limitations under the License.
1515set -euf -o pipefail
1616
17- echo " installing pyyaml"
18- pip install pyyaml
19-
20- echo " installing - docker compose"
21- curl -o /usr/local/bin/docker-compose -L' #' " https://github.com/docker/compose/releases/download/1.11.1/docker-compose-$( uname -s) -$( uname -m) "
22- chmod +x /usr/local/bin/docker-compose
23-
2417echo " installing - jq"
2518curl -o /usr/bin/jq -L' #' " https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64"
2619chmod +x /usr/bin/jq
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -49,18 +49,6 @@ function checkKey {
4949 openssl rsa -in " $file " -check
5050}
5151
52- # Create java keystore for Admiral
53- function createKeystore() {
54- if [ -f " $jks " ]; then
55- echo " removing existing keystore $jks and recreating"
56- rm -f $jks
57- else
58- echo " no keystore present, creating"
59- fi
60-
61- $keytool -import -noprompt -v -trustcacerts -alias selfsignedca -file " $1 " -keystore $jks -keypass changeit -storepass changeit
62- }
63-
6452# Generate self signed cert
6553function genCert {
6654 echo " Generating self signed certificate"
@@ -88,9 +76,6 @@ function genCert {
8876 cat $ca_cert >> $cert
8977
9078 echo " self-signed" > $flag
91-
92- echo " creating java keystore with self-signed CA"
93- createKeystore $ca_cert
9479}
9580
9681function secure {
@@ -110,8 +95,6 @@ function secure {
11095
11196 echo " customized" > $flag
11297
113- echo " creating java keystore with user provided cert"
114- createKeystore $cert
11598 return
11699 fi
117100
You can’t perform that action at this time.
0 commit comments