openstack
/
openstack-helm
Code Issues Proposed changes

Ironic: Simplify gate script 

This PS simplifies the gate script.

Change-Id: Id763157fc5877646e25158fb5307aafc301df5b2
This commit is contained in:
portdirect 2018-02-07 20:01:31 -05:00
parent 637cb6c1e0
commit 85f1ff681b
9 changed files with 9 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/deployment/baremetal/005-setup-nodes.sh
View File

@ -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

6
tools/deployment/baremetal/020-ingress.sh
View File

@ -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

2
tools/deployment/baremetal/040-mariadb.sh
View File

@ -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

2
tools/deployment/baremetal/050-rabbitmq.sh
View File

@ -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

4
tools/deployment/baremetal/060-memcached.sh
View File

@ -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

4
tools/deployment/baremetal/080-keystone.sh
View File

@ -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

2
tools/deployment/baremetal/090-glance.sh
View File

@ -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

4
tools/deployment/baremetal/100-heat.sh
View File

@ -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

33
tools/deployment/baremetal/110-compute-kit.sh
View File

@ -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: