From f9cb3fc8461cf6506ac03e85e07b19774267933d Mon Sep 17 00:00:00 2001 From: Alan Meadows Date: Tue, 3 Jan 2017 15:53:06 -0800 Subject: [PATCH 1/2] Bugfix a few typos from last three PRs This resolves a few issues that crept in with the last three pull requests. --- Makefile | 6 ++++-- ceph/templates/service.yaml | 1 - .../templates/bin/_openvswitch-ensure-configured.sh.tpl | 7 ++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index de505d3ce3..e41c249ce6 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,10 @@ B64_DIRS := common/secrets 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 -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 @@ -27,6 +27,8 @@ glance: build-glance neutron: build-neutron +nova: build-nova + memcached: build-memcached openstack: build-openstack diff --git a/ceph/templates/service.yaml b/ceph/templates/service.yaml index cdfd4f5590..1a5f85b88e 100644 --- a/ceph/templates/service.yaml +++ b/ceph/templates/service.yaml @@ -33,5 +33,4 @@ spec: selector: app: ceph daemon: rgw - type: LoadBalancer {{- end }} diff --git a/neutron/templates/bin/_openvswitch-ensure-configured.sh.tpl b/neutron/templates/bin/_openvswitch-ensure-configured.sh.tpl index 041af73752..5571408dc2 100644 --- a/neutron/templates/bin/_openvswitch-ensure-configured.sh.tpl +++ b/neutron/templates/bin/_openvswitch-ensure-configured.sh.tpl @@ -4,12 +4,9 @@ set -x bridge=$1 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 - +# 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-port $bridge $port From c089434209f78b9dfd81090b6a995aefd494115b Mon Sep 17 00:00:00 2001 From: Alan Meadows Date: Tue, 3 Jan 2017 16:53:06 -0800 Subject: [PATCH 2/2] Remove nova entry from Makefile that inadvertantly crept in --- Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e41c249ce6..de505d3ce3 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,10 @@ B64_DIRS := common/secrets B64_EXCLUDE := $(wildcard common/secrets/*.b64) -CHARTS := ceph mariadb rabbitmq GLANCE memcached keystone glance horizon neutron nova openstack +CHARTS := ceph mariadb rabbitmq GLANCE memcached keystone glance horizon neutron openstack COMMON_TPL := common/templates/_globals.tpl -all: common ceph bootstrap mariadb rabbitmq memcached keystone glance horizon neutron nova openstack +all: common ceph bootstrap mariadb rabbitmq memcached keystone glance horizon neutron openstack common: build-common @@ -27,8 +27,6 @@ glance: build-glance neutron: build-neutron -nova: build-nova - memcached: build-memcached openstack: build-openstack