Commit 5f945446 authored by Petras, Randy's avatar Petras, Randy
Browse files

removing redundancies

parent a554f56a

.gitlab-ci.yml

+9 −9
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ before_script: 
    - source docker-terraform.sh

    - func_rse_docker_cleanup

    - sudo rm -rf ${TF_ROOT}/.terraform || true

    - pwd

    - ls

    #- pwd

    #- ls

    - mv ${SSH_KEY} ${TF_ROOT}/ssh-key

    - chmod 600 ${TF_ROOT}/ssh-key

    - ssh-keygen -y -f ${TF_ROOT}/ssh-key > ${TF_ROOT}/ssh-key.pub
@@ -63,10 +63,10 @@ validate: 
plan:

    stage: build

    script:

    - mv ${TFVARS_FILE} ${TF_ROOT}/terraform.tfvars

    - mv ${SSH_KEY} ${TF_ROOT}/ssh-key

    - chmod 600 ${TF_ROOT}/ssh-key

    - ssh-keygen -y -f ./ssh-key > ./ssh-key.pub

    #- mv ${TFVARS_FILE} ${TF_ROOT}/terraform.tfvars

    #- mv ${SSH_KEY} ${TF_ROOT}/ssh-key

    #- chmod 600 ${TF_ROOT}/ssh-key

    #- ssh-keygen -y -f ./ssh-key > ./ssh-key.pub

    - docker_terraform init

    - docker_terraform_with_openstack "plan -var=ssh_key_file=ssh-key"

    - docker_terraform_with_openstack plan-json
@@ -82,9 +82,9 @@ plan: 
apply:

    stage: deploy

    script:

    - mv ${SSH_KEY} ${TF_ROOT}/ssh-key

    - chmod 600 ${TF_ROOT}/ssh-key

    - ssh-keygen -y -f ./ssh-key > ./ssh-key.pub

    #- mv ${SSH_KEY} ${TF_ROOT}/ssh-key

    #- chmod 600 ${TF_ROOT}/ssh-key

    #- ssh-keygen -y -f ./ssh-key > ./ssh-key.pub

    - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D8FF8E1F7DF8B07E

    - docker_terraform init

    - docker_terraform_with_openstack apply