Resolve dependencies

Change-Id: If692e3c5f001219dbf75e5ef2c1949693c9da7dd

requirements.txt

@@ -24,3 +24,6 @@ simplejson
 # requirements.txt
 importlib-metadata<3.0.0; python_version < '3.6'
 importlib-resources<3.0.0; python_version < '3.6'
+
+# Workround CFFI build failure on python 3.5
+cffi<1.14.6

src/tests/bundles/bionic-train.yaml

@@ -11,8 +11,6 @@ relations:
   - keystone
 - - neutron-ironic-agent
   - neutron-api
-- - neutron-openvswitch
-  - neutron-api
 - - ironic-api:amqp
   - rabbitmq-server:amqp
 - - ironic-api
@@ -235,11 +233,6 @@ services:
       disable-secure-erase: true
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-    num_units: 0
-    options:
-      bridge-mappings: physnet1:br-ex
   neutron-ironic-agent:
     charm: cs:~openstack-charmers-next/neutron-api-plugin-ironic
     num_units: 0

src/tests/bundles/bionic-ussuri.yaml

@@ -11,8 +11,6 @@ relations:
   - keystone
 - - neutron-ironic-agent
   - neutron-api
-- - neutron-openvswitch
-  - neutron-api
 - - ironic-api:amqp
   - rabbitmq-server:amqp
 - - ironic-api
@@ -235,11 +233,6 @@ services:
       disable-secure-erase: true
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-    num_units: 0
-    options:
-      bridge-mappings: physnet1:br-ex
   neutron-ironic-agent:
     charm: cs:~openstack-charmers-next/neutron-api-plugin-ironic
     num_units: 0

src/tests/bundles/focal-ussuri.yaml

@@ -11,8 +11,6 @@ relations:
   - keystone
 - - neutron-ironic-agent
   - neutron-api
-- - neutron-openvswitch
-  - neutron-api
 - - ironic-api:amqp
   - rabbitmq-server:amqp
 - - ironic-api
@@ -269,11 +267,6 @@ services:
       disable-secure-erase: true
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-    num_units: 0
-    options:
-      bridge-mappings: physnet1:br-ex
   neutron-ironic-agent:
     charm: cs:~openstack-charmers-next/neutron-api-plugin-ironic
     num_units: 0

src/tests/bundles/focal-victoria.yaml

@@ -11,8 +11,6 @@ relations:
   - keystone
 - - neutron-ironic-agent
   - neutron-api
-- - neutron-openvswitch
-  - neutron-api
 - - ironic-api:amqp
   - rabbitmq-server:amqp
 - - ironic-api
@@ -269,11 +267,6 @@ services:
       disable-secure-erase: true
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-    num_units: 0
-    options:
-      bridge-mappings: physnet1:br-ex
   neutron-ironic-agent:
     charm: cs:~openstack-charmers-next/neutron-api-plugin-ironic
     num_units: 0

src/tests/bundles/focal-wallaby.yaml

@@ -11,8 +11,6 @@ relations:
   - keystone
 - - neutron-ironic-agent
   - neutron-api
-- - neutron-openvswitch
-  - neutron-api
 - - ironic-api:amqp
   - rabbitmq-server:amqp
 - - ironic-api
@@ -269,11 +267,6 @@ services:
       disable-secure-erase: true
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-    num_units: 0
-    options:
-      bridge-mappings: physnet1:br-ex
   neutron-ironic-agent:
     charm: cs:~openstack-charmers-next/neutron-api-plugin-ironic
     num_units: 0

src/tests/bundles/groovy-victoria.yaml

@@ -11,8 +11,6 @@ relations:
   - keystone
 - - neutron-ironic-agent
   - neutron-api
-- - neutron-openvswitch
-  - neutron-api
 - - ironic-api:amqp
   - rabbitmq-server:amqp
 - - ironic-api
@@ -269,11 +267,6 @@ services:
       disable-secure-erase: true
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-    num_units: 0
-    options:
-      bridge-mappings: physnet1:br-ex
   neutron-ironic-agent:
     charm: cs:~openstack-charmers-next/neutron-api-plugin-ironic
     num_units: 0

src/tests/bundles/hirsute-wallaby.yaml

@@ -11,8 +11,6 @@ relations:
   - keystone
 - - neutron-ironic-agent
   - neutron-api
-- - neutron-openvswitch
-  - neutron-api
 - - ironic-api:amqp
   - rabbitmq-server:amqp
 - - ironic-api
@@ -269,11 +267,6 @@ services:
       disable-secure-erase: true
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-    num_units: 0
-    options:
-      bridge-mappings: physnet1:br-ex
   neutron-ironic-agent:
     charm: cs:~openstack-charmers-next/neutron-api-plugin-ironic
     num_units: 0

src/tests/tests.yaml

@@ -20,10 +20,10 @@ smoke_bundles:
 target_deploy_status:
   vault:
     workload-status: blocked
-    workload-status-message: Vault needs to be initialized
+    workload-status-message-prefix: Vault needs to be initialized
   ironic-conductor:
     workload-status: blocked
-    workload-status-message: invalid enabled-deploy-interfaces config
+    workload-status-message-prefix: invalid enabled-deploy-interfaces config
 
 configure:
 - zaza.openstack.charm_tests.vault.setup.auto_initialize

src/wheelhouse.txt

@@ -7,7 +7,15 @@ python-glanceclient
 python-swiftclient
 python-keystoneclient
 zipp < 2.0.0
-importlib-metadata>=2.0
+# cryptography 3.4 introduces a requirement for rust code in the module.  As it has to be compiled
+# on the machine during install, this breaks installs.  Instead pin to <3.4 until a solution can be
+# found that doesn't require compiling on the target machine.
+# LP: #1915171
+cryptography<3.4
+pyrsistent<0.18.0
+
+importlib-metadata<3.0.0
+importlib-resources<3.0.0
 
 git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack