From dc1ae977a5a5eaee624010c003f67bdcbbb05374 Mon Sep 17 00:00:00 2001 From: Gage Hugo Date: Fri, 19 May 2017 16:00:07 -0500 Subject: [PATCH] Remove all trailing whitespaces This change removes any trailing whitespaces found while running: find . -type f -exec egrep -l " +$" {} \; Change-Id: Ic1dc8765a0971a32da4c3116871e9450a55b357f --- bootstrap/templates/secrets.yaml | 2 +- ceph/requirements.yaml | 2 +- etcd/templates/deployment.yaml | 2 +- helm-toolkit/templates/_endpoints.tpl | 6 +++--- helm-toolkit/utils/test/ceph-rbd-test.yaml | 2 +- horizon/templates/bin/_start.sh.tpl | 2 +- horizon/templates/deployment.yaml | 2 +- mariadb/templates/configmap-etc.yaml | 2 +- memcached/templates/deployment.yaml | 2 +- neutron/templates/bin/_neutron-openvswitch-agent.sh.tpl | 2 +- neutron/templates/bin/_openvswitch-db-server.sh.tpl | 2 +- rabbitmq/templates/deployment.yaml | 4 ++-- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/bootstrap/templates/secrets.yaml b/bootstrap/templates/secrets.yaml index 6410e998c8..2bd43ac310 100644 --- a/bootstrap/templates/secrets.yaml +++ b/bootstrap/templates/secrets.yaml @@ -18,7 +18,7 @@ kind: Secret metadata: name: "pvc-ceph-conf-combined-storageclass" type: kubernetes.io/rbd -data: +data: key: | {{ include "secrets/ceph-client-key" . | b64enc | indent 4 }} --- diff --git a/ceph/requirements.yaml b/ceph/requirements.yaml index 7a05316a84..53782e69b2 100644 --- a/ceph/requirements.yaml +++ b/ceph/requirements.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -dependencies: +dependencies: - name: helm-toolkit repository: http://localhost:8879/charts version: 0.1.0 diff --git a/etcd/templates/deployment.yaml b/etcd/templates/deployment.yaml index b0a4e43d30..f09ad89ce0 100644 --- a/etcd/templates/deployment.yaml +++ b/etcd/templates/deployment.yaml @@ -11,7 +11,7 @@ spec: rollingUpdate: maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }} maxSurge: {{ .Values.upgrades.rolling_update.max_surge }} - {{ end }} + {{ end }} template: metadata: labels: diff --git a/helm-toolkit/templates/_endpoints.tpl b/helm-toolkit/templates/_endpoints.tpl index d3bbf97f2f..d6b27f25c1 100644 --- a/helm-toolkit/templates/_endpoints.tpl +++ b/helm-toolkit/templates/_endpoints.tpl @@ -42,10 +42,10 @@ # this function helps resolve database style endpoints, which really follow the same # pattern as above, except they have a username and password component -# +# # presuming that .Values contains an endpoint: definition for 'neutron-db' with the # appropriate attributes, a call such as: -# +# # { tuple "neutron-db" "internal" "userClass" "portName" . | include "helm-toolkit.authenticated_endpoint_uri_lookup" } # # where portName is optional if a default port has been defined in .Values @@ -76,7 +76,7 @@ {{- end -}} # this function returns hostnames from endpoint definitions for use cases -# where the uri style return is not appropriate, and only the hostname +# where the uri style return is not appropriate, and only the hostname # portion is used or relevant in the template # # { tuple "memcache" "internal" "portName" . | include "helm-toolkit.hostname_endpoint_uri_lookup" } diff --git a/helm-toolkit/utils/test/ceph-rbd-test.yaml b/helm-toolkit/utils/test/ceph-rbd-test.yaml index a49e185938..32b91d2a28 100644 --- a/helm-toolkit/utils/test/ceph-rbd-test.yaml +++ b/helm-toolkit/utils/test/ceph-rbd-test.yaml @@ -37,4 +37,4 @@ spec: image: ceph-rbd-test pool: rbd secretRef: - name: ceph-client-key + name: ceph-client-key diff --git a/horizon/templates/bin/_start.sh.tpl b/horizon/templates/bin/_start.sh.tpl index f843e145d2..9cebe1a648 100644 --- a/horizon/templates/bin/_start.sh.tpl +++ b/horizon/templates/bin/_start.sh.tpl @@ -22,7 +22,7 @@ rm -rf /var/run/apache2/* APACHE_DIR="apache2" # Compress Horizon's assets. -/var/lib/kolla/venv/bin/manage.py collectstatic --noinput +/var/lib/kolla/venv/bin/manage.py collectstatic --noinput /var/lib/kolla/venv/bin/manage.py compress --force rm -rf /tmp/_tmp_.secret_key_store.lock /tmp/.secret_key_store diff --git a/horizon/templates/deployment.yaml b/horizon/templates/deployment.yaml index ae81b893c0..2425334415 100644 --- a/horizon/templates/deployment.yaml +++ b/horizon/templates/deployment.yaml @@ -27,7 +27,7 @@ spec: rollingUpdate: maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }} maxSurge: {{ .Values.upgrades.rolling_update.max_surge }} - {{ end }} + {{ end }} template: metadata: labels: diff --git a/mariadb/templates/configmap-etc.yaml b/mariadb/templates/configmap-etc.yaml index c378787dd9..ffd433ca89 100644 --- a/mariadb/templates/configmap-etc.yaml +++ b/mariadb/templates/configmap-etc.yaml @@ -32,4 +32,4 @@ data: networking.cnf: | {{ tuple "etc/_networking.cnf.tpl" . | include "helm-toolkit.template" | indent 4 }} wsrep.cnf: | -{{ tuple "etc/_wsrep.cnf.tpl" . | include "helm-toolkit.template" | indent 4 }} +{{ tuple "etc/_wsrep.cnf.tpl" . | include "helm-toolkit.template" | indent 4 }} diff --git a/memcached/templates/deployment.yaml b/memcached/templates/deployment.yaml index f9c755b7c7..80aab307a8 100644 --- a/memcached/templates/deployment.yaml +++ b/memcached/templates/deployment.yaml @@ -25,7 +25,7 @@ spec: rollingUpdate: maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }} maxSurge: {{ .Values.upgrades.rolling_update.max_surge }} - {{ end }} + {{ end }} template: metadata: labels: diff --git a/neutron/templates/bin/_neutron-openvswitch-agent.sh.tpl b/neutron/templates/bin/_neutron-openvswitch-agent.sh.tpl index 9bcbd21930..7b51ce5f44 100644 --- a/neutron/templates/bin/_neutron-openvswitch-agent.sh.tpl +++ b/neutron/templates/bin/_neutron-openvswitch-agent.sh.tpl @@ -22,7 +22,7 @@ chown neutron: /run/openvswitch/db.sock # on deaemonsets - note that a show is not sufficient # here, we need to communicate with both the db and vswitchd # which means we need to do a create action -# +# # see https://github.com/att-comdev/openstack-helm/issues/88 timeout 3m neutron-sanity-check --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --ovsdb_native --nokeepalived_ipv6_support diff --git a/neutron/templates/bin/_openvswitch-db-server.sh.tpl b/neutron/templates/bin/_openvswitch-db-server.sh.tpl index 5266e1740d..4df198e8bb 100644 --- a/neutron/templates/bin/_openvswitch-db-server.sh.tpl +++ b/neutron/templates/bin/_openvswitch-db-server.sh.tpl @@ -21,5 +21,5 @@ if [[ ! -e "/run/openvswitch/conf.db" ]]; then ovsdb-tool create "/run/openvswitch/conf.db" fi -umask 000 +umask 000 exec /usr/sbin/ovsdb-server /run/openvswitch/conf.db -vconsole:emer -vconsole:err -vconsole:info --remote=punix:/run/openvswitch/db.sock diff --git a/rabbitmq/templates/deployment.yaml b/rabbitmq/templates/deployment.yaml index a5fa4ab31b..07f4aef759 100644 --- a/rabbitmq/templates/deployment.yaml +++ b/rabbitmq/templates/deployment.yaml @@ -27,7 +27,7 @@ spec: rollingUpdate: maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }} maxSurge: {{ .Values.upgrades.rolling_update.max_surge }} - {{ end }} + {{ end }} template: metadata: labels: @@ -70,7 +70,7 @@ spec: containers: - name: rabbitmq image: {{ .Values.images.rabbitmq }} - {{- if .Values.resources.enabled }} + {{- if .Values.resources.enabled }} resources: limits: cpu: {{ .Values.resources.api.limits.cpu | quote }}