aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Buil <mbuil@suse.com>2018-11-29 12:25:51 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-11-29 12:25:51 +0000
commitcfda5ce72f82914ffad88dc07716d5cd6eda0c4c (patch)
tree7fa3e2711919db5820e78bf2c26973d45837376d
parent61599026dc4f0a940d0e3aa7d724494222ee1415 (diff)
parent60280815b2c38029d155d5b027e0ca762dd667dc (diff)
Merge "Introduce the Barbican in XCI for SFC-HA scenario"
-rw-r--r--scenarios/os-odl-sfc/role/os-odl-sfc/files/ha/openstack_user_config.yml10
-rw-r--r--scenarios/os-odl-sfc/role/os-odl-sfc/files/mini/openstack_user_config.yml6
-rw-r--r--scenarios/os-odl-sfc/role/os-odl-sfc/files/noha/openstack_user_config.yml6
-rw-r--r--scenarios/os-odl-sfc_osm/role/os-odl-sfc_osm/files/ha/openstack_user_config.yml10
-rw-r--r--scenarios/os-odl-sfc_osm/role/os-odl-sfc_osm/files/mini/openstack_user_config.yml6
-rw-r--r--scenarios/os-odl-sfc_osm/role/os-odl-sfc_osm/files/noha/openstack_user_config.yml6
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 c85b144..899785d 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 48ce06e..4ae8a83 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 5caed12..ed8ff8f 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 a5eae68..f36f650 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 eb9a258..09d6aa3 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 7d25351..d914991 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: