Merge "Deploy placement before nova"
This commit is contained in:
commit
7bb3f30c9d
@ -22,6 +22,16 @@ if openstack service list -f value -c Type | grep -q "^volume" && \
|
|||||||
CEPH_ENABLED=true
|
CEPH_ENABLED=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Get overrides
|
||||||
|
: ${OSH_EXTRA_HELM_ARGS_PLACEMENT:="$(./tools/deployment/common/get-values-overrides.sh placement)"}
|
||||||
|
|
||||||
|
# Lint and package
|
||||||
|
make placement
|
||||||
|
|
||||||
|
# Deploy placement
|
||||||
|
helm upgrade --install placement ./placement --namespace=openstack \
|
||||||
|
${OSH_EXTRA_HELM_ARGS:=} ${OSH_EXTRA_HELM_ARGS_PLACEMENT}
|
||||||
|
|
||||||
#NOTE: Get the over-rides to use
|
#NOTE: Get the over-rides to use
|
||||||
: ${OSH_EXTRA_HELM_ARGS_NOVA:="$(./tools/deployment/common/get-values-overrides.sh nova)"}
|
: ${OSH_EXTRA_HELM_ARGS_NOVA:="$(./tools/deployment/common/get-values-overrides.sh nova)"}
|
||||||
|
|
||||||
@ -50,16 +60,6 @@ else
|
|||||||
${OSH_EXTRA_HELM_ARGS_NOVA}
|
${OSH_EXTRA_HELM_ARGS_NOVA}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Get overrides
|
|
||||||
: ${OSH_EXTRA_HELM_ARGS_PLACEMENT:="$(./tools/deployment/common/get-values-overrides.sh placement)"}
|
|
||||||
|
|
||||||
# Lint and package
|
|
||||||
make placement
|
|
||||||
|
|
||||||
# Deploy placement
|
|
||||||
helm upgrade --install placement ./placement --namespace=openstack \
|
|
||||||
${OSH_EXTRA_HELM_ARGS:=} ${OSH_EXTRA_HELM_ARGS_PLACEMENT}
|
|
||||||
|
|
||||||
#NOTE: Get the over-rides to use
|
#NOTE: Get the over-rides to use
|
||||||
: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(./tools/deployment/common/get-values-overrides.sh neutron)"}
|
: ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(./tools/deployment/common/get-values-overrides.sh neutron)"}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user