shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 23:51:09 +03:00
Code Releases Activity

Merge pull request #5445 from Spredzy/test_new_linter

Browse Source 
Linters: test new linter job

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-12-04 19:31:15 +00:00 committed by GitHub
commit 6dc5f91a0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
installer/roles/kubernetes/tasks/main.yml
View File

@ -189,12 +189,12 @@
command: | command: |
{{ kubectl_or_oc }} config view -o json {{ kubectl_or_oc }} config view -o json
register: kube_config_cmd register: kube_config_cmd
no_log: yes no_log: true
- name: Convert kube config to dictionary - name: Convert kube config to dictionary
set_fact: set_fact:
kube_config: "{{ kube_config_cmd.stdout | from_json }}" kube_config: "{{ kube_config_cmd.stdout | from_json }}"
no_log: yes no_log: true
- name: Extract current context from kube config - name: Extract current context from kube config
set_fact: set_fact:
@ -217,7 +217,7 @@
- name: Get kube version from api server - name: Get kube version from api server
uri: uri:
url: "{{ kube_server | trim }}/version" url: "{{ kube_server | trim }}/version"
validate_certs: no validate_certs: false
register: kube_version register: kube_version
- name: Extract server version from command output - name: Extract server version from command output

4
installer/roles/kubernetes/tasks/restore.yml
View File

@ -83,7 +83,7 @@
--port={{ pg_port | default('5432') }} \ --port={{ pg_port | default('5432') }} \
--username={{ pg_username }} \ --username={{ pg_username }} \
--dbname=template1" < {{ playbook_dir }}/tower-openshift-restore/tower.db --dbname=template1" < {{ playbook_dir }}/tower-openshift-restore/tower.db
no_log: yes no_log: true
- name: Delete management pod - name: Delete management pod
shell: | shell: |
@ -106,7 +106,7 @@
get pods -l=name=postgresql --field-selector status.phase=Running -o jsonpath="{.items[0].metadata.name}") get pods -l=name=postgresql --field-selector status.phase=Running -o jsonpath="{.items[0].metadata.name}")
{{ kubectl_or_oc }} exec -i $POD -n {{ kubernetes_namespace }} -- bash -c "\ {{ kubectl_or_oc }} exec -i $POD -n {{ kubernetes_namespace }} -- bash -c "\
psql --dbname=template1" < {{ playbook_dir }}/tower-openshift-restore/tower.db psql --dbname=template1" < {{ playbook_dir }}/tower-openshift-restore/tower.db
no_log: yes no_log: true
- name: Revoke createdb role - name: Revoke createdb role
shell: | shell: |