From 84fe30c2245a7f50318bc8763d5cd410988355e2 Mon Sep 17 00:00:00 2001 From: okozachenko Date: Mon, 13 Jul 2020 20:05:10 +0300 Subject: [PATCH] change admin url in keystone Change-Id: If7dddf87d4089c0d0d0f3d515f85465a1ac376e2 --- openstack_operator/templates/keystone/daemonset.yml.j2 | 7 ++----- playbooks/functional/devstack.yaml | 8 ++++++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/openstack_operator/templates/keystone/daemonset.yml.j2 b/openstack_operator/templates/keystone/daemonset.yml.j2 index 88fc8c50..74f203d9 100644 --- a/openstack_operator/templates/keystone/daemonset.yml.j2 +++ b/openstack_operator/templates/keystone/daemonset.yml.j2 @@ -59,11 +59,6 @@ spec: secretKeyRef: key: region_name name: keystone-init - - name: OS_BOOTSTRAP_ADMIN_URL - valueFrom: - secretKeyRef: - key: auth_url - name: keystone-init - name: OS_BOOTSTRAP_PUBLIC_URL valueFrom: secretKeyRef: @@ -81,6 +76,8 @@ spec: name: keystone-init - name: OS_BOOTSTRAP_SERVICE_NAME value: keystone + - name: OS_BOOTSTRAP_ADMIN_URL + value: http://keystone.openstack.svc.cluster.local - name: OS_BOOTSTRAP_INTERNAL_URL value: http://keystone.openstack.svc.cluster.local command: diff --git a/playbooks/functional/devstack.yaml b/playbooks/functional/devstack.yaml index 69e7e56f..044ffbb6 100644 --- a/playbooks/functional/devstack.yaml +++ b/playbooks/functional/devstack.yaml @@ -85,6 +85,14 @@ pre_tasks: - name: Set the context with openstack namespace command: kubectl config set-context --current --namespace=openstack + - name: Update resolv.conf to point to the coredns + become: true + shell: | + cat < /etc/resolv.conf + search svc.cluster.local cluster.local + nameserver 10.96.0.10 + options ndots:5 + EOF roles: - orchestrate-devstack