From 22f981a1f7f44e6177a78f7bd92999a24875bd43 Mon Sep 17 00:00:00 2001 From: Luis Tomas Bolivar Date: Wed, 6 Mar 2019 18:42:57 +0100 Subject: [PATCH] Ensure kuryr has its own namespace Kuryr components require a namespace with node_selector = "" This PR ensures a project is created with that node_selector for the kuryr components --- roles/kuryr/defaults/main.yaml | 2 +- roles/kuryr/tasks/master.yaml | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/roles/kuryr/defaults/main.yaml b/roles/kuryr/defaults/main.yaml index 5a91e9ea7af..8c4833dfdc7 100644 --- a/roles/kuryr/defaults/main.yaml +++ b/roles/kuryr/defaults/main.yaml @@ -9,7 +9,7 @@ kuryr_openstack_user_domain_name: default kuryr_openstack_project_domain_name: default # Kuryr OpenShift namespace -kuryr_namespace: openshift-infra +kuryr_namespace: kuryr # Default pod-in-VM link interface kuryr_cni_link_interface: eth0 diff --git a/roles/kuryr/tasks/master.yaml b/roles/kuryr/tasks/master.yaml index eb0e2e5306f..4d6a05551b5 100644 --- a/roles/kuryr/tasks/master.yaml +++ b/roles/kuryr/tasks/master.yaml @@ -1,4 +1,11 @@ --- +- name: Ensure project exists + oc_project: + name: "{{ kuryr_namespace }}" + state: present + node_selector: + - "" + - name: Perform OpenShift ServiceAccount config include_tasks: serviceaccount.yaml run_once: true