Commit 4c0b85a8 authored by semantic-release-bot's avatar semantic-release-bot
Browse files

chore(release): 1.2.1 [skip ci] 

## [1.2.1](https://gitlab.com/to-be-continuous/ansible/compare/1.2.0...1.2.1) (2021-07-08)

### Bug Fixes

* conflict between vault and scoped vars ([689fc86c](https://gitlab.com/to-be-continuous/ansible/commit/689fc86cdeebbe0a752f792d238acadcb996e438))
parent 5daea244

README.md

+7 −7
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ In order to include this template in your project, add the following to your `gi 
```yaml

include:

  - project: 'to-be-continuous/ansible'

    ref: '1.2.0'

    ref: '1.2.1'

    file: '/templates/gitlab-ci-ansible.yml'

    

variables:
@@ -243,7 +243,7 @@ The `gitlab-ci` in this example, will show use how to configure the template to 
```yaml

include:

  - project: 'to-be-continuous/ansible'

    ref: '1.2.0'

    ref: '1.2.1'

    file: '/templates/gitlab-ci-ansible.yml'

    

variables:
@@ -321,10 +321,10 @@ In the `.gitlab-ci.yml` add the docker template to build your image: 
```yaml

include:

  - project: 'to-be-continuous/ansible'

    ref: '1.2.0'

    ref: '1.2.1'

    file: '/templates/gitlab-ci-ansible.yml'

  - project: 'to-be-continuous/docker'

    ref: '1.2.0'

    ref: '1.2.1'

    file: '/templates/gitlab-ci-docker.yml'

    

variables:
@@ -365,7 +365,7 @@ Add this `.gitlab-ci.yml` in the repository of your application project (you wil 
```yaml

include:

  - project: 'to-be-continuous/ansible'

    ref: '1.2.0'

    ref: '1.2.1'

    file: '/templates/gitlab-ci-ansible.yml'

    

variables:
@@ -440,11 +440,11 @@ With: 
include:

  # main template

  - project: 'to-be-continuous/ansible'

    ref: '1.2.0'

    ref: '1.2.1'

    file: '/templates/gitlab-ci-ansible.yml'

  # Vault variant

  - project: 'to-be-continuous/ansible'

    ref: '1.2.0'

    ref: '1.2.1'

    file: '/templates/gitlab-ci-ansible-vault.yml'



variables:

templates/gitlab-ci-ansible-vault.yml

+1 −1
Original line number Diff line number Diff line
@@ -9,6 +9,6 @@ variables: 
.ansible-base:

  services:

    - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"

      command: ["--service", "ansible", "1.2.0" ]

      command: ["--service", "ansible", "1.2.1" ]

    - name: "$CI_REGISTRY/to-be-continuous/tools/vault-secrets-provider:master"

      alias: "vault-secrets-provider"

templates/gitlab-ci-ansible.yml

+2 −2
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ stages: 
    fi

  }



  if [[ -z "$TEMPLATE_CHECK_UPDATE_DISABLED" ]]; then check_for_update ansible "1.2.0"; fi

  if [[ -z "$TEMPLATE_CHECK_UPDATE_DISABLED" ]]; then check_for_update ansible "1.2.1"; fi

  unscope_variables

  eval_all_secrets
@@ -419,7 +419,7 @@ stages: 
.ansible-base:

  services:

    - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"

      command: ["--service", "ansible", "1.2.0" ]

      command: ["--service", "ansible", "1.2.1" ]

  before_script:

    - *ansible-scripts

    - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"