From f1f9bb147132125689a74058bb46424ef966758e Mon Sep 17 00:00:00 2001 From: Anthony Lin Date: Tue, 20 Feb 2018 09:38:50 +0000 Subject: [PATCH] Update Overrides for armada.yaml.sub There has been recent updates in OSH [0] and [1] that requires updates to be made to 'armada.yaml.sub' [0] https://github.com/openstack/openstack-helm/commit/b311f861931adbc32da5fbab2e8034dbcc89b453#diff-e2854c57146c7512ed40cad1094beb49 [1] https://github.com/openstack/openstack-helm/commit/826fddca01c4a1e49bfb6b14c702ea6ce04cdf03#diff-3e56c8256691116056e6c7f3e47a4bab Change-Id: I00b19205798f9430d8caccf6da128727c00fb6a3 --- manifests/basic_ucp/armada.yaml.sub | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/manifests/basic_ucp/armada.yaml.sub b/manifests/basic_ucp/armada.yaml.sub index 07a00c67..fc9d0a0b 100644 --- a/manifests/basic_ucp/armada.yaml.sub +++ b/manifests/basic_ucp/armada.yaml.sub @@ -310,8 +310,9 @@ data: no_hooks: false values: labels: - node_selector_key: ucp-control-plane - node_selector_value: enabled + server: + node_selector_key: ucp-control-plane + node_selector_value: enabled source: type: git location: https://git.openstack.org/openstack/openstack-helm @@ -352,8 +353,12 @@ data: override: replicas: 2 labels: - node_selector_key: ucp-control-plane - node_selector_value: enabled + api: + node_selector_key: ucp-control-plane + node_selector_value: enabled + job: + node_selector_key: ucp-control-plane + node_selector_value: enabled source: type: git location: https://git.openstack.org/openstack/openstack-helm @@ -388,8 +393,9 @@ data: development: enabled: false labels: - node_selector_key: ucp-control-plane - node_selector_value: enabled + server: + node_selector_key: ucp-control-plane + node_selector_value: enabled source: type: git location: https://git.openstack.org/openstack/openstack-helm @@ -600,8 +606,9 @@ data: job: node_selector_key: ucp-control-plane node_selector_value: enabled - node_selector_key: ucp-control-plane - node_selector_value: enabled + api: + node_selector_key: ucp-control-plane + node_selector_value: enabled source: type: git location: https://git.openstack.org/openstack/openstack-helm