From 85f1ff681b84b446bdded66b10c1b6eaa89d44ec Mon Sep 17 00:00:00 2001 From: portdirect Date: Wed, 7 Feb 2018 20:01:31 -0500 Subject: [PATCH] Ironic: Simplify gate script This PS simplifies the gate script. Change-Id: Id763157fc5877646e25158fb5307aafc301df5b2 --- tools/deployment/baremetal/005-setup-nodes.sh | 5 +++ tools/deployment/baremetal/020-ingress.sh | 6 +--- tools/deployment/baremetal/040-mariadb.sh | 2 -- tools/deployment/baremetal/050-rabbitmq.sh | 2 -- tools/deployment/baremetal/060-memcached.sh | 4 +-- tools/deployment/baremetal/080-keystone.sh | 4 +-- tools/deployment/baremetal/090-glance.sh | 2 -- tools/deployment/baremetal/100-heat.sh | 4 +-- tools/deployment/baremetal/110-compute-kit.sh | 33 ------------------- 9 files changed, 9 insertions(+), 53 deletions(-) diff --git a/tools/deployment/baremetal/005-setup-nodes.sh b/tools/deployment/baremetal/005-setup-nodes.sh index 9d0458c951..a96d99af39 100755 --- a/tools/deployment/baremetal/005-setup-nodes.sh +++ b/tools/deployment/baremetal/005-setup-nodes.sh @@ -16,6 +16,11 @@ set -xe +#NOTE: We only want to run control plane components on the primary node +kubectl label nodes openstack-control-plane- --all --overwrite +PRIMARY_NODE="$(kubectl get nodes -l openstack-helm-node-class=primary -o name | awk -F '/' '{ print $NF; exit }')" +kubectl label node ${PRIMARY_NODE} openstack-control-plane=enabled + #NOTE: Build charts make all diff --git a/tools/deployment/baremetal/020-ingress.sh b/tools/deployment/baremetal/020-ingress.sh index 68c756dbc5..984f8b9a3f 100755 --- a/tools/deployment/baremetal/020-ingress.sh +++ b/tools/deployment/baremetal/020-ingress.sh @@ -23,8 +23,6 @@ make pull-images ingress helm install ./ingress \ --namespace=kube-system \ --name=ingress-kube-system \ - --set labels.node_selector_key=openstack-helm-node-class \ - --set labels.node_selector_value=primary \ --set deployment.mode=cluster \ --set deployment.type=DaemonSet \ --set network.host_namespace=true \ @@ -35,9 +33,7 @@ helm install ./ingress \ #NOTE: Deploy namespace ingress helm install ./ingress \ --namespace=openstack \ - --name=ingress-openstack \ - --set labels.node_selector_key=openstack-helm-node-class \ - --set labels.node_selector_value=primary + --name=ingress-openstack #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh kube-system diff --git a/tools/deployment/baremetal/040-mariadb.sh b/tools/deployment/baremetal/040-mariadb.sh index 25bc389121..f536915a5e 100755 --- a/tools/deployment/baremetal/040-mariadb.sh +++ b/tools/deployment/baremetal/040-mariadb.sh @@ -23,8 +23,6 @@ make pull-images mariadb helm install ./mariadb \ --namespace=openstack \ --name=mariadb \ - --set labels.node_selector_key=openstack-helm-node-class \ - --set labels.node_selector_value=primary \ --set pod.replicas.server=1 #NOTE: Wait for deploy diff --git a/tools/deployment/baremetal/050-rabbitmq.sh b/tools/deployment/baremetal/050-rabbitmq.sh index f7f830497f..bbc38f596a 100755 --- a/tools/deployment/baremetal/050-rabbitmq.sh +++ b/tools/deployment/baremetal/050-rabbitmq.sh @@ -23,8 +23,6 @@ make pull-images rabbitmq helm install ./rabbitmq \ --namespace=openstack \ --name=rabbitmq \ - --set labels.node_selector_key=openstack-helm-node-class \ - --set labels.node_selector_value=primary \ --set pod.replicas.server=1 #NOTE: Wait for deploy diff --git a/tools/deployment/baremetal/060-memcached.sh b/tools/deployment/baremetal/060-memcached.sh index a842dd8aa0..d25927b074 100755 --- a/tools/deployment/baremetal/060-memcached.sh +++ b/tools/deployment/baremetal/060-memcached.sh @@ -22,9 +22,7 @@ make pull-images memcached #NOTE: Deploy command helm install ./memcached \ --namespace=openstack \ - --name=memcached \ - --set labels.node_selector_key=openstack-helm-node-class \ - --set labels.node_selector_value=primary + --name=memcached #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack diff --git a/tools/deployment/baremetal/080-keystone.sh b/tools/deployment/baremetal/080-keystone.sh index 9a9b0f7840..e23c6d0410 100755 --- a/tools/deployment/baremetal/080-keystone.sh +++ b/tools/deployment/baremetal/080-keystone.sh @@ -22,9 +22,7 @@ make pull-images keystone #NOTE: Deploy command helm install ./keystone \ --namespace=openstack \ - --name=keystone \ - --set labels.node_selector_key=openstack-helm-node-class \ - --set labels.node_selector_value=primary + --name=keystone #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack diff --git a/tools/deployment/baremetal/090-glance.sh b/tools/deployment/baremetal/090-glance.sh index f3899eee17..b10b34ba2c 100755 --- a/tools/deployment/baremetal/090-glance.sh +++ b/tools/deployment/baremetal/090-glance.sh @@ -23,8 +23,6 @@ make pull-images glance helm install ./glance \ --namespace=openstack \ --name=glance \ - --set labels.node_selector_key=openstack-helm-node-class \ - --set labels.node_selector_value=primary \ --set storage=radosgw #NOTE: Wait for deploy diff --git a/tools/deployment/baremetal/100-heat.sh b/tools/deployment/baremetal/100-heat.sh index ac7be0a35a..073ecf5b61 100755 --- a/tools/deployment/baremetal/100-heat.sh +++ b/tools/deployment/baremetal/100-heat.sh @@ -21,9 +21,7 @@ make pull-images heat #NOTE: Deploy command helm install ./heat \ --namespace=openstack \ - --name=heat \ - --set labels.node_selector_key=openstack-helm-node-class \ - --set labels.node_selector_value=primary + --name=heat #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack diff --git a/tools/deployment/baremetal/110-compute-kit.sh b/tools/deployment/baremetal/110-compute-kit.sh index 8ba368879e..3357d556a9 100755 --- a/tools/deployment/baremetal/110-compute-kit.sh +++ b/tools/deployment/baremetal/110-compute-kit.sh @@ -43,9 +43,6 @@ labels: metadata: node_selector_key: openstack-helm-node-class node_selector_value: primary - server: - node_selector_key: openstack-helm-node-class - node_selector_value: primary pod: replicas: server: 1 @@ -129,39 +126,9 @@ helm install ./ironic \ tee /tmp/nova.yaml << EOF labels: agent: - compute: - node_selector_key: openstack-helm-node-class - node_selector_value: primary compute_ironic: node_selector_key: openstack-helm-node-class node_selector_value: primary - conductor: - node_selector_key: openstack-helm-node-class - node_selector_value: primary - consoleauth: - node_selector_key: openstack-helm-node-class - node_selector_value: primary - scheduler: - node_selector_key: openstack-helm-node-class - node_selector_value: primary - osapi: - node_selector_key: openstack-helm-node-class - node_selector_value: primary - api_metadata: - node_selector_key: openstack-helm-node-class - node_selector_value: primary - placement: - node_selector_key: openstack-helm-node-class - node_selector_value: primary - job: - node_selector_key: openstack-helm-node-class - node_selector_value: primary - novncproxy: - node_selector_key: openstack-helm-node-class - node_selector_value: primary - spiceproxy: - node_selector_key: openstack-helm-node-class - node_selector_value: primary conf: nova: DEFAULT: