summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Buil <mbuil@suse.com>2019-08-06 20:26:47 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-08-06 20:26:47 +0000
commit68948c7442b8bd90683923bedf90c8a8768941aa (patch)
tree06692bd9550b229cc6e6845f2ccac825cca86b0c
parent2695d025b603e047946bdbb2d64994f752dd072b (diff)
parent979caf7b697d59ff2452d47728a827d516fc7701 (diff)
Merge "Add the required dashes in yaml files"
-rw-r--r--xci/installer/osh/playbooks/group_vars/all.yml (renamed from xci/installer/osh/playbooks/group_vars/all)1
-rw-r--r--xci/installer/osh/playbooks/roles/install-osh-noha/tasks/main.yml1
-rw-r--r--xci/installer/osh/playbooks/roles/prepare-kube-nodes-osh/tasks/main.yml1
-rw-r--r--xci/installer/osh/playbooks/roles/prepare-opnfvhost-osh/tasks/main.yml1
-rw-r--r--xci/installer/osh/playbooks/roles/prepare-osh/tasks/main.yml1
-rw-r--r--xci/installer/osh/playbooks/roles/prepare-osh/vars/main.yml1
6 files changed, 6 insertions, 0 deletions
diff --git a/xci/installer/osh/playbooks/group_vars/all b/xci/installer/osh/playbooks/group_vars/all.yml
index 328f8dba..7453bdab 100644
--- a/xci/installer/osh/playbooks/group_vars/all
+++ b/xci/installer/osh/playbooks/group_vars/all.yml
@@ -1,3 +1,4 @@
+---
keepalived_ubuntu_src: "uca"
keepalived_uca_apt_repo_url: "{{ uca_apt_repo_url | default('http://ubuntu-cloud.archive.canonical.com/ubuntu') }}"
diff --git a/xci/installer/osh/playbooks/roles/install-osh-noha/tasks/main.yml b/xci/installer/osh/playbooks/roles/install-osh-noha/tasks/main.yml
index 231572c9..9e783cb7 100644
--- a/xci/installer/osh/playbooks/roles/install-osh-noha/tasks/main.yml
+++ b/xci/installer/osh/playbooks/roles/install-osh-noha/tasks/main.yml
@@ -1,3 +1,4 @@
+---
- name: Setup Clients
command: ./tools/deployment/multinode/010-setup-client.sh
changed_when: false
diff --git a/xci/installer/osh/playbooks/roles/prepare-kube-nodes-osh/tasks/main.yml b/xci/installer/osh/playbooks/roles/prepare-kube-nodes-osh/tasks/main.yml
index 5a70f971..ff0aff60 100644
--- a/xci/installer/osh/playbooks/roles/prepare-kube-nodes-osh/tasks/main.yml
+++ b/xci/installer/osh/playbooks/roles/prepare-kube-nodes-osh/tasks/main.yml
@@ -1,3 +1,4 @@
+---
- name: Install packages in kubernetes nodes
package:
name: "{{ packages }}"
diff --git a/xci/installer/osh/playbooks/roles/prepare-opnfvhost-osh/tasks/main.yml b/xci/installer/osh/playbooks/roles/prepare-opnfvhost-osh/tasks/main.yml
index 7e2a52ab..b31dc706 100644
--- a/xci/installer/osh/playbooks/roles/prepare-opnfvhost-osh/tasks/main.yml
+++ b/xci/installer/osh/playbooks/roles/prepare-opnfvhost-osh/tasks/main.yml
@@ -1,3 +1,4 @@
+---
- name: Set kubernetes service account permissions
command: "kubectl create clusterrolebinding add-on-cluster-admin --clusterrole=cluster-admin --serviceaccount=kube-system:default"
changed_when: false
diff --git a/xci/installer/osh/playbooks/roles/prepare-osh/tasks/main.yml b/xci/installer/osh/playbooks/roles/prepare-osh/tasks/main.yml
index d9718ea4..aeaca6be 100644
--- a/xci/installer/osh/playbooks/roles/prepare-osh/tasks/main.yml
+++ b/xci/installer/osh/playbooks/roles/prepare-osh/tasks/main.yml
@@ -1,3 +1,4 @@
+---
- name: Write new resolv.conf file
template:
src: resolv.conf.j2
diff --git a/xci/installer/osh/playbooks/roles/prepare-osh/vars/main.yml b/xci/installer/osh/playbooks/roles/prepare-osh/vars/main.yml
index abb0d6eb..4d6f9cbb 100644
--- a/xci/installer/osh/playbooks/roles/prepare-osh/vars/main.yml
+++ b/xci/installer/osh/playbooks/roles/prepare-osh/vars/main.yml
@@ -1,3 +1,4 @@
+---
kube_dns_ip: "10.233.0.3"
external_dns_nameservers:
- '{{kube_dns_ip}}'