diff options
| author | Asha Akkiangady <aakkiang@redhat.com> | 2014-11-07 12:38:38 -0500 |
|---|---|---|
| committer | Asha Akkiangady <aakkiang@redhat.com> | 2014-11-07 12:51:06 -0500 |
| commit | 60e93f903f6557ca12ccada094369750981ddc87 (patch) | |
| tree | 99808b321097c648c7543275a6707a6815c4e098 /tests | |
| parent | 56e7c952140f39004903b0bd70beb2a67e8b3034 (diff) | |
| download | pki-60e93f903f6557ca12ccada094369750981ddc87.tar.gz pki-60e93f903f6557ca12ccada094369750981ddc87.tar.xz pki-60e93f903f6557ca12ccada094369750981ddc87.zip | |
Removed pki_client_database_password param from the
clone install script.
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/dogtag/acceptance/quickinstall/rhcs-install-lib.sh | 6 | ||||
| -rwxr-xr-x | tests/dogtag/shared/rhcs-shared.sh | 22 |
2 files changed, 7 insertions, 21 deletions
diff --git a/tests/dogtag/acceptance/quickinstall/rhcs-install-lib.sh b/tests/dogtag/acceptance/quickinstall/rhcs-install-lib.sh index 21c91eba7..84e8b10a3 100755 --- a/tests/dogtag/acceptance/quickinstall/rhcs-install-lib.sh +++ b/tests/dogtag/acceptance/quickinstall/rhcs-install-lib.sh @@ -11,7 +11,7 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # # Authors: Asha Akkiangady <aakkiang@redhat.com> -# Saili Pandit <saipandi@redhat.com> +# Saili Pandit <saipandi@redhat.com> # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # # Copyright (c) 2013 Red Hat, Inc. All rights reserved. @@ -629,7 +629,6 @@ rhcs_install_cloneCA() echo "pki_clone_replication_clone_port=$(eval echo \$CLONE_CA${number}_LDAP_PORT)" >> $INSTANCECFG echo "pki_clone_repicate_schema=$REPLICATE_SCHEMA" >> $INSTANCECFG echo "pki_clone_replication_security=$REPLICATION_SEC" >> $INSTANCECFG - echo "pki_client_database_password=$(eval echo \$CLONE${number}_CERTDB_DIR_PASSWORD)" >> $INSTANCECFG echo "pki_clone_uri=https://$master_hostname:$(eval echo \$${CA}_SECURE_PORT)" >> $INSTANCECFG echo "pki_client_dir=$CLIENT_DIR" >> $INSTANCECFG @@ -878,7 +877,6 @@ rhcs_install_cloneKRA(){ echo "pki_clone_replication_master_port=$(eval echo \$${MASTER_KRA}_LDAP_PORT)" >> $INSTANCECFG echo "pki_clone_replication_clone_port=$(eval echo \$CLONE_KRA${number}_LDAP_PORT)" >> $INSTANCECFG echo "pki_clone_replication_security=$REPLICATION_SEC" >> $INSTANCECFG - echo "pki_client_database_password=$(eval echo \$CLONE${number}_CERTDB_DIR_PASSWORD)" >> $INSTANCECFG echo "pki_client_dir=$CLIENT_DIR" >> $INSTANCECFG echo "[KRA]" >> $INSTANCECFG @@ -979,7 +977,6 @@ rhcs_install_cloneOCSP(){ echo "pki_clone_replication_clone_port=$(eval echo \$CLONE_OCSP${number}_LDAP_PORT)" >> $INSTANCECFG echo "pki_clone_repicate_schema=$REPLICATE_SCHEMA" >> $INSTANCECFG echo "pki_clone_replication_security=$REPLICATION_SEC" >> $INSTANCECFG - echo "pki_client_database_password=$(eval echo \$CLONE${number}_CERTDB_DIR_PASSWORD)" >> $INSTANCECFG echo "pki_clone_uri=https://$master_hostname:$(eval echo \$${CA}_SECURE_PORT)" >> $INSTANCECFG echo "pki_client_dir=$CLIENT_DIR" >> $INSTANCECFG echo "pki_issuing_ca=https://$(hostname):$(eval echo \$CLONE_CA${number}_SECURE_PORT)" >> $INSTANCECFG @@ -1086,7 +1083,6 @@ rhcs_install_cloneTKS(){ echo "pki_clone_replication_clone_port=$(eval echo \$CLONE_TKS${number}_LDAP_PORT)" >> $INSTANCECFG echo "pki_clone_repicate_schema=$REPLICATE_SCHEMA" >> $INSTANCECFG echo "pki_clone_replication_security=$REPLICATION_SEC" >> $INSTANCECFG - echo "pki_client_database_password=$(eval echo \$CLONE${number}_CERTDB_DIR_PASSWORD)" >> $INSTANCECFG echo "pki_clone_uri=https://$master_hostname:$(eval echo \$${CA}_SECURE_PORT)" >> $INSTANCECFG echo "pki_client_dir=$CLIENT_DIR" >> $INSTANCECFG echo "pki_ds_password=$(eval echo \$CLONE${number}_LDAP_ROOTDNPWD)" >> $INSTANCECFG diff --git a/tests/dogtag/shared/rhcs-shared.sh b/tests/dogtag/shared/rhcs-shared.sh index 4b5314965..d73dcc771 100755 --- a/tests/dogtag/shared/rhcs-shared.sh +++ b/tests/dogtag/shared/rhcs-shared.sh @@ -131,14 +131,9 @@ submit_instance_logs(){ # start RHCS instance # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ rhcs_start_instance(){ - INSTANCE_ID=$1 - echo $FLAVOR | grep "Fedora" - if [ $? -eq 0 ] ; then - rlLog "Executing: systemctl start pki-tomcatd@pki-tomcat.service" - systemctl start pki-tomcatd@pki-tomcat.service - else - service $INSTANCE_ID start - fi + TOMCAT_ID=$1 + rlLog "Executing: systemctl start pki-tomcatd@$TOMCAT_ID.service" + systemctl start pki-tomcatd@$TOMCAT_ID.service sleep 60 } @@ -150,14 +145,9 @@ rhcs_start_instance(){ # stop RHCS instance # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ rhcs_stop_instance(){ - INSTANCE_ID=$1 - echo $FLAVOR | grep "Fedora" - if [ $? -eq 0 ] ; then - rlLog "Executing: systemctl stop pki-tomcatd@pki-tomcat.service" - systemctl stop pki-tomcatd@pki-tomcat.service - else - service $INSTANCE_ID stop - fi + TOMCAT_ID=$1 + rlLog "Executing: systemctl stop pki-tomcatd@$TOMCAT_ID.service" + systemctl stop pki-tomcatd@$TOMCAT_ID.service sleep 60 } |