airship/airshipctl
Code Issues Proposed changes

Merge "Add repository to airship config template, ansible"

Browse Source
This commit is contained in:
Zuul 2020-03-12 20:23:19 +00:00 committed by Gerrit Code Review
commit 267a1b0bfb
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
roles/airshipctl-test-configs/defaults/main.yaml
View File

@ -1,5 +1,8 @@
airship_config_iso_gen_target_path: /srv/iso
airship_config_manifest_directory: /tmp/airship
airship_config_primary_repo_url: dummy.url.com
airship_config_primary_repo_auth_type: ssh-key
airship_config_primary_repo_key_path: ""
airship_config_ephemeral_ip: "10.23.25.101"
airship_config_iso_builder_docker_image: quay.io/airshipit/isogen:latest
airship_config_iso_port: 8099

24
roles/airshipctl-test-configs/templates/airshipconfig.j2
View File

@ -13,20 +13,16 @@ current-context: dummy_cluster
kind: Config
manifests:
dummy_manifest:
repositories:
dummy:
target-path: dummy_targetpath
url:
ForceQuery: false
Fragment: ""
Host: dummy.url.com
Opaque: ""
Path: ""
RawPath: ""
RawQuery: ""
Scheme: http
User: null
username: dummy_user
repository:
auth:
ssh-key: {{ airship_config_primary_repo_key_path | default("") }}
type: {{ airship_config_primary_repo_auth_type }}
checkout:
branch: "master"
force: false
remote-ref: ""
tag: ""
url: {{ airship_config_primary_repo_url }}
target-path: {{ airship_config_manifest_directory }}
modules-config:
bootstrapInfo: