Merge "Detaching openvswitch logic from neutron/compute.sls into separate file to make state reading and analysis easier."
diff --git a/.travis.yml b/.travis.yml
index 0ec0a3d..f58cc31 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,23 +17,23 @@
- bundle install
env:
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=compute-dpdk
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=compute-dvr
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=compute-legacy
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=compute-sriov
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=compute-qos
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=control-cluster
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=control-nodvr
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=control-lbaas-octavia
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=control-fwaas-v1
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=control-l2gw
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=control-opendaylight
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=control-ovn
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=gateway-dvr
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=gateway-legacy
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=gateway-legacy-fwaas-v1
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=gateway-legacy-l2gw
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=gateway-legacy-opendaylight
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=compute-dpdk
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=compute-dvr
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=compute-legacy
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=compute-sriov
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=compute-qos
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=control-cluster
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=control-nodvr
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=control-lbaas-octavia
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=control-fwaas-v1
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=control-l2gw
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=control-opendaylight
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=control-ovn
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=gateway-dvr
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=gateway-legacy
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=gateway-legacy-fwaas-v1
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=gateway-legacy-l2gw
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=gateway-legacy-opendaylight
- PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=compute-dpdk
- PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=compute-dvr-fwaas-v1
- PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=compute-nonexternal-dvr
diff --git a/README.rst b/README.rst
index 4c4bb32..2c12678 100644
--- a/README.rst
+++ b/README.rst
@@ -1,13 +1,13 @@
-===============
-Neutron Formula
-===============
+=====
+Usage
+=====
-Neutron is an OpenStack project to provide "networking as a service" between
+Neutron is an OpenStack project to provide *networking as a service* between
interface devices (e.g., vNICs) managed by other Openstack services (e.g.,
nova).
-Starting in the Folsom release, Neutron is a core and supported part of the
-OpenStack platform (for Essex, we were an "incubated" project, which means use
+Starting with the Folsom release, Neutron is a core and supported part of the
+OpenStack platform (for Essex, we were an *incubated* project, which means use
is suggested only for those who really know what they're doing with Neutron).
Sample Pillars
@@ -62,12 +62,11 @@
audit:
enabled: false
-Note: The pagination is useful to retrieve a large bunch of resources,
-because a single request may fail (timeout). This is enabled with both
-parameters *allow_pagination* and *pagination_max_limit* as shown above.
+.. note:: The pagination is useful to retrieve a large bunch of resources,
+ because a single request may fail (timeout). This is enabled with both
+ parameters *allow_pagination* and *pagination_max_limit* as shown above.
-
-Configuration of policy.json file
+Configuration of policy.json file:
.. code-block:: yaml
@@ -105,16 +104,16 @@
engine: avinetworks
...
-Note: If the Contrail backend is set, Opencontrail loadbalancer would be enabled
-automatically. In this case lbaas should disabled in pillar:
+.. note:: If the Contrail backend is set, Opencontrail loadbalancer
+ would be enabled automatically. In this case lbaas should disabled
+ in pillar:
-.. code-block:: yaml
+ .. code-block:: yaml
- neutron:
- server:
- lbaas:
- enabled: false
-
+ neutron:
+ server:
+ lbaas:
+ enabled: false
Neutron FWaaSv1 enablement
--------------------------
@@ -143,7 +142,6 @@
allow_credentials: True
max_age: 86400
-
Neutron VXLAN tenant networks with Network nodes
------------------------------------------------
@@ -157,7 +155,7 @@
The intention is that each tenant will require at least two (2) vrouters
one to be utilised
-Neutron Server
+Neutron Server:
.. code-block:: yaml
@@ -201,7 +199,7 @@
ovs:
driver: openvswitch
-Network Node
+Network Node:
.. code-block:: yaml
@@ -234,7 +232,7 @@
dhcp:
ovs_use_veth: False
-Compute Node
+Compute Node:
.. code-block:: yaml
@@ -332,7 +330,7 @@
Specify different mtu values for different physnets
---------------------------------------------------
-Neutron Server
+Neutron Server:
.. code-block:: yaml
@@ -350,7 +348,7 @@
This section describes a network solution that utilises VxLAN overlay
networks without DVR with all routers being managed on the network nodes.
-Neutron Server
+Neutron Server:
.. code-block:: yaml
@@ -393,7 +391,7 @@
ovs:
driver: openvswitch
-Network Node
+Network Node:
.. code-block:: yaml
@@ -422,7 +420,7 @@
ovs:
driver: openvswitch
-Compute Node
+Compute Node:
.. code-block:: yaml
@@ -450,13 +448,14 @@
Neutron VXLAN tenant networks with Network Nodes with DVR
---------------------------------------------------------
-With DVR for East-West and North-South, DVR everywhere, Network node for SNAT.
+With DVR for East-West and North-South, DVR everywhere, Network
+node for SNAT.
This section describes a network solution that utilises VxLAN
overlay networks with DVR with North-South and East-West. Network
Node is used only for SNAT.
-Neutron Server
+Neutron Server:
.. code-block:: yaml
@@ -499,7 +498,7 @@
ovs:
driver: openvswitch
-Network Node
+Network Node:
.. code-block:: yaml
@@ -528,7 +527,7 @@
ovs:
driver: openvswitch
-Compute Node
+Compute Node:
.. code-block:: yaml
@@ -558,7 +557,7 @@
ovs:
driver: openvswitch
-Sample Linux network configuration for DVR
+Sample Linux network configuration for DVR:
.. code-block:: yaml
@@ -624,10 +623,11 @@
Additonal VXLAN tenant network settings
---------------------------------------
-The default multicast group of 224.0.0.1 only multicasts to a single subnet.
-Allow overriding it to allow larger underlay network topologies.
+The default multicast group of ``224.0.0.1`` only multicasts
+to a single subnet. Allow overriding it to allow larger underlay
+network topologies.
-Neutron Server
+Neutron Server:
.. code-block:: yaml
@@ -642,7 +642,7 @@
VLAN tenant provider
-Neutron Server only
+Neutron Server only:
.. code-block:: yaml
@@ -663,7 +663,7 @@
ovs:
driver: openvswitch
-Compute node
+Compute node:
.. code-block:: yaml
@@ -684,7 +684,7 @@
Neutron with explicit physical networks
---------------------------------------
-Neutron Server only
+Neutron Server only:
.. code-block:: yaml
@@ -723,7 +723,7 @@
Neutron OVS DPDK
-Enable datapath netdev for neutron openvswitch agent
+Enable datapath netdev for neutron openvswitch agent:
.. code-block:: yaml
@@ -747,7 +747,7 @@
ovs:
driver: openvswitch
-Neutron OVS SR-IOV
+Neutron OVS SR-IOV:
.. code-block:: yaml
@@ -798,7 +798,7 @@
vlan_aware_vms: true
Neutron with BGP VPN (BaGPipe driver)
----------------------------
+-------------------------------------
.. code-block:: yaml
@@ -869,7 +869,6 @@
backend:
engine: ovn
-
Neutron L2 Gateway
----------------
@@ -965,7 +964,7 @@
Neutron Server
--------------
-Neutron Server with OpenContrail
+Neutron Server with OpenContrail:
.. code-block:: yaml
@@ -980,7 +979,7 @@
tenant: admin
token: token
-Neutron Server with Midonet
+Neutron Server with Midonet:
.. code-block:: yaml
@@ -993,7 +992,7 @@
user: admin
password: password
-Neutron Server with NSX
+Neutron Server with NSX:
.. code-block:: yaml
@@ -1016,7 +1015,7 @@
port: '443'
insecure: true
-Neutron Keystone region
+Neutron Keystone region:
.. code-block:: yaml
@@ -1032,7 +1031,7 @@
region: RegionTwo
...
-Client-side RabbitMQ HA setup
+Client-side RabbitMQ HA setup:
.. code-block:: yaml
@@ -1050,54 +1049,49 @@
virtual_host: '/openstack'
....
-
Configuring TLS communications
------------------------------
-
-**Note:** by default system wide installed CA certs are used, so ``cacert_file`` param is optional, as well as ``cacert``.
-
+.. note:: By default, system-wide installed CA certs are used,
+ so ``cacert_file`` param is optional, as well as ``cacert``.
- **RabbitMQ TLS**
-.. code-block:: yaml
+ .. code-block:: yaml
- neutron:
- server, gateway, compute:
- message_queue:
- port: 5671
- ssl:
- enabled: True
- (optional) cacert: cert body if the cacert_file does not exists
- (optional) cacert_file: /etc/openstack/rabbitmq-ca.pem
- (optional) version: TLSv1_2
-
+ neutron:
+ server, gateway, compute:
+ message_queue:
+ port: 5671
+ ssl:
+ enabled: True
+ (optional) cacert: cert body if the cacert_file does not exists
+ (optional) cacert_file: /etc/openstack/rabbitmq-ca.pem
+ (optional) version: TLSv1_2
- **MySQL TLS**
-.. code-block:: yaml
+ .. code-block:: yaml
- neutron:
- server:
- database:
- ssl:
- enabled: True
- (optional) cacert: cert body if the cacert_file does not exists
- (optional) cacert_file: /etc/openstack/mysql-ca.pem
+ neutron:
+ server:
+ database:
+ ssl:
+ enabled: True
+ (optional) cacert: cert body if the cacert_file does not exists
+ (optional) cacert_file: /etc/openstack/mysql-ca.pem
- **Openstack HTTPS API**
+ .. code-block:: yaml
-.. code-block:: yaml
+ neutron:
+ server:
+ identity:
+ protocol: https
+ (optional) cacert_file: /etc/openstack/proxy.pem
- neutron:
- server:
- identity:
- protocol: https
- (optional) cacert_file: /etc/openstack/proxy.pem
-
-
-Enable auditing filter, ie: CADF
+Enable auditing filter, ie: CADF:
.. code-block:: yaml
@@ -1117,7 +1111,7 @@
map_file: '/etc/pycadf/neutron_api_audit_map.conf'
....
-Neutron with security groups disabled
+Neutron with security groups disabled:
.. code-block:: yaml
@@ -1135,7 +1129,7 @@
Neutron Client
--------------
-Neutron networks
+Neutron networks:
.. code-block:: yaml
@@ -1174,7 +1168,7 @@
network:
...
-Neutron routers
+Neutron routers:
.. code-block:: yaml
@@ -1196,10 +1190,9 @@
router:
...
- TODO: implement adding new interfaces to a router while updating it
+.. TODO implement adding new interfaces to a router while updating it
-
-Neutron security groups
+Neutron security groups:
.. code-block:: yaml
@@ -1233,10 +1226,10 @@
security_group:
...
- TODO: implement updating existing security rules (now it adds new rule if trying to update existing one)
+.. TODO: implement updating existing security rules (now it adds new rule if
+ trying to update existing one)
-
-Floating IP addresses
+Floating IP addresses:
.. code-block:: yaml
@@ -1256,12 +1249,12 @@
...
.. note:: The network must have flag router:external set to True.
- Instance port in the stated subnet will be associated with the dynamically generated floating IP.
-
-
+ Instance port in the stated subnet will be associated
+ with the dynamically generated floating IP.
Enable Neutron extensions (QoS, DNS, etc.)
------------------------------------------
+
.. code-block:: yaml
neutron:
@@ -1279,6 +1272,7 @@
Different Neutron extensions for different agents
-------------------------------------------------
+
.. code-block:: yaml
neutron:
@@ -1297,9 +1291,9 @@
dummy:
enabled: True
-
Neutron with Designate
-----------------------------------------
+
.. code-block:: yaml
neutron:
@@ -1314,6 +1308,7 @@
Enable RBAC for OpenContrail engine
-----------------------------------
+
.. code-block:: yaml
neutron:
@@ -1326,14 +1321,21 @@
Enhanced logging with logging.conf
----------------------------------
-By default logging.conf is disabled.
+By default ``logging.conf`` is disabled.
That is possible to enable per-binary logging.conf with new variables:
- * openstack_log_appender - set it to true to enable log_config_append for all OpenStack services;
- * openstack_fluentd_handler_enabled - set to true to enable FluentHandler for all Openstack services.
- * openstack_ossyslog_handler_enabled - set to true to enable OSSysLogHandler for all Openstack services.
-Only WatchedFileHandler, OSSysLogHandler and FluentHandler are available.
+* ``openstack_log_appender``
+ Set to true to enable ``log_config_append`` for all OpenStack services
+
+* ``openstack_fluentd_handler_enabled``
+ Set to true to enable FluentHandler for all Openstack services
+
+* ``openstack_ossyslog_handler_enabled``
+ Set to true to enable OSSysLogHandler for all Openstack services.
+
+Only ``WatchedFileHandler``, ``OSSysLogHandler``, and ``FluentHandler``
+are available.
Also it is possible to configure this with pillar:
@@ -1398,36 +1400,29 @@
level: 'DEBUG'
......
-
Documentation and Bugs
======================
-To learn how to install and update salt-formulas, consult the documentation
-available online at:
+* http://salt-formulas.readthedocs.io/
+ Learn how to install and update salt-formulas
- http://salt-formulas.readthedocs.io/
+* https://github.com/salt-formulas/salt-formula-neutron/issues
+ In the unfortunate event that bugs are discovered, report the issue to the
+ appropriate issue tracker. Use the Github issue tracker for a specific salt
+ formula
-In the unfortunate event that bugs are discovered, they should be reported to
-the appropriate issue tracker. Use Github issue tracker for specific salt
-formula:
+* https://launchpad.net/salt-formulas
+ For feature requests, bug reports, or blueprints affecting the entire
+ ecosystem, use the Launchpad salt-formulas project
- https://github.com/salt-formulas/salt-formula-neutron/issues
+* https://launchpad.net/~salt-formulas-users
+ Join the salt-formulas-users team and subscribe to mailing list if required
-For feature requests, bug reports or blueprints affecting entire ecosystem,
-use Launchpad salt-formulas project:
+* https://github.com/salt-formulas/salt-formula-neutron
+ Develop the salt-formulas projects in the master branch and then submit pull
+ requests against a specific formula
- https://launchpad.net/salt-formulas
+* #salt-formulas @ irc.freenode.net
+ Use this IRC channel in case of any questions or feedback which is always
+ welcome
-You can also join salt-formulas-users team and subscribe to mailing list:
-
- https://launchpad.net/~salt-formulas-users
-
-Developers wishing to work on the salt-formulas projects should always base
-their work on master branch and submit pull request against specific formula.
-
- https://github.com/salt-formulas/salt-formula-neutron
-
-Any questions or feedback is always welcome so feel free to join our IRC
-channel:
-
- #salt-formulas @ irc.freenode.net
diff --git a/neutron/compute.sls b/neutron/compute.sls
index c162a57..5e61e6e 100644
--- a/neutron/compute.sls
+++ b/neutron/compute.sls
@@ -15,6 +15,7 @@
- names:
- neutron-dhcp-agent
- watch:
+ - file: /etc/neutron/neutron.conf
- file: /etc/neutron/dhcp_agent.ini
- require:
- pkg: neutron_dhcp_agent_packages
diff --git a/neutron/db/offline_sync.sls b/neutron/db/offline_sync.sls
new file mode 100644
index 0000000..a646814
--- /dev/null
+++ b/neutron/db/offline_sync.sls
@@ -0,0 +1,26 @@
+{%- from "neutron/map.jinja" import server, fwaas with context %}
+
+include:
+ - neutron.db.plugins.midonet
+ - neutron.db.plugins.service.bgpvpn
+
+{#- TODO(vsaienko): move this to map.jinja or pillars that should be included for specific plugins #}
+{%- set config_files = ['/etc/neutron/neutron.conf'] %}
+{%- if server.backend.engine in ["ml2", "ovn"] %}
+{%- do config_files.append('/etc/neutron/plugins/ml2/ml2_conf.ini') %}
+{%- elif server.backend.engine == "midonet" %}
+{%- do config_files.append('/etc/neutron/plugins/midonet/midonet.ini') %}
+{%- elif server.backend.engine == "vmware" %}
+{%- do config_files.append('/etc/neutron/plugins/vmware/nsx.ini') %}
+{%- endif %}
+
+
+neutron_db_manage:
+ cmd.run:
+ - name: neutron-db-manage --config-file {{ ' --config-file '.join(config_files) }} upgrade head
+ {%- if grains.get('noservices') or server.get('role', 'primary') == 'secondary' %}
+ - onlyif: /bin/false
+ {%- endif %}
+ - require_in:
+ - sls: neutron.db.plugins.service.bgpvpn
+ - sls: neutron.db.plugins.midonet
diff --git a/neutron/db/plugins/midonet.sls b/neutron/db/plugins/midonet.sls
new file mode 100644
index 0000000..e7087a2
--- /dev/null
+++ b/neutron/db/plugins/midonet.sls
@@ -0,0 +1,22 @@
+{%- from "neutron/map.jinja" import server with context %}
+
+{%- set should_run = '/bin/false' %}
+{%- if not grains.get('noservices') and server.get('role', 'primary') == 'primary' and server.backend.engine == "midonet" %}
+ {%- set should_run = '/bin/true' %}
+{%- endif %}
+
+ {%- if server.version == "kilo" %}
+
+midonet-db-manage:
+ cmd.run:
+ - name: midonet-db-manage upgrade head
+ - onlyif: {{ should_run }}
+
+ {%- else %}
+
+midonet-db-manage:
+ cmd.run:
+ - name: neutron-db-manage --subproject networking-midonet upgrade head
+ - onlyif: {{ should_run }}
+
+ {%- endif %}
diff --git a/neutron/db/plugins/service/bgpvpn.sls b/neutron/db/plugins/service/bgpvpn.sls
new file mode 100644
index 0000000..4441ce8
--- /dev/null
+++ b/neutron/db/plugins/service/bgpvpn.sls
@@ -0,0 +1,11 @@
+{%- from "neutron/map.jinja" import server with context %}
+
+{%- set should_run = '/bin/false' %}
+{%- if not grains.get('noservices') and server.get('role', 'primary') == 'primary' and server.get('bgp_vpn', {}).get('enabled', False) %}
+{%- set should_run = '/bin/true' %}
+{%- endif %}
+
+bgpvpn_db_manage:
+ cmd.run:
+ - name: neutron-db-manage --config-file /etc/neutron/neutron.conf --subproject networking-bgpvpn upgrade head
+ - onlyif: {{ should_run }}
diff --git a/neutron/server.sls b/neutron/server.sls
index 0b4c877..fa115d2 100644
--- a/neutron/server.sls
+++ b/neutron/server.sls
@@ -1,9 +1,8 @@
{%- from "neutron/map.jinja" import server, fwaas with context %}
-{%- if fwaas.get('enabled', False) %}
include:
-- neutron.fwaas
-{%- endif %}
+ - neutron.db.offline_sync
+ - neutron.fwaas
{%- if server.get('enabled', False) %}
{% if grains.os_family == 'Debian' %}
@@ -88,6 +87,8 @@
- require:
- pkg: neutron_server_packages
- pkg: ml2_packages
+ - require_in:
+ - sls: neutron.db.offline_sync
- watch_in:
- service: neutron_server_services
@@ -99,16 +100,6 @@
- require:
- file: /etc/neutron/plugins/ml2/ml2_conf.ini
-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 %}
{%- if server.l2gw is defined %}
@@ -131,6 +122,8 @@
{%- if server.database.get('ssl',{}).get('enabled', False) %}
- file: mysql_ca_neutron_server
{%- endif %}
+ - require_in:
+ - sls: neutron.db.offline_sync
/etc/neutron/api-paste.ini:
file.managed:
@@ -230,7 +223,7 @@
pkg.installed:
- names: {{ server.pkgs_ovn }}
- require_in:
- - cmd: neutron_db_manage
+ - sls: neutron.db.offline_sync
{%- if not grains.get('noservices', False) %}
@@ -282,16 +275,8 @@
- makedirs: true
- dir_mode: 755
- template: jinja
-
-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
+ - require_in:
+ - sls: neutron.db.offline_sync
{%- if server.version == "kilo" %}
@@ -301,10 +286,6 @@
- python-neutron-plugin-midonet
- python-neutron-lbaas
-midonet-db-manage:
- cmd.run:
- - name: midonet-db-manage upgrade head
-
{%- else %}
midonet_neutron_packages:
@@ -314,16 +295,6 @@
- python-neutron-lbaas
- python-neutron-fwaas
-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 %}
@@ -345,16 +316,8 @@
- template: jinja
- require:
- pkg: vmware_neutron_packages
-
-neutron_db_manage:
- cmd.run:
- - name: neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/vmware/nsx.ini upgrade head
- {%- if grains.get('noservices') %}
- - onlyif: /bin/false
- {%- endif %}
- - require:
- - file: /etc/neutron/neutron.conf
- - file: /etc/neutron/plugins/vmware/nsx.ini
+ - require_in:
+ - sls: neutron.db.offline_sync
{%- endif %}
@@ -364,13 +327,6 @@
pkg.installed:
- names: {{ server.pkgs_bgpvpn }}
-bgpvpn_db_manage:
- cmd.run:
- - name: neutron-db-manage --config-file /etc/neutron/neutron.conf --subproject networking-bgpvpn upgrade head
- - require:
- - file: /etc/neutron/neutron.conf
- - pkg: bgpvpn_packages
-
{% if server.bgp_vpn.driver == "bagpipe" %}
bagpipe_packages: