diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml index 4b8bc4fc9..bd8f127b1 100644 --- a/.github/workflows/jekyll-gh-pages.yml +++ b/.github/workflows/jekyll-gh-pages.yml @@ -27,16 +27,16 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup Pages - uses: actions/configure-pages@v5 + uses: actions/configure-pages@v6 - name: Build with Jekyll uses: actions/jekyll-build-pages@v1 with: source: ./ destination: ./_site - name: Upload artifact - uses: actions/upload-pages-artifact@v3 + uses: actions/upload-pages-artifact@v5 # Deployment job deploy: @@ -48,4 +48,4 @@ jobs: steps: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v4 + uses: actions/deploy-pages@v5 diff --git a/exercises/ansible_network/6-controller-job-template/README.es.md b/exercises/ansible_network/6-controller-job-template/README.es.md index 6de58562a..210b09260 100644 --- a/exercises/ansible_network/6-controller-job-template/README.es.md +++ b/exercises/ansible_network/6-controller-job-template/README.es.md @@ -48,7 +48,7 @@ Para ejecutar un Playbook de Ansible en el controlador de Automatización necesi | Job Type | Run | | Inventory | Workshop Inventory | | Project | Workshop Project | - | Execution Environment | Default execution environment | + | Execution Environment | network workshop execution environment | | Playbook | playbooks/network_backup.yml | | Credential | Workshop Credential | @@ -65,6 +65,20 @@ Para ejecutar un Playbook de Ansible en el controlador de Automatización necesi ![controller credential](images/controller_cred_multiple.png) +* Despliega **Variables**, elige **YAML** si se solicita variables adicionales, y añade el YAML que aparece abajo. El playbook [`network_backup.yml`](https://github.com/network-automation/toolkit/blob/master/playbooks/network_backup.yml) crea o actualiza la plantilla **Network Automation - Restore**; sin `restore_ee` queda registrada con **Default execution environment**, que descarga desde `registry.redhat.io` y puede fallar cuando el controller no puede obtener esa imagen. El entorno de ejecución del taller corresponde a la imagen [acme_corp/network-ee en Quay](https://quay.io/repository/acme_corp/network-ee), registrada como **network-ee** en el controller. + + + +```yaml +restore_ee: network-ee +``` + + + +> Nota: +> +> **network-ee** debe coincidir exactamente con el nombre del **Execution environment** en automation controller. Si ya ejecutaste **Backup network configurations** antes de añadir esta variable, edita **Network Automation - Restore** y pon **Execution Environment** en **network-ee**, o elimina esa plantilla y vuelve a lanzar la copia de seguridad después de guardar las variables extra. + * Haz click en la cajita `Escalate Privileges`. * Baja y haz click en el botón azul `Save`. diff --git a/exercises/ansible_network/6-controller-job-template/README.fr.md b/exercises/ansible_network/6-controller-job-template/README.fr.md index 9e070709d..dba8dabf6 100644 --- a/exercises/ansible_network/6-controller-job-template/README.fr.md +++ b/exercises/ansible_network/6-controller-job-template/README.fr.md @@ -63,6 +63,20 @@ Capture d’écran des paramètres du modèle de job remplis : ![sélection identifiant](images/controller_cred.png) +* Développez **Variables**, choisissez **YAML** si l’interface le propose pour les variables supplémentaires, puis ajoutez le YAML ci-dessous. Le playbook [`network_backup.yml`](https://github.com/network-automation/toolkit/blob/master/playbooks/network_backup.yml) crée ou met à jour le modèle de travail **Network Automation - Restore** ; sans `restore_ee`, il est enregistré avec **Default execution environment**, ce qui télécharge depuis `registry.redhat.io` et peut échouer lorsque la plate-forme ne peut pas récupérer cette image. L’environnement d’exécution du workshop correspond à l’image [acme_corp/network-ee sur Quay](https://quay.io/repository/acme_corp/network-ee), enregistrée sous le nom **network-ee** dans le controller. + + + +```yaml +restore_ee: network-ee +``` + + + +> **Note :** +> +> **network-ee** doit correspondre exactement au nom d’**Execution environment** affiché dans automation controller. Si vous avez déjà exécuté **Backup network configurations** avant d’ajouter cette variable, modifiez **Network Automation - Restore** et réglez **Execution Environment** sur **network-ee**, ou supprimez ce modèle et relancez la sauvegarde après avoir enregistré les variables supplémentaires. + * Faites défiler la page vers le bas et cliquez sur le bouton bleu `Enregistrer`. ### Étape 2 : Lancer le modèle de job diff --git a/exercises/ansible_network/6-controller-job-template/README.ja.md b/exercises/ansible_network/6-controller-job-template/README.ja.md index 36dbbf22a..8630e7c50 100644 --- a/exercises/ansible_network/6-controller-job-template/README.ja.md +++ b/exercises/ansible_network/6-controller-job-template/README.ja.md @@ -66,6 +66,20 @@ ![controller credential](images/controller_cred_multiple.png) +* **Variables** を展開し、プロンプトがあれば余分な変数に **YAML** を選び、下記の YAML を追加します。プレイブック [`network_backup.yml`](https://github.com/network-automation/toolkit/blob/master/playbooks/network_backup.yml) は **Network Automation - Restore** ジョブテンプレートを作成または更新します。`restore_ee` がないと **Default execution environment** のままとなり、`registry.redhat.io` からの取得に失敗することがあります。ワークショップの実行環境は Quay の [acme_corp/network-ee](https://quay.io/repository/acme_corp/network-ee) イメージに対応し、コントローラーには **network-ee** として登録されています。 + + + +```yaml +restore_ee: network-ee +``` + + + +> 注記: +> +> **network-ee** は automation controller に表示される **実行環境** の名前と完全に一致させてください。**Backup network configurations** をこの変数を追加する前にすでに実行した場合は、**Network Automation - Restore** ジョブテンプレートの **実行環境** を **network-ee** にするか、テンプレートを削除してから余分な変数を保存し、バックアップジョブを再実行してください。 + * 下にスクロールして、青い `Save` ボタンをクリックします。 ### ステップ 2: ジョブテンプレートの起動 diff --git a/exercises/ansible_network/6-controller-job-template/README.md b/exercises/ansible_network/6-controller-job-template/README.md index f34bd53f1..a4ea67413 100644 --- a/exercises/ansible_network/6-controller-job-template/README.md +++ b/exercises/ansible_network/6-controller-job-template/README.md @@ -63,6 +63,20 @@ To run an Ansible Playbook in Automation controller we need to create a **Job Te ![switch credential type](images/controller_cred.png) +* Expand **Variables**, choose **YAML** for extra variables if prompted, then add YAML as shown below. The playbook [`network_backup.yml`](https://github.com/network-automation/toolkit/blob/master/playbooks/network_backup.yml) creates or updates the **Network Automation - Restore** job template; without `restore_ee`, that template keeps **Default execution environment**, which pulls from `registry.redhat.io` and may fail when the controller cannot pull that image. The workshop execution environment corresponds to image [acme_corp/network-ee on Quay](https://quay.io/repository/acme_corp/network-ee), registered as **network-ee** on the controller. + + + +```yaml +restore_ee: network-ee +``` + + + +> Note: +> +> **network-ee** must match the **Execution environment** name shown in automation controller exactly. If you already ran **Backup network configurations** before adding this variable, edit the **Network Automation - Restore** job template and set **Execution Environment** to **network-ee**, or remove that template and run the backup job again after saving the extra variables. + * Scroll down and click the blue `Save job template` button. ### Step 2: Launch the Job Template diff --git a/exercises/ansible_network/9-controller-workflow/README.es.md b/exercises/ansible_network/9-controller-workflow/README.es.md index 90033ff88..0b91b7bd9 100644 --- a/exercises/ansible_network/9-controller-workflow/README.es.md +++ b/exercises/ansible_network/9-controller-workflow/README.es.md @@ -126,6 +126,10 @@ En este ejercicio crearemos una copia de seguridad con marca de tiempo, si el tr ### Paso 5: Añadir la plantilla de trabajo Network-Restore +> Nota: +> +> Si **Network Automation - Restore** falla al extraer **Default execution environment** desde `registry.redhat.io`, la plantilla **Backup network configurations** del ejercicio 6 debe incluir `restore_ee: network-ee` ([acme_corp/network-ee en Quay](https://quay.io/repository/acme_corp/network-ee)), o edita **Network Automation - Restore** para usar **network-ee**. Consulta el ejercicio 6. + 1. Pasa el cursor sobre el nodo **Network-Banner** y haz click en el símbolo **+**. La ventana **Add Node** aparecerá de nuevo. 2. Selecciona **On Failure** en Run type diff --git a/exercises/ansible_network/9-controller-workflow/README.fr.md b/exercises/ansible_network/9-controller-workflow/README.fr.md index c65b509d0..11452b1e3 100644 --- a/exercises/ansible_network/9-controller-workflow/README.fr.md +++ b/exercises/ansible_network/9-controller-workflow/README.fr.md @@ -136,7 +136,11 @@ Dans cet exercice, nous créerons une sauvegarde horodatée. Si le travail de sa ### Étape 5 : Ajouter le modèle de job Network-Restore -1. Survolez le nœud **Network-Banner** et cliquez sur les trois points **\u22ee**. La fenêtre **Ajouter une étape et lier** apparaîtra à nouveau. +> Note : +> +> Si **Network Automation - Restore** échoue en tirant **Default execution environment** depuis `registry.redhat.io`, le modèle **Backup network configurations** (exercice 6) doit inclure `restore_ee: network-ee` ([acme_corp/network-ee sur Quay](https://quay.io/repository/acme_corp/network-ee)), ou modifiez **Network Automation - Restore** pour utiliser **network-ee**. Voir l’exercice 6 pour le détail. + +1. Survolez le nœud **Network-Banner** et cliquez sur les trois points **⋮**. La fenêtre **Ajouter une étape et lier** apparaîtra à nouveau. 2. Remplissez les valeurs suivantes : diff --git a/exercises/ansible_network/9-controller-workflow/README.ja.md b/exercises/ansible_network/9-controller-workflow/README.ja.md index 2047d90ec..d799e2c17 100644 --- a/exercises/ansible_network/9-controller-workflow/README.ja.md +++ b/exercises/ansible_network/9-controller-workflow/README.ja.md @@ -136,6 +136,10 @@ ### ステップ 5: ネットワーク復元ジョブテンプレートの追加 +> 注記: +> +> **Network Automation - Restore** が `registry.redhat.io` から **Default execution environment** を取得できずに失敗する場合は、演習 6 の **Backup network configurations** に `restore_ee: network-ee`（Quay の [acme_corp/network-ee](https://quay.io/repository/acme_corp/network-ee)）を入れるか、**Network Automation - Restore** の実行環境を **network-ee** に編集してください。詳細は演習 6 を参照してください。 + 1. **Network-Banner** ノードにカーソルを合わせ、**+** 記号をクリックします。**Add Node** ウィンドウが再び表示されます。 diff --git a/exercises/ansible_network/9-controller-workflow/README.md b/exercises/ansible_network/9-controller-workflow/README.md index 6afd50fc5..b810059c2 100644 --- a/exercises/ansible_network/9-controller-workflow/README.md +++ b/exercises/ansible_network/9-controller-workflow/README.md @@ -180,6 +180,10 @@ For this exercise we will create a time-stamped backup, if the backup job succes ### Step 5: Add the Network-Restore Job Template +> Note: +> +> If **Network Automation - Restore** fails while pulling **Default execution environment** from `registry.redhat.io`, the **Backup network configurations** job template in Exercise 6 must include extra variable `restore_ee: network-ee` (image [acme_corp/network-ee on Quay](https://quay.io/repository/acme_corp/network-ee)), or edit **Network Automation - Restore** to use **network-ee**. See Exercise 6 for details. + 1. Hover over the **Network-Banner** node and click the three dots **⋮** The **Add step and link** window will appear again. 2. Fill out the following values: diff --git a/roles/populate_controller/tasks/network.yml b/roles/populate_controller/tasks/network.yml index 430c0caf5..e7e669159 100644 --- a/roles/populate_controller/tasks/network.yml +++ b/roles/populate_controller/tasks/network.yml @@ -126,6 +126,7 @@ restore_inventory: "Workshop Inventory" restore_credential: "Workshop Credential" restore_project: "Workshop Project" + restore_ee: "network-ee" controller_username: admin controller_password: "{{ admin_password }}" controller_host: "https://{{ ansible_host }}:{{ aap_port | default('443') }}"