Merge pull request #15 from tgerdes/remove_rpc_backend
Remove deprecated rpc_backend setting on newton and ocata.
diff --git a/.kitchen.travis.yml b/.kitchen.travis.yml
new file mode 100644
index 0000000..f847543
--- /dev/null
+++ b/.kitchen.travis.yml
@@ -0,0 +1,6 @@
+suites:
+
+ - name: <%= ENV['SUITE'] %>
+ provisioner:
+ pillars-from-files:
+ neutron.sls: tests/pillar/<%= ENV['SUITE'] %>.sls
diff --git a/.travis.yml b/.travis.yml
index 7a77247..3925301 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,15 +17,35 @@
- bundle install
env:
- - PLATFORM=trevorj/salty-whales:trusty
- - PLATFORM=trevorj/salty-whales:xenial
+ - PLATFORM=trevorj/salty-whales:trusty SUITE=compute_dpdk
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=compute_dpdk
+ - PLATFORM=trevorj/salty-whales:trusty SUITE=compute_dvr
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=compute_dvr
+ - PLATFORM=trevorj/salty-whales:trusty SUITE=compute_legacy
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=compute_legacy
+ - PLATFORM=trevorj/salty-whales:trusty SUITE=compute_nonexternal_dvr
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=compute_nonexternal_dvr
+ - PLATFORM=trevorj/salty-whales:trusty SUITE=compute_sriov
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=compute_sriov
+ - PLATFORM=trevorj/salty-whales:trusty SUITE=control_cluster
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=control_cluster
+ - PLATFORM=trevorj/salty-whales:trusty SUITE=control_dvr
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=control_dvr
+ - PLATFORM=trevorj/salty-whales:trusty SUITE=control_nodvr
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=control_nodvr
+ - PLATFORM=trevorj/salty-whales:trusty SUITE=control_single
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=control_single
+ - PLATFORM=trevorj/salty-whales:trusty SUITE=gateway_dvr
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=gateway_dvr
+ - PLATFORM=trevorj/salty-whales:trusty SUITE=gateway_legacy
+ - PLATFORM=trevorj/salty-whales:xenial SUITE=gateway_legacy
before_script:
- set -o pipefail
- make test | tail
script:
- - test ! -e .kitchen.yml || bundle exec kitchen test -t tests/integration
+ - KITCHEN_LOCAL_YAML=.kitchen.travis.yml bundle exec kitchen test -t tests/integration
notifications:
webhooks:
diff --git a/neutron/compute.sls b/neutron/compute.sls
index bfefb53..cb02136 100644
--- a/neutron/compute.sls
+++ b/neutron/compute.sls
@@ -32,13 +32,15 @@
service.running:
- name: neutron-sriov-agent
- enable: true
+ {%- if grains.get('noservices') %}
+ - onlyif: /bin/false
+ {%- endif %}
- watch_in:
- service: neutron_compute_services
- watch:
- file: /etc/neutron/neutron.conf
- file: /etc/neutron/plugins/ml2/openvswitch_agent.ini
- file: /etc/neutron/plugins/ml2/sriov_agent.ini
- - unless: grains.get('noservices', False)
{% endif %}
diff --git a/neutron/files/newton/l3_agent.ini b/neutron/files/newton/l3_agent.ini
index 0095ab7..c36965b 100644
--- a/neutron/files/newton/l3_agent.ini
+++ b/neutron/files/newton/l3_agent.ini
@@ -90,10 +90,12 @@
# be used. (string value)
#external_ingress_mark = 0x2
-# Name of bridge used for external network traffic. This should be set to an empty value for the Linux Bridge. When this parameter is set,
-# each L3 agent can be associated with no more than one external network. (string value)
-#external_network_bridge = br-ex
-external_network_bridge =
+# DEPRECATED: Name of bridge used for external network traffic. When this parameter is set, the L3 agent will plug an interface directly
+# into an external bridge which will not allow any wiring by the L2 agent. Using this will result in incorrect port statuses. This option is
+# deprecated and will be removed in Ocata. (string value)
+# This option is deprecated for removal.
+# Its value may be silently ignored in the future.
+#external_network_bridge =
# Seconds between running periodic tasks (integer value)
#periodic_interval = 40
diff --git a/neutron/files/ocata/l3_agent.ini b/neutron/files/ocata/l3_agent.ini
index 44b27ff..c0591e1 100644
--- a/neutron/files/ocata/l3_agent.ini
+++ b/neutron/files/ocata/l3_agent.ini
@@ -106,7 +106,6 @@
# This option is deprecated for removal.
# Its value may be silently ignored in the future.
#external_network_bridge =
-external_network_bridge =
# Seconds between running periodic tasks. (integer value)
#periodic_interval = 40
diff --git a/neutron/server.sls b/neutron/server.sls
index 5bf73e3..b652193 100644
--- a/neutron/server.sls
+++ b/neutron/server.sls
@@ -27,14 +27,15 @@
pkg.installed:
- name: neutron-plugin-contrail
-{%- if not grains.get('noservices', False) %}
neutron_server_service:
service.running:
- name: neutron-server
- enable: true
+ {%- if grains.get('noservices') %}
+ - onlyif: /bin/false
+ {%- endif %}
- watch:
- file: /etc/neutron/neutron.conf
-{%- endif %}
{%- endif %}
@@ -55,14 +56,15 @@
- require:
- file: /etc/neutron/plugins/ml2/ml2_conf.ini
-{%- if not grains.get('noservices', False) %}
neutron_db_manage:
cmd.run:
- name: neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head
+ {%- if grains.get('noservices') %}
+ - onlyif: /bin/false
+ {%- endif %}
- require:
- file: /etc/neutron/neutron.conf
- file: /etc/neutron/plugins/ml2/ml2_conf.ini
-{%- endif %}
{%- endif %}
@@ -112,14 +114,11 @@
- template: jinja
- require:
- pkg: neutron_server_packages
-{%- if not grains.get('noservices', False) %}
- watch_in:
- service: neutron_server_services
{%- endif %}
-{%- endif %}
-
{%- if server.backend.engine == "midonet" %}
/etc/neutron/plugins/midonet/midonet.ini:
@@ -132,14 +131,15 @@
- dir_mode: 755
- template: jinja
-{%- if not grains.get('noservices', False) %}
neutron_db_manage:
cmd.run:
- name: neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/midonet/midonet.ini upgrade head
+ {%- if grains.get('noservices') %}
+ - onlyif: /bin/false
+ {%- endif %}
- require:
- file: /etc/neutron/neutron.conf
- file: /etc/neutron/plugins/midonet/midonet.ini
-{%- endif %}
{%- if server.version == "kilo" %}
@@ -162,29 +162,29 @@
- python-neutron-lbaas
- python-neutron-fwaas
-{%- if not grains.get('noservices', False) %}
neutron_db_manage:
cmd.run:
- name: neutron-db-manage --subproject networking-midonet upgrade head
+ {%- if grains.get('noservices') %}
+ - onlyif: /bin/false
+ {%- endif %}
- require:
- file: /etc/neutron/neutron.conf
- file: /etc/neutron/plugins/midonet/midonet.ini
-{%- endif %}
{%- endif %}
{%- endif %}
-{%- if not grains.get('noservices', False) %}
-
neutron_server_services:
service.running:
- names: {{ server.services }}
- enable: true
+ {%- if grains.get('noservices') %}
+ - onlyif: /bin/false
+ {%- endif %}
- watch:
- file: /etc/neutron/neutron.conf
-{%- endif %}
-
{%- if grains.get('virtual_subtype', None) == "Docker" %}
neutron_entrypoint: