Merge ~hopem/stsstack-bundles:make-ng-overlay into stsstack-bundles:master

[Edward Hope-Morley]

[Rodrigo Barbieri (rodrigo-barbieri2010)]

LGTM

review: Approve

diff --git a/openstack/generate-bundle.sh b/openstack/generate-bundle.sh
index d975810..cc5c222 100755
--- a/openstack/generate-bundle.sh
+++ b/openstack/generate-bundle.sh
@@ -43,6 +43,11 @@ parameters[__DESIGNATE_NAMESERVERS__]="ns1.${parameters[__DNS_DOMAIN__]}"
 parameters[__BIND_DNS_FORWARDER__]='10.198.200.1'
 parameters[__ML2_DNS_FORWARDER__]='10.198.200.1'
 
+# If using any variant of dvr-snat, there is no need for a neutron-gateway.
+if ! has_opt --dvr-snat* ${CACHED_STDIN[@]}; then
+    overlays+=( "neutron-gateway.yaml" )
+fi
+
 trap_help ${CACHED_STDIN[@]:-""}
 while (($# > 0))
 do
@@ -106,7 +111,6 @@ do
             get_units $1 __NUM_AGENTS_PER_ROUTER__ 3
             overlays+=( "neutron-dvr-snat.yaml" )
             set -- $@ --dvr-l3ha:${parameters[__NUM_AGENTS_PER_ROUTER__]}
-            parameters[__NUM_NEUTRON_GATEWAY_UNITS__]=0
             ;;
         --dvr-snat*)
             assert_min_release queens "dvr-snat" ${CACHED_STDIN[@]}
@@ -114,7 +118,6 @@ do
             get_units $1 __NUM_COMPUTE_UNITS__ 1
             overlays+=( "neutron-dvr.yaml" )
             overlays+=( "neutron-dvr-snat.yaml" )
-            parameters[__NUM_NEUTRON_GATEWAY_UNITS__]=0
             ;;
         --lma)
             # Logging Monitoring and Alarming
diff --git a/openstack/openstack.yaml.template b/openstack/openstack.yaml.template
index 707bae7..af3e091 100644
--- a/openstack/openstack.yaml.template
+++ b/openstack/openstack.yaml.template
@@ -68,16 +68,6 @@ applications:
       ssl_ca: *ssl_ca
       ssl_cert: *ssl_cert
       ssl_key: *ssl_key
-  neutron-gateway:
-    num_units: __NUM_NEUTRON_GATEWAY_UNITS__ 
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    constraints: mem=4G
-    options:
-      debug: *debug
-      verbose: *verbose
-      instance-mtu: 1300
-      bridge-mappings: physnet1:br-data
-      openstack-origin: *openstack_origin
   neutron-api:
     num_units: 1
     charm: cs:~openstack-charmers-next/neutron-api
@@ -152,14 +142,11 @@ relations:
   - [ cinder, rabbitmq-server ]
   - [ cinder, nova-cloud-controller ]
   - [ cinder, keystone ]
-  - [ neutron-gateway, nova-cloud-controller ]
   - [ "openstack-dashboard:identity-service", "keystone:identity-service" ]
-  - [ "neutron-gateway:amqp", rabbitmq-server ]
   - [ neutron-api, mysql ]
   - [ neutron-api, rabbitmq-server ]
   - [ neutron-api, nova-cloud-controller ]
   - [ neutron-api, neutron-openvswitch ]
   - [ neutron-api, keystone ]
-  - [ neutron-api, neutron-gateway ]
   - [ neutron-openvswitch, nova-compute ]
   - [ neutron-openvswitch, rabbitmq-server ]
diff --git a/overlays/neutron-gateway.yaml b/overlays/neutron-gateway.yaml
new file mode 100644
index 0000000..d780777
--- /dev/null
+++ b/overlays/neutron-gateway.yaml
@@ -0,0 +1,21 @@
+# Variables
+debug:                      &debug                     True
+verbose:                    &verbose                   True
+openstack_origin:           &openstack_origin          __OS_ORIGIN__
+
+applications:
+  neutron-gateway:
+    num_units: __NUM_NEUTRON_GATEWAY_UNITS__
+    charm: cs:~openstack-charmers-next/neutron-gateway
+    constraints: mem=4G
+    options:
+      debug: *debug
+      verbose: *verbose
+      instance-mtu: 1300
+      bridge-mappings: physnet1:br-data
+      openstack-origin: *openstack_origin
+relations:
+  - [ neutron-gateway, nova-cloud-controller ]
+  - [ "neutron-gateway:amqp", rabbitmq-server ]
+  - [ neutron-api, neutron-gateway ]
+