External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-17 03:00:04 -03:30
Code Issues Packages Projects Releases Wiki Activity

Linters: test new linter job

Browse Source 
Depends-On: https://github.com/ansible/zuul-jobs/pull/40
This commit is contained in:
Yanis Guenane
2019-12-04 17:43:55 +01:00
parent f5157784c4
commit f8b2bcbae7
2 changed files with 5 additions and 5 deletions
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: |