Suds install

aws/deploy.sh

@@ -62,27 +62,6 @@ fi
 if [[ -f sls.crt ]]; then
   chmod 600 sls.crt
 fi
-# Download UDS certificate
-cd $GIT_REPO_HOME
-if [[ ${UDS_PUB_CERT_URL,,} =~ ^https? ]]; then
-  log "Downloading UDS certificate from HTTP URL"
-  wget "$UDS_PUB_CERT_URL" -O uds.crt
-elif [[ ${UDS_PUB_CERT_URL,,} =~ ^s3 ]]; then
-  log "Downloading UDS certificate from S3 URL"
-  aws s3 cp "$UDS_PUB_CERT_URL" uds.crt --region $DEPLOY_REGION
-  ret=$?
-        if [ $ret -ne 0 ]; then
-        aws s3 cp "$UDS_PUB_CERT_URL" uds.crt --region us-east-1
-        ret=$?
-        if [ $ret -ne 0 ]; then
-            log "Invalid UDS License URL"
-        fi
-        fi
-fi
-if [[ -f uds.crt ]]; then
-  chmod 600 uds.crt
-fi
-
 ### Read License File & Retrive SLS hostname and host id
 if [[ -n "$MAS_LICENSE_URL" ]]; then
   line=$(head -n 1 entitlement.lic)
@@ -520,6 +499,7 @@ fi
 if [[ (-z $UDS_API_KEY) || (-z $UDS_ENDPOINT_URL) || (-z $UDS_PUB_CERT_URL) ]]; then
   # Deploy UDS
   log "==== UDS deployment started ===="
+  export OCP_FIPS_ENABLED=true
   export ROLE_NAME=uds && ansible-playbook ibm.mas_devops.run_role
   log "==== UDS deployment completed ===="
 

aws/master-cft/byol-existing-ocp/cft-mas-core-dev.yaml

@@ -102,22 +102,6 @@ Parameters:
       retrieved from the 'ca.crt' file in the 'mas-*-sls-cfg' secret in the MAS
       core namespace.
     Type: String
-  UDSEndpointUrl:
-    Description: >-
-      Enter the endpoint URL that you retrieved from the 'uds-endpoint'
-      OpenShift route in the ibm-common-services namespace. URL should not have slash (/) at the end.
-    Type: String
-  UDSAPIKey:
-    Description: >-
-      Enter the service's API key that you retrieved from the 'uds-api-key'
-      secret in the ibm-common-services namespace.
-    Type: String
-  UDSPublicCertificateUrl:
-    Description: >-
-      Enter the HTTP or S3 location of the service's public certificate that you
-      retrieved from the 'ca-bundle.pem' file in the 'mas-*-uds-cfg' secret in
-      the MAS core namespace.
-    Type: String
   EmailNotification:
     Description: >-
       Indicate whether you want to receive emails that contain the connection
@@ -258,14 +242,6 @@ Metadata:
           - SLSEndpointUrl
           - SLSRegistrationKey
           - SLSPublicCertificateUrl
-      - Label:
-          default: >-
-            Existing User Data Services connection details (leave this section
-            empty to create a new UDS instance)
-        Parameters:
-          - UDSEndpointUrl
-          - UDSAPIKey
-          - UDSPublicCertificateUrl
       - Label:
           default: Email notification
         Parameters:
@@ -631,7 +607,7 @@ Resources:
             - 'git clone https://github.com/ibm-mas/ansible-devops.git;'
             - cd ansible-devops;
             - rm -rf multicloud-bootstrap 1>/dev/null 2>&1;
-            - 'git clone -b mas810-alpha https://github.com/ibm-mas/multicloud-bootstrap.git;'
+            - 'git clone -b SUDS_install https://github.com/ibm-mas/multicloud-bootstrap.git;'
             - cd multicloud-bootstrap;
             - 'find . -type f -name "*.sh" -exec chmod +x {} \;;'
             - ./init.sh "aws" "
