From 1c38bd645cf452b2792d18c23c343f5744c07eb1 Mon Sep 17 00:00:00 2001 From: Kiran Thyagaraja Date: Mon, 22 Jan 2018 02:39:25 +0000 Subject: [PATCH] Did away with the default service_account requirement. Will enforce requirement for default sa to have anyuid capability in OCP. k8s doesn't care. --- defaults/main.yml | 1 - tasks/backends/rbd.yml | 1 - tasks/backends/xtremio.yml | 1 - tasks/cinder-api.yml | 1 - tasks/cinder-scheduler.yml | 1 - tasks/init-jobs.yml | 3 --- 6 files changed, 8 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 682299a..c89087e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -3,7 +3,6 @@ #config_file: "~/.kube/config" action: provision namespace: openstack -service_account: openstack privileged_service_account: openstack-priv database_password: weakpassword cinder_db_password: cinderpass diff --git a/tasks/backends/rbd.yml b/tasks/backends/rbd.yml index 59c228c..0558e3b 100644 --- a/tasks/backends/rbd.yml +++ b/tasks/backends/rbd.yml @@ -81,7 +81,6 @@ k8s_apps_v1beta1_deployment: name: cinder-volume-rbd namespace: "{{ namespace }}" - service_account_name: "{{ service_account }}" labels: app: cinder-volume-rbd service: cinder-volume-rbd diff --git a/tasks/backends/xtremio.yml b/tasks/backends/xtremio.yml index 304824a..561f8ea 100644 --- a/tasks/backends/xtremio.yml +++ b/tasks/backends/xtremio.yml @@ -40,7 +40,6 @@ k8s_apps_v1beta1_deployment: name: cinder-volume-xtremio namespace: "{{ namespace }}" - service_account_name: "{{ service_account }}" labels: app: cinder-volume-xtremio service: cinder-volume-xtremio diff --git a/tasks/cinder-api.yml b/tasks/cinder-api.yml index 4a71082..58a60a8 100644 --- a/tasks/cinder-api.yml +++ b/tasks/cinder-api.yml @@ -79,7 +79,6 @@ k8s_apps_v1beta1_deployment: name: cinder-api namespace: "{{ namespace }}" - service_account_name: "{{ service_account }}" labels: app: cinder-api service: cinder-api diff --git a/tasks/cinder-scheduler.yml b/tasks/cinder-scheduler.yml index fad9ffb..23e7f03 100644 --- a/tasks/cinder-scheduler.yml +++ b/tasks/cinder-scheduler.yml @@ -40,7 +40,6 @@ k8s_apps_v1beta1_deployment: name: cinder-scheduler namespace: "{{ namespace }}" - service_account_name: "{{ service_account }}" labels: app: cinder-scheduler service: cinder-scheduler diff --git a/tasks/init-jobs.yml b/tasks/init-jobs.yml index 26fc3f4..1015d94 100644 --- a/tasks/init-jobs.yml +++ b/tasks/init-jobs.yml @@ -39,7 +39,6 @@ k8s_v1_job: name: cinder-create-db namespace: "{{ namespace }}" - service_account_name: "{{ service_account }}" restart_policy: OnFailure containers: - name: cinder-create-db @@ -64,7 +63,6 @@ k8s_v1_job: name: cinder-create-user namespace: "{{ namespace }}" - service_account_name: "{{ service_account }}" restart_policy: OnFailure containers: - name: cinder-create-db @@ -96,7 +94,6 @@ k8s_v1_job: name: cinder-create-tables namespace: "{{ namespace }}" - service_account_name: "{{ service_account }}" restart_policy: OnFailure containers: - name: cinder-create-db