From ca9a78765a82c4739fe78630b8380c95c7bf7a5b Mon Sep 17 00:00:00 2001 From: Chris Wedgwood Date: Wed, 13 Sep 2017 22:01:41 +0000 Subject: [PATCH] Pedant: prefer "--set " over "--set=" Change-Id: I02e47b411ed3702c70da1fd42deef5d25ad2add2 --- doc/source/install/developer/all-in-one.rst | 4 ++-- tools/gate/launch-osh/basic.sh | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/source/install/developer/all-in-one.rst b/doc/source/install/developer/all-in-one.rst index 5411ed1b6d..c20526e81f 100644 --- a/doc/source/install/developer/all-in-one.rst +++ b/doc/source/install/developer/all-in-one.rst @@ -236,11 +236,11 @@ more sensible values for the All-in-One environment using the ``--values`` and --set storage=pvc helm install --name=nova ./nova --namespace=openstack \ --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 \ --namespace=openstack --values=./tools/overrides/mvp/neutron-ovs.yaml 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 insight into the services' deployment status. diff --git a/tools/gate/launch-osh/basic.sh b/tools/gate/launch-osh/basic.sh index e1bbce6bf4..e05f77ee90 100755 --- a/tools/gate/launch-osh/basic.sh +++ b/tools/gate/launch-osh/basic.sh @@ -91,7 +91,7 @@ if [ "x$INTEGRATION" == "xmulti" ]; then helm install --namespace=openstack ${WORK_DIR}/mariadb --name=mariadb else helm install --namespace=openstack ${WORK_DIR}/mariadb --name=mariadb \ - --set=pod.replicas.server=1 + --set pod.replicas.server=1 fi helm install --namespace=openstack ${WORK_DIR}/memcached --name=memcached 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 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 \ --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 helm install --namespace=openstack ${WORK_DIR}/nova --name=nova \ --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 \ --values=${WORK_DIR}/tools/overrides/mvp/neutron-ovs.yaml elif [ "x$PVC_BACKEND" == "xceph" ] && [ "x$SDN_PLUGIN" == "xlinuxbridge" ]; then helm install --namespace=openstack ${WORK_DIR}/nova --name=nova \ - --set=dependencies.compute.daemonset={neutron-lb-agent} \ - --set=conf.nova.libvirt.nova.conf.virt_type=qemu + --set dependencies.compute.daemonset={neutron-lb-agent} \ + --set conf.nova.libvirt.nova.conf.virt_type=qemu helm install --namespace=openstack ${WORK_DIR}/neutron --name=neutron \ --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 helm install --namespace=openstack ${WORK_DIR}/nova --name=nova \ --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 \ --values=${WORK_DIR}/tools/overrides/mvp/neutron-linuxbridge.yaml