diff options
author | Manuel Buil <mbuil@suse.com> | 2018-11-29 12:25:51 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-11-29 12:25:51 +0000 |
commit | cfda5ce72f82914ffad88dc07716d5cd6eda0c4c (patch) | |
tree | 7fa3e2711919db5820e78bf2c26973d45837376d | |
parent | 61599026dc4f0a940d0e3aa7d724494222ee1415 (diff) | |
parent | 60280815b2c38029d155d5b027e0ca762dd667dc (diff) |
Merge "Introduce the Barbican in XCI for SFC-HA scenario"
6 files changed, 44 insertions, 0 deletions
diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/ha/openstack_user_config.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/ha/openstack_user_config.yml index c85b1441..899785dc 100644 --- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/ha/openstack_user_config.yml +++ b/scenarios/os-odl-sfc/role/os-odl-sfc/files/ha/openstack_user_config.yml @@ -13,6 +13,7 @@ used_ips: global_overrides: internal_lb_vip_address: 172.29.236.222 external_lb_vip_address: 192.168.122.220 + barbican_keys_backend: true tunnel_bridge: "br-vxlan" management_bridge: "br-mgmt" provider_networks: @@ -118,6 +119,15 @@ identity_hosts: controller02: ip: 172.29.236.15 +# barbican +key-manager_hosts: + controller00: + ip: 172.29.236.11 + controller01: + ip: 172.29.236.14 + controller02: + ip: 172.29.236.15 + # cinder api services storage-infra_hosts: controller00: diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/mini/openstack_user_config.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/mini/openstack_user_config.yml index 48ce06e9..4ae8a83f 100644 --- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/mini/openstack_user_config.yml +++ b/scenarios/os-odl-sfc/role/os-odl-sfc/files/mini/openstack_user_config.yml @@ -13,6 +13,7 @@ used_ips: global_overrides: internal_lb_vip_address: 172.29.236.11 external_lb_vip_address: 192.168.122.3 + barbican_keys_backend: true tunnel_bridge: "br-vxlan" management_bridge: "br-mgmt" provider_networks: @@ -102,6 +103,11 @@ identity_hosts: controller00: ip: 172.29.236.11 +# barbican +key-manager_hosts: + controller00: + ip: 172.29.236.11 + # cinder api services storage-infra_hosts: controller00: diff --git a/scenarios/os-odl-sfc/role/os-odl-sfc/files/noha/openstack_user_config.yml b/scenarios/os-odl-sfc/role/os-odl-sfc/files/noha/openstack_user_config.yml index 5caed125..ed8ff8f5 100644 --- a/scenarios/os-odl-sfc/role/os-odl-sfc/files/noha/openstack_user_config.yml +++ b/scenarios/os-odl-sfc/role/os-odl-sfc/files/noha/openstack_user_config.yml @@ -13,6 +13,7 @@ used_ips: global_overrides: internal_lb_vip_address: 172.29.236.11 external_lb_vip_address: 192.168.122.3 + barbican_keys_backend: true tunnel_bridge: "br-vxlan" management_bridge: "br-mgmt" provider_networks: @@ -102,6 +103,11 @@ identity_hosts: controller00: ip: 172.29.236.11 +# barbican +key-manager_hosts: + controller00: + ip: 172.29.236.11 + # cinder api services storage-infra_hosts: controller00: diff --git a/scenarios/os-odl-sfc_osm/role/os-odl-sfc_osm/files/ha/openstack_user_config.yml b/scenarios/os-odl-sfc_osm/role/os-odl-sfc_osm/files/ha/openstack_user_config.yml index a5eae680..f36f6502 100644 --- a/scenarios/os-odl-sfc_osm/role/os-odl-sfc_osm/files/ha/openstack_user_config.yml +++ b/scenarios/os-odl-sfc_osm/role/os-odl-sfc_osm/files/ha/openstack_user_config.yml @@ -13,6 +13,7 @@ used_ips: global_overrides: internal_lb_vip_address: 172.29.236.222 external_lb_vip_address: 192.168.122.220 + barbican_keys_backend: true tunnel_bridge: "br-vxlan" management_bridge: "br-mgmt" provider_networks: @@ -118,6 +119,15 @@ identity_hosts: controller02: ip: 172.29.236.15 +# barbican +key-manager_hosts: + controller00: + ip: 172.29.236.11 + controller01: + ip: 172.29.236.14 + controller02: + ip: 172.29.236.15 + # cinder api services storage-infra_hosts: controller00: diff --git a/scenarios/os-odl-sfc_osm/role/os-odl-sfc_osm/files/mini/openstack_user_config.yml b/scenarios/os-odl-sfc_osm/role/os-odl-sfc_osm/files/mini/openstack_user_config.yml index eb9a2583..09d6aa37 100644 --- a/scenarios/os-odl-sfc_osm/role/os-odl-sfc_osm/files/mini/openstack_user_config.yml +++ b/scenarios/os-odl-sfc_osm/role/os-odl-sfc_osm/files/mini/openstack_user_config.yml @@ -13,6 +13,7 @@ used_ips: global_overrides: internal_lb_vip_address: 172.29.236.11 external_lb_vip_address: 192.168.122.3 + barbican_keys_backend: true tunnel_bridge: "br-vxlan" management_bridge: "br-mgmt" provider_networks: @@ -102,6 +103,11 @@ identity_hosts: controller00: ip: 172.29.236.11 +# barbican +key-manager_hosts: + controller00: + ip: 172.29.236.11 + # cinder api services storage-infra_hosts: controller00: diff --git a/scenarios/os-odl-sfc_osm/role/os-odl-sfc_osm/files/noha/openstack_user_config.yml b/scenarios/os-odl-sfc_osm/role/os-odl-sfc_osm/files/noha/openstack_user_config.yml index 7d25351b..d914991e 100644 --- a/scenarios/os-odl-sfc_osm/role/os-odl-sfc_osm/files/noha/openstack_user_config.yml +++ b/scenarios/os-odl-sfc_osm/role/os-odl-sfc_osm/files/noha/openstack_user_config.yml @@ -13,6 +13,7 @@ used_ips: global_overrides: internal_lb_vip_address: 172.29.236.11 external_lb_vip_address: 192.168.122.3 + barbican_keys_backend: true tunnel_bridge: "br-vxlan" management_bridge: "br-mgmt" provider_networks: @@ -102,6 +103,11 @@ identity_hosts: controller00: ip: 172.29.236.11 +# barbican +key-manager_hosts: + controller00: + ip: 172.29.236.11 + # cinder api services storage-infra_hosts: controller00: |