openstack/openstack-helm
Code Issues Proposed changes

Bugfix a few typos from last three PRs

Browse Source 
This resolves a few issues that crept in with the last
three pull requests.
This commit is contained in:
Alan Meadows 2017-01-03 15:53:06 -08:00
parent 92512d66bb
commit f9cb3fc846
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -3,10 +3,10 @@
B64_DIRS := common/secrets B64_DIRS := common/secrets
B64_EXCLUDE := $(wildcard common/secrets/*.b64) B64_EXCLUDE := $(wildcard common/secrets/*.b64)
CHARTS := ceph mariadb rabbitmq GLANCE memcached keystone glance horizon neutron openstack CHARTS := ceph mariadb rabbitmq GLANCE memcached keystone glance horizon neutron nova openstack
COMMON_TPL := common/templates/_globals.tpl COMMON_TPL := common/templates/_globals.tpl
all: common ceph bootstrap mariadb rabbitmq memcached keystone glance horizon neutron openstack all: common ceph bootstrap mariadb rabbitmq memcached keystone glance horizon neutron nova openstack
common: build-common common: build-common
@ -27,6 +27,8 @@ glance: build-glance
neutron: build-neutron neutron: build-neutron
nova: build-nova
memcached: build-memcached memcached: build-memcached
openstack: build-openstack openstack: build-openstack

1
ceph/templates/service.yaml
View File

@ -33,5 +33,4 @@ spec:
selector: selector:
app: ceph app: ceph
daemon: rgw daemon: rgw
type: LoadBalancer
{{- end }} {{- end }}

7
neutron/templates/bin/_openvswitch-ensure-configured.sh.tpl
View File

@ -4,12 +4,9 @@ set -x
bridge=$1 bridge=$1
port=$2 port=$2
# one time deal
ovs-vsctl --no-wait --if-exists del-port physnet1 enp11s0f0
ovs-vsctl --no-wait --if-exists del-br physnet1
# note that only "br-ex" is definable right now # note that only "br-ex" is definable right now
# and br-int and br-tun are assumed and handled
# by the agent
ovs-vsctl --no-wait --may-exist add-br $bridge ovs-vsctl --no-wait --may-exist add-br $bridge
ovs-vsctl --no-wait --may-exist add-port $bridge $port ovs-vsctl --no-wait --may-exist add-port $bridge $port