diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-12-14 13:29:05 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-12-14 13:29:05 +0000 |
commit | c6260640d64a366499aa90f36f1b760612afb0d7 (patch) | |
tree | a9a8e862030d23b9ec0b3135654001a6176ac4aa /mcp | |
parent | 57b1c0079db76a2a5e1f9aa91740b699d33be0d0 (diff) | |
parent | c6a4fcf01b5bcb0533d552d761f7462190df44b7 (diff) |
Merge "[docs] Updates for Gambia 7.1.0 release"
Diffstat (limited to 'mcp')
-rw-r--r-- | mcp/config/scenario/os-nosdn-fdio-ha.yaml (renamed from mcp/config/scenario/os-nosdn-vpp-ha.yaml) | 2 | ||||
-rw-r--r-- | mcp/config/scenario/os-nosdn-fdio-noha.yaml (renamed from mcp/config/scenario/os-nosdn-vpp-noha.yaml) | 2 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-fdio-ha/infra/config.yml (renamed from mcp/reclass/classes/cluster/mcp-vpp-ha/infra/config.yml) | 2 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-fdio-ha/infra/init.yml (renamed from mcp/reclass/classes/cluster/mcp-vpp-ha/infra/init.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-fdio-ha/infra/init_vcp.yml.j2 (renamed from mcp/reclass/classes/cluster/mcp-vpp-ha/infra/init_vcp.yml.j2) | 2 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-fdio-ha/infra/kvm.yml.j2 (renamed from mcp/reclass/classes/cluster/mcp-vpp-ha/infra/kvm.yml.j2) | 2 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-fdio-ha/infra/maas.yml (renamed from mcp/reclass/classes/cluster/mcp-vpp-ha/infra/maas.yml) | 2 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-fdio-ha/init.yml (renamed from mcp/reclass/classes/cluster/mcp-vpp-ha/init.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/compute.yml (renamed from mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/compute.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/compute_pdf.yml.j2 (renamed from mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/compute_pdf.yml.j2) | 0 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/control.yml (renamed from mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/control.yml) | 2 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/database.yml (renamed from mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/database.yml) | 2 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/init.yml (renamed from mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/init.yml) | 0 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/message_queue.yml (renamed from mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/message_queue.yml) | 2 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/proxy.yml (renamed from mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/proxy.yml) | 2 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/telemetry.yml (renamed from mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/telemetry.yml) | 2 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-fdio-noha/infra/config.yml (renamed from mcp/reclass/classes/cluster/mcp-vpp-noha/infra/config.yml) | 2 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-fdio-noha/infra/init.yml (renamed from mcp/reclass/classes/cluster/mcp-vpp-noha/infra/init.yml) | 2 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-fdio-noha/infra/maas.yml (renamed from mcp/reclass/classes/cluster/mcp-vpp-noha/infra/maas.yml) | 2 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-fdio-noha/init.yml (renamed from mcp/reclass/classes/cluster/mcp-vpp-noha/init.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/compute.yml.j2 (renamed from mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/compute.yml.j2) | 2 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/control.yml (renamed from mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/control.yml) | 2 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/gateway.yml.j2 (renamed from mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/gateway.yml.j2) | 2 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/init.yml (renamed from mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/init.yml) | 0 | ||||
-rw-r--r-- | mcp/reclass/nodes/cfg01.mcp-fdio-ha.local.yml (renamed from mcp/reclass/nodes/cfg01.mcp-vpp-ha.local.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/nodes/cfg01.mcp-fdio-noha.local.yml (renamed from mcp/reclass/nodes/cfg01.mcp-vpp-noha.local.yml) | 4 |
26 files changed, 29 insertions, 29 deletions
diff --git a/mcp/config/scenario/os-nosdn-vpp-ha.yaml b/mcp/config/scenario/os-nosdn-fdio-ha.yaml index 9e7ebc1e2..3ff4e5c5d 100644 --- a/mcp/config/scenario/os-nosdn-vpp-ha.yaml +++ b/mcp/config/scenario/os-nosdn-fdio-ha.yaml @@ -7,7 +7,7 @@ ############################################################################## --- cluster: - domain: mcp-vpp-ha.local + domain: mcp-fdio-ha.local states: - openstack_ha - networks diff --git a/mcp/config/scenario/os-nosdn-vpp-noha.yaml b/mcp/config/scenario/os-nosdn-fdio-noha.yaml index e90300407..b52a89cf4 100644 --- a/mcp/config/scenario/os-nosdn-vpp-noha.yaml +++ b/mcp/config/scenario/os-nosdn-fdio-noha.yaml @@ -7,7 +7,7 @@ ############################################################################## --- cluster: - domain: mcp-vpp-noha.local + domain: mcp-fdio-noha.local states: - openstack_noha - neutron_gateway diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/config.yml index 06347bf22..1bf5f0014 100644 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/config.yml @@ -8,5 +8,5 @@ --- classes: - cluster.mcp-common-ha.infra.config - - cluster.mcp-vpp-ha.infra + - cluster.mcp-fdio-ha.infra - cluster.all-mcp-arch-common.infra.config_pdf diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/init.yml index a434ef7c1..3ab122e13 100644 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/init.yml @@ -8,7 +8,7 @@ --- classes: - cluster.mcp-common-ha.infra - - cluster.mcp-vpp-ha.openstack + - cluster.mcp-fdio-ha.openstack parameters: _param: - cluster_name: mcp-vpp-ha + cluster_name: mcp-fdio-ha diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/init_vcp.yml.j2 b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/init_vcp.yml.j2 index 21d2e42ce..8ab411876 100644 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/init_vcp.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/init_vcp.yml.j2 @@ -8,5 +8,5 @@ --- {%- if conf.MCP_VCP %} classes: - - cluster.mcp-vpp-ha.infra + - cluster.mcp-fdio-ha.infra {%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/kvm.yml.j2 index 2f72c4178..dbbea5235 100644 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/kvm.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/kvm.yml.j2 @@ -10,5 +10,5 @@ # NOTE(armband): we don't want to pull in salt.control for novcp classes: - cluster.mcp-common-ha.infra.kvm - - cluster.mcp-vpp-ha.infra + - cluster.mcp-fdio-ha.infra {%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/maas.yml index b2b66992c..d39e259d1 100644 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/infra/maas.yml @@ -8,4 +8,4 @@ --- classes: - cluster.all-mcp-arch-common.infra.maas - - cluster.mcp-vpp-ha.infra + - cluster.mcp-fdio-ha.infra diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/init.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/init.yml index dc6b8bfef..daeecfcc7 100644 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/init.yml +++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/init.yml @@ -8,5 +8,5 @@ --- classes: - cluster.all-mcp-arch-common - - cluster.mcp-vpp-ha.infra - - cluster.mcp-vpp-ha.openstack + - cluster.mcp-fdio-ha.infra + - cluster.mcp-fdio-ha.openstack diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/compute.yml index 0518a8b57..4b718abe7 100644 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/compute.yml @@ -8,8 +8,8 @@ --- classes: - cluster.mcp-common-ha.openstack_compute - - cluster.mcp-vpp-ha.openstack.compute_pdf - - cluster.mcp-vpp-ha.infra + - cluster.mcp-fdio-ha.openstack.compute_pdf + - cluster.mcp-fdio-ha.infra parameters: nova: compute: diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/compute_pdf.yml.j2 index f3844ad8c..f3844ad8c 100644 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/compute_pdf.yml.j2 diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/control.yml index 9bca1f084..a9bb44907 100644 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/control.yml @@ -10,4 +10,4 @@ classes: - system.neutron.control.openvswitch.cluster - cluster.mcp-common-ha.openstack_interface_vcp_biport - cluster.mcp-common-ha.openstack_control - - cluster.mcp-vpp-ha.infra + - cluster.mcp-fdio-ha.infra diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/database.yml index a75fa675b..7ba9e5660 100644 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/database.yml +++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/database.yml @@ -9,4 +9,4 @@ classes: - cluster.mcp-common-ha.openstack_interface_vcp_biport - cluster.mcp-common-ha.openstack_database - - cluster.mcp-vpp-ha.infra.init_vcp + - cluster.mcp-fdio-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/init.yml index 9dbfd59a1..9dbfd59a1 100644 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/init.yml diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/message_queue.yml index 42a1b658e..175215502 100644 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/message_queue.yml +++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/message_queue.yml @@ -9,4 +9,4 @@ classes: - cluster.mcp-common-ha.openstack_interface_vcp_biport - cluster.mcp-common-ha.openstack_message_queue - - cluster.mcp-vpp-ha.infra.init_vcp + - cluster.mcp-fdio-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/proxy.yml index 3a82e51a6..bafbbaa6a 100644 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/proxy.yml +++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/proxy.yml @@ -9,4 +9,4 @@ classes: - cluster.mcp-common-ha.openstack_interface_vcp_triport - cluster.mcp-common-ha.openstack_proxy - - cluster.mcp-vpp-ha.infra.init_vcp + - cluster.mcp-fdio-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/telemetry.yml index 402616868..9cb8fcd5e 100644 --- a/mcp/reclass/classes/cluster/mcp-vpp-ha/openstack/telemetry.yml +++ b/mcp/reclass/classes/cluster/mcp-fdio-ha/openstack/telemetry.yml @@ -9,4 +9,4 @@ classes: - cluster.mcp-common-ha.openstack_interface_vcp_biport - cluster.mcp-common-ha.openstack_telemetry - - cluster.mcp-vpp-ha.infra.init_vcp + - cluster.mcp-fdio-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-vpp-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-fdio-noha/infra/config.yml index 0263a57d0..6627ae6fe 100644 --- a/mcp/reclass/classes/cluster/mcp-vpp-noha/infra/config.yml +++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/infra/config.yml @@ -9,7 +9,7 @@ classes: - system.reclass.storage.system.openstack_gateway_single - cluster.mcp-common-noha.infra.config - - cluster.mcp-vpp-noha + - cluster.mcp-fdio-noha - cluster.all-mcp-arch-common.infra.config_pdf parameters: reclass: diff --git a/mcp/reclass/classes/cluster/mcp-vpp-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-fdio-noha/infra/init.yml index f61519664..b1d890dfb 100644 --- a/mcp/reclass/classes/cluster/mcp-vpp-noha/infra/init.yml +++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/infra/init.yml @@ -11,4 +11,4 @@ classes: parameters: _param: - cluster_name: mcp-vpp-noha + cluster_name: mcp-fdio-noha diff --git a/mcp/reclass/classes/cluster/mcp-vpp-noha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-fdio-noha/infra/maas.yml index e02d0304f..3520cc303 100644 --- a/mcp/reclass/classes/cluster/mcp-vpp-noha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/infra/maas.yml @@ -8,4 +8,4 @@ --- classes: - cluster.all-mcp-arch-common.infra.maas - - cluster.mcp-vpp-noha.infra + - cluster.mcp-fdio-noha.infra diff --git a/mcp/reclass/classes/cluster/mcp-vpp-noha/init.yml b/mcp/reclass/classes/cluster/mcp-fdio-noha/init.yml index 41515cf6d..6e4f952fd 100644 --- a/mcp/reclass/classes/cluster/mcp-vpp-noha/init.yml +++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/init.yml @@ -8,5 +8,5 @@ --- classes: - cluster.mcp-common-noha.init_options - - cluster.mcp-vpp-noha.infra - - cluster.mcp-vpp-noha.openstack + - cluster.mcp-fdio-noha.infra + - cluster.mcp-fdio-noha.openstack diff --git a/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/compute.yml.j2 index 9142743da..2f1b8c39e 100644 --- a/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/compute.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/compute.yml.j2 @@ -12,7 +12,7 @@ classes: - service.neutron.compute.single - cluster.mcp-common-noha.openstack_compute - - cluster.mcp-vpp-noha + - cluster.mcp-fdio-noha parameters: linux: network: diff --git a/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/control.yml index 49dc3da4a..3c2cdefaa 100644 --- a/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/control.yml @@ -9,4 +9,4 @@ classes: - system.neutron.control.openvswitch.single - cluster.mcp-common-noha.openstack_control - - cluster.mcp-vpp-noha + - cluster.mcp-fdio-noha diff --git a/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/gateway.yml.j2 b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/gateway.yml.j2 index 27e6372b0..1b2ecb04b 100644 --- a/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/gateway.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/gateway.yml.j2 @@ -12,7 +12,7 @@ classes: - cluster.mcp-common-noha.openstack_gateway - service.neutron.gateway.single - - cluster.mcp-vpp-noha + - cluster.mcp-fdio-noha parameters: linux: network: diff --git a/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/init.yml index 79e231825..79e231825 100644 --- a/mcp/reclass/classes/cluster/mcp-vpp-noha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/mcp-fdio-noha/openstack/init.yml diff --git a/mcp/reclass/nodes/cfg01.mcp-vpp-ha.local.yml b/mcp/reclass/nodes/cfg01.mcp-fdio-ha.local.yml index 89bb3c3ca..defa03158 100644 --- a/mcp/reclass/nodes/cfg01.mcp-vpp-ha.local.yml +++ b/mcp/reclass/nodes/cfg01.mcp-fdio-ha.local.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.mcp-vpp-ha.infra.config + - cluster.mcp-fdio-ha.infra.config parameters: _param: linux_system_codename: xenial @@ -15,4 +15,4 @@ parameters: linux: system: name: cfg01 - domain: mcp-vpp-ha.local + domain: mcp-fdio-ha.local diff --git a/mcp/reclass/nodes/cfg01.mcp-vpp-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-fdio-noha.local.yml index 381243168..9a7ac1476 100644 --- a/mcp/reclass/nodes/cfg01.mcp-vpp-noha.local.yml +++ b/mcp/reclass/nodes/cfg01.mcp-fdio-noha.local.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.mcp-vpp-noha.infra.config + - cluster.mcp-fdio-noha.infra.config parameters: _param: linux_system_codename: xenial @@ -15,4 +15,4 @@ parameters: linux: system: name: cfg01 - domain: mcp-vpp-noha.local + domain: mcp-fdio-noha.local |