diff options
| -rwxr-xr-x | mcp/config/states/openstack_ha | 7 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index 732c5710f..924dc30f1 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -42,7 +42,8 @@ wait_for 30.0 "salt -I 'keystone:client' state.sls keystone.client" salt -I 'keystone:server' cmd.run ". /root/keystonercv3; openstack service list" salt -I 'glance:server' state.sls glance -b 1 -salt -I 'nova:controller' state.sls nova -b 1 +salt -I 'nova:controller:role:primary' state.sls nova +salt -I 'nova:controller:role:secondary' state.sls nova -b 1 salt -I 'heat:server' state.sls heat -b 1 wait_for 5.0 "salt -I 'cinder:controller' state.sls cinder -b 1" @@ -61,8 +62,8 @@ if salt -I 'nova:compute' match.grain 'cpuarch:aarch64' \ salt -C 'G@cpuarch:aarch64 and I@nova:compute' state.sls armband fi -salt -C 'I@barbican:server and *01*' state.sls barbican -salt -C 'I@barbican:server and not *01*' state.sls barbican -b 1 +salt -I 'barbican:server:role:primary' state.sls barbican +salt -I 'barbican:server:role:secondary' state.sls barbican -b 1 salt -I 'barbican:client' state.sls barbican salt -I 'redis:cluster:role:master' state.sls redis diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 index d57a4b7c1..3e912c1e3 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 @@ -53,6 +53,7 @@ parameters: type: ovs_port mtu: ${_param:interface_mtu} bridge: br-floating + noifupdown: true br-ex: enabled: true type: bridge @@ -64,6 +65,7 @@ parameters: - float-to-ex gateway: ${_param:opnfv_net_public_gw} name_servers: {{ nm.dns_public }} + noifupdown: true {%- else %} br-mesh: enabled: true |