@@ -663,13 +639,7 @@ Resources:
             - !Ref SLSRegistrationKey
             - ''' '''
             - !Ref SLSPublicCertificateUrl
-            - ''' '''
-            - !Ref UDSEndpointUrl
-            - ''' '''
-            - !Ref UDSAPIKey
-            - ''' '''
-            - !Ref UDSPublicCertificateUrl
-            - ''' '''
+            - ''' '''' '''' '''' '''
             - !Ref MASManageDBUser
             - ''' '''
             - !Ref MASManageDBPassword

aws/master-cft/byol-existing-ocp/cft-mas-core.yaml

@@ -102,22 +102,6 @@ Parameters:
       retrieved from the 'ca.crt' file in the 'mas-*-sls-cfg' secret in the MAS
       core namespace.
     Type: String
-  UDSEndpointUrl:
-    Description: >-
-      Enter the endpoint URL that you retrieved from the 'uds-endpoint'
-      OpenShift route in the ibm-common-services namespace. URL should not have slash (/) at the end.
-    Type: String
-  UDSAPIKey:
-    Description: >-
-      Enter the service's API key that you retrieved from the 'uds-api-key'
-      secret in the ibm-common-services namespace.
-    Type: String
-  UDSPublicCertificateUrl:
-    Description: >-
-      Enter the HTTP or S3 location of the service's public certificate that you
-      retrieved from the 'ca-bundle.pem' file in the 'mas-*-uds-cfg' secret in
-      the MAS core namespace.
-    Type: String
   EmailNotification:
     Description: >-
       Indicate whether you want to receive emails that contain the connection
@@ -258,14 +242,6 @@ Metadata:
           - SLSEndpointUrl
           - SLSRegistrationKey
           - SLSPublicCertificateUrl
-      - Label:
-          default: >-
-            Existing User Data Services connection details (leave this section
-            empty to create a new UDS instance)
-        Parameters:
-          - UDSEndpointUrl
-          - UDSAPIKey
-          - UDSPublicCertificateUrl
       - Label:
           default: Email notification
         Parameters:
@@ -666,13 +642,7 @@ Resources:
             - !Ref SLSRegistrationKey
             - ''' '''
             - !Ref SLSPublicCertificateUrl
-            - ''' '''
-            - !Ref UDSEndpointUrl
-            - ''' '''
-            - !Ref UDSAPIKey
-            - ''' '''
-            - !Ref UDSPublicCertificateUrl
-            - ''' '''
+            - ''' '''' '''' '''' '''
             - !Ref MASManageDBUser
             - ''' '''
             - !Ref MASManageDBPassword

aws/master-cft/byol-ipi/cft-mas-core-dev.yaml

@@ -108,23 +108,6 @@ Parameters:
       retrieved from the 'ca.crt' file in the 'mas-*-sls-cfg' secret in the MAS
       core namespace.
     Type: String
-  UDSEndpointUrl:
-    Description: >-
-      Enter the endpoint URL that you retrieved from the 'uds-endpoint'
-      OpenShift route in the ibm-common-services namespace. URL should not have
-      slash (/) at the end.
-    Type: String
-  UDSAPIKey:
-    Description: >-
-      Enter the service's API key that you retrieved from the 'uds-api-key'
-      secret in the ibm-common-services namespace.
-    Type: String
-  UDSPublicCertificateUrl:
-    Description: >-
-      Enter the HTTP or S3 location of the service's public certificate that you
-      retrieved from the 'ca-bundle.pem' file in the 'mas-*-uds-cfg' secret in
-      the MAS core namespace.
-    Type: String
   EmailNotification:
     Description: >-
       Indicate whether you want to receive emails that contain the connection
@@ -264,14 +247,6 @@ Metadata:
           - SLSEndpointUrl
           - SLSRegistrationKey
           - SLSPublicCertificateUrl
-      - Label:
-          default: >-
-            Existing User Data Services connection details (leave this section
-            empty to create a new UDS instance)
-        Parameters:
-          - UDSEndpointUrl
-          - UDSAPIKey
-          - UDSPublicCertificateUrl
       - Label:
           default: Email notification
         Parameters:
@@ -648,7 +623,7 @@ Resources:
             - 'git clone https://github.com/ibm-mas/ansible-devops.git;'
             - cd ansible-devops;
             - rm -rf multicloud-bootstrap 1>/dev/null 2>&1;
-            - 'git clone -b mas810-alpha https://github.com/ibm-mas/multicloud-bootstrap.git;'
+            - 'git clone -b SUDS_install https://github.com/ibm-mas/multicloud-bootstrap.git;'
             - cd multicloud-bootstrap;
             - 'find . -type f -name "*.sh" -exec chmod +x {} \;;'
             - ./init.sh "aws" "
@@ -684,13 +659,7 @@ Resources:
             - !Ref SLSRegistrationKey
             - ''' '''
             - !Ref SLSPublicCertificateUrl
-            - ''' '''
-            - !Ref UDSEndpointUrl
-            - ''' '''
-            - !Ref UDSAPIKey
-            - ''' '''
-            - !Ref UDSPublicCertificateUrl
-            - ''' '''
+            - ''' '''' '''' '''' '''
             - !Ref MASManageDBUser
             - ''' '''
             - !Ref MASManageDBPassword

aws/master-cft/byol-ipi/cft-mas-core.yaml

@@ -108,23 +108,6 @@ Parameters:
       retrieved from the 'ca.crt' file in the 'mas-*-sls-cfg' secret in the MAS
       core namespace.
     Type: String
-  UDSEndpointUrl:
-    Description: >-
-      Enter the endpoint URL that you retrieved from the 'uds-endpoint'
-      OpenShift route in the ibm-common-services namespace. URL should not have
-      slash (/) at the end.
-    Type: String
-  UDSAPIKey:
-    Description: >-
-      Enter the service's API key that you retrieved from the 'uds-api-key'
-      secret in the ibm-common-services namespace.
-    Type: String
-  UDSPublicCertificateUrl:
-    Description: >-
-      Enter the HTTP or S3 location of the service's public certificate that you
-      retrieved from the 'ca-bundle.pem' file in the 'mas-*-uds-cfg' secret in
-      the MAS core namespace.
-    Type: String
   EmailNotification:
     Description: >-
       Indicate whether you want to receive emails that contain the connection
@@ -264,14 +247,6 @@ Metadata:
           - SLSEndpointUrl
           - SLSRegistrationKey
           - SLSPublicCertificateUrl
-      - Label:
-          default: >-
-            Existing User Data Services connection details (leave this section
-            empty to create a new UDS instance)
-        Parameters:
-          - UDSEndpointUrl
-          - UDSAPIKey
-          - UDSPublicCertificateUrl
       - Label:
           default: Email notification
         Parameters:
@@ -688,13 +663,7 @@ Resources:
             - !Ref SLSRegistrationKey
             - ''' '''
             - !Ref SLSPublicCertificateUrl
-            - ''' '''
-            - !Ref UDSEndpointUrl
-            - ''' '''
-            - !Ref UDSAPIKey
-            - ''' '''
-            - !Ref UDSPublicCertificateUrl
-            - ''' '''
+            - ''' '''' '''' '''' '''
             - !Ref MASManageDBUser
             - ''' '''
             - !Ref MASManageDBPassword

aws/master-cft/byol-upi/cft-mas-core-dev.yaml

@@ -143,23 +143,6 @@ Parameters:
       retrieved from the 'ca.crt' file in the 'mas-*-sls-cfg' secret in the MAS
       core namespace.
     Type: String
-  UDSEndpointUrl:
-    Description: >-
-      Enter the endpoint URL that you retrieved from the 'uds-endpoint'
-      OpenShift route in the ibm-common-services namespace. URL should not have
-      slash (/) at the end.
-    Type: String
-  UDSAPIKey:
-    Description: >-
-      Enter the service's API key that you retrieved from the 'uds-api-key'
-      secret in the ibm-common-services namespace.
-    Type: String
-  UDSPublicCertificateUrl:
-    Description: >-
-      Enter the HTTP or S3 location of the service's public certificate that you
-      retrieved from the 'ca-bundle.pem' file in the 'mas-*-uds-cfg' secret in
-      the MAS core namespace.
-    Type: String
   EmailNotification:
     Description: >-
       Indicate whether you want to receive emails that contain the connection
@@ -306,14 +289,6 @@ Metadata:
           - SLSEndpointUrl
           - SLSRegistrationKey
           - SLSPublicCertificateUrl
-      - Label:
-          default: >-
-            Existing User Data Services connection details (leave this section
-            empty to create a new UDS instance)
-        Parameters:
-          - UDSEndpointUrl
-          - UDSAPIKey
-          - UDSPublicCertificateUrl
       - Label:
           default: Email notification
         Parameters:
@@ -653,7 +628,7 @@ Resources:
             - 'git clone https://github.com/ibm-mas/ansible-devops.git;'
             - cd ansible-devops;
             - rm -rf multicloud-bootstrap 1>/dev/null 2>&1;
-            - 'git clone -b mas810-alpha https://github.com/ibm-mas/multicloud-bootstrap.git;'
+            - 'git clone -b SUDS_install https://github.com/ibm-mas/multicloud-bootstrap.git;'
             - cd multicloud-bootstrap;
             - 'find . -type f -name "*.sh" -exec chmod +x {} \;;'
             - ./init.sh "aws" "
@@ -689,13 +664,7 @@ Resources:
             - !Ref SLSRegistrationKey
             - ''' '''
             - !Ref SLSPublicCertificateUrl
-            - ''' '''
-            - !Ref UDSEndpointUrl
-            - ''' '''
-            - !Ref UDSAPIKey
-            - ''' '''
-            - !Ref UDSPublicCertificateUrl
-            - ''' '''
+            - ''' '''' '''' '''' '''
             - !Ref MASManageDBUser
             - ''' '''
             - !Ref MASManageDBPassword

aws/master-cft/byol-upi/cft-mas-core.yaml

@@ -141,23 +141,6 @@ Parameters:
       retrieved from the 'ca.crt' file in the 'mas-*-sls-cfg' secret in the MAS
       core namespace.
     Type: String
-  UDSEndpointUrl:
-    Description: >-
-      Enter the endpoint URL that you retrieved from the 'uds-endpoint'
-      OpenShift route in the ibm-common-services namespace. URL should not have
-      slash (/) at the end.
-    Type: String
-  UDSAPIKey:
-    Description: >-
-      Enter the service's API key that you retrieved from the 'uds-api-key'
-      secret in the ibm-common-services namespace.
-    Type: String
-  UDSPublicCertificateUrl:
-    Description: >-
-      Enter the HTTP or S3 location of the service's public certificate that you
-      retrieved from the 'ca-bundle.pem' file in the 'mas-*-uds-cfg' secret in
-      the MAS core namespace.
-    Type: String
   EmailNotification:
     Description: >-
       Indicate whether you want to receive emails that contain the connection
@@ -304,14 +287,6 @@ Metadata:
           - SLSEndpointUrl
           - SLSRegistrationKey
           - SLSPublicCertificateUrl
-      - Label:
-          default: >-
-            Existing User Data Services connection details (leave this section
-            empty to create a new UDS instance)
-        Parameters:
-          - UDSEndpointUrl
-          - UDSAPIKey
-          - UDSPublicCertificateUrl
       - Label:
           default: Email notification
         Parameters:
@@ -691,13 +666,7 @@ Resources:
             - !Ref SLSRegistrationKey
             - ''' '''
             - !Ref SLSPublicCertificateUrl
-            - ''' '''
-            - !Ref UDSEndpointUrl
-            - ''' '''
-            - !Ref UDSAPIKey
-            - ''' '''
-            - !Ref UDSPublicCertificateUrl
-            - ''' '''
+            - ''' '''' '''' '''' '''
             - !Ref MASManageDBUser
             - ''' '''
             - !Ref MASManageDBPassword