openstack/openstack-helm
Code Issues Proposed changes

Pedant: prefer "--set " over "--set="

Browse Source 
Change-Id: I02e47b411ed3702c70da1fd42deef5d25ad2add2
This commit is contained in:
Chris Wedgwood 2017-09-13 22:01:41 +00:00
parent d2b4a35e75
commit ca9a78765a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/install/developer/all-in-one.rst
View File

@ -236,11 +236,11 @@ more sensible values for the All-in-One environment using the ``--values`` and
--set storage=pvc --set storage=pvc
helm install --name=nova ./nova --namespace=openstack \ helm install --name=nova ./nova --namespace=openstack \
--values=./tools/overrides/mvp/nova.yaml \ --values=./tools/overrides/mvp/nova.yaml \
--set=conf.nova.libvirt.nova.conf.virt_type=qemu --set conf.nova.libvirt.nova.conf.virt_type=qemu
helm install --name=neutron ./neutron \ helm install --name=neutron ./neutron \
--namespace=openstack --values=./tools/overrides/mvp/neutron-ovs.yaml --namespace=openstack --values=./tools/overrides/mvp/neutron-ovs.yaml
helm install --name=horizon ./horizon --namespace=openstack \ helm install --name=horizon ./horizon --namespace=openstack \
--set=network.enable_node_port=true --set network.enable_node_port=true
Once the install commands have been issued, executing the following will provide Once the install commands have been issued, executing the following will provide
insight into the services' deployment status. insight into the services' deployment status.

12
tools/gate/launch-osh/basic.sh
View File

@ -91,7 +91,7 @@ if [ "x$INTEGRATION" == "xmulti" ]; then
helm install --namespace=openstack ${WORK_DIR}/mariadb --name=mariadb helm install --namespace=openstack ${WORK_DIR}/mariadb --name=mariadb
else else
helm install --namespace=openstack ${WORK_DIR}/mariadb --name=mariadb \ helm install --namespace=openstack ${WORK_DIR}/mariadb --name=mariadb \
--set=pod.replicas.server=1 --set pod.replicas.server=1
fi fi
helm install --namespace=openstack ${WORK_DIR}/memcached --name=memcached helm install --namespace=openstack ${WORK_DIR}/memcached --name=memcached
kube_wait_for_pods openstack ${SERVICE_LAUNCH_TIMEOUT} kube_wait_for_pods openstack ${SERVICE_LAUNCH_TIMEOUT}
@ -134,7 +134,7 @@ kube_wait_for_pods openstack ${SERVICE_LAUNCH_TIMEOUT}
if [ "x$PVC_BACKEND" == "xceph" ] && [ "x$SDN_PLUGIN" == "xovs" ]; then if [ "x$PVC_BACKEND" == "xceph" ] && [ "x$SDN_PLUGIN" == "xovs" ]; then
helm install --namespace=openstack ${WORK_DIR}/nova --name=nova \ helm install --namespace=openstack ${WORK_DIR}/nova --name=nova \
--set=conf.nova.libvirt.nova.conf.virt_type=qemu --set conf.nova.libvirt.nova.conf.virt_type=qemu
helm install --namespace=openstack ${WORK_DIR}/neutron --name=neutron \ helm install --namespace=openstack ${WORK_DIR}/neutron --name=neutron \
--values=${WORK_DIR}/tools/overrides/mvp/neutron-ovs.yaml --values=${WORK_DIR}/tools/overrides/mvp/neutron-ovs.yaml
@ -142,15 +142,15 @@ if [ "x$PVC_BACKEND" == "xceph" ] && [ "x$SDN_PLUGIN" == "xovs" ]; then
elif [ "x$PVC_BACKEND" == "x" ] && [ "x$SDN_PLUGIN" == "xovs" ]; then elif [ "x$PVC_BACKEND" == "x" ] && [ "x$SDN_PLUGIN" == "xovs" ]; then
helm install --namespace=openstack ${WORK_DIR}/nova --name=nova \ helm install --namespace=openstack ${WORK_DIR}/nova --name=nova \
--values=${WORK_DIR}/tools/overrides/mvp/nova.yaml \ --values=${WORK_DIR}/tools/overrides/mvp/nova.yaml \
--set=conf.nova.libvirt.nova.conf.virt_type=qemu --set conf.nova.libvirt.nova.conf.virt_type=qemu
helm install --namespace=openstack ${WORK_DIR}/neutron --name=neutron \ helm install --namespace=openstack ${WORK_DIR}/neutron --name=neutron \
--values=${WORK_DIR}/tools/overrides/mvp/neutron-ovs.yaml --values=${WORK_DIR}/tools/overrides/mvp/neutron-ovs.yaml
elif [ "x$PVC_BACKEND" == "xceph" ] && [ "x$SDN_PLUGIN" == "xlinuxbridge" ]; then elif [ "x$PVC_BACKEND" == "xceph" ] && [ "x$SDN_PLUGIN" == "xlinuxbridge" ]; then
helm install --namespace=openstack ${WORK_DIR}/nova --name=nova \ helm install --namespace=openstack ${WORK_DIR}/nova --name=nova \
--set=dependencies.compute.daemonset={neutron-lb-agent} \ --set dependencies.compute.daemonset={neutron-lb-agent} \
--set=conf.nova.libvirt.nova.conf.virt_type=qemu --set conf.nova.libvirt.nova.conf.virt_type=qemu
helm install --namespace=openstack ${WORK_DIR}/neutron --name=neutron \ helm install --namespace=openstack ${WORK_DIR}/neutron --name=neutron \
--values=${WORK_DIR}/tools/overrides/mvp/neutron-linuxbridge.yaml --values=${WORK_DIR}/tools/overrides/mvp/neutron-linuxbridge.yaml
@ -158,7 +158,7 @@ elif [ "x$PVC_BACKEND" == "xceph" ] && [ "x$SDN_PLUGIN" == "xlinuxbridge" ]; the
elif [ "x$PVC_BACKEND" == "x" ] && [ "x$SDN_PLUGIN" == "xlinuxbridge" ]; then elif [ "x$PVC_BACKEND" == "x" ] && [ "x$SDN_PLUGIN" == "xlinuxbridge" ]; then
helm install --namespace=openstack ${WORK_DIR}/nova --name=nova \ helm install --namespace=openstack ${WORK_DIR}/nova --name=nova \
--values=${WORK_DIR}/tools/overrides/mvp/nova.yaml \ --values=${WORK_DIR}/tools/overrides/mvp/nova.yaml \
--set=conf.nova.libvirt.nova.conf.virt_type=qemu --set conf.nova.libvirt.nova.conf.virt_type=qemu
helm install --namespace=openstack ${WORK_DIR}/neutron --name=neutron \ helm install --namespace=openstack ${WORK_DIR}/neutron --name=neutron \
--values=${WORK_DIR}/tools/overrides/mvp/neutron-linuxbridge.yaml --values=${WORK_DIR}/tools/overrides/mvp/neutron-linuxbridge.yaml