From e2b42ab54e738de91ee9f8e92576dbd9340198fc Mon Sep 17 00:00:00 2001 From: Julien Date: Mon, 19 Sep 2016 08:48:24 +0800 Subject: [PATCH 1/1] Update the file naming Update lab and pod name according to discussion of Pharos meeting on Sep.14, consistent naming for labs directory: https://wiki.opnfv.org/display/pharos/Pharos+git+repo Change-Id: I54520dda3f0662e42b8c1199f23036ced65b73bf Signed-off-by: Julien --- docs/labs/zte-sh-lab/index.rst | 6 +++--- docs/labs/zte-sh-lab/lab_description.rst | 4 ++-- docs/labs/zte-sh-lab/{pod1_description.rst => pod-1.rst} | 0 docs/labs/zte-sh-lab/{pod1_inventory.yaml => pod-1.yaml} | 0 docs/labs/zte-sh-lab/{pod2_description.rst => pod-2.rst} | 0 docs/labs/zte-sh-lab/{pod2_inventory.yaml => pod-2.yaml} | 0 docs/labs/zte-sh-lab/{pod3_description.rst => pod-3.rst} | 0 docs/labs/zte-sh-lab/{pod3_inventory.yaml => pod-3.yaml} | 0 8 files changed, 5 insertions(+), 5 deletions(-) rename docs/labs/zte-sh-lab/{pod1_description.rst => pod-1.rst} (100%) rename docs/labs/zte-sh-lab/{pod1_inventory.yaml => pod-1.yaml} (100%) rename docs/labs/zte-sh-lab/{pod2_description.rst => pod-2.rst} (100%) rename docs/labs/zte-sh-lab/{pod2_inventory.yaml => pod-2.yaml} (100%) rename docs/labs/zte-sh-lab/{pod3_description.rst => pod-3.rst} (100%) rename docs/labs/zte-sh-lab/{pod3_inventory.yaml => pod-3.yaml} (100%) diff --git a/docs/labs/zte-sh-lab/index.rst b/docs/labs/zte-sh-lab/index.rst index f8ee36ed..f767d8d5 100644 --- a/docs/labs/zte-sh-lab/index.rst +++ b/docs/labs/zte-sh-lab/index.rst @@ -13,6 +13,6 @@ ZTE SH Pharos Lab Configuration Files :maxdepth: 2 ./lab_description.rst - ./pod1_description.rst - ./pod2_description.rst - ./pod3_description.rst + ./pod-1.rst + ./pod-2.rst + ./pod-3.rst diff --git a/docs/labs/zte-sh-lab/lab_description.rst b/docs/labs/zte-sh-lab/lab_description.rst index 47caed45..0d9d2dd0 100644 --- a/docs/labs/zte-sh-lab/lab_description.rst +++ b/docs/labs/zte-sh-lab/lab_description.rst @@ -95,8 +95,8 @@ Lab Topology .. image:: ./images/zte_sh_lab_topology.png :alt: Lab diagram not found -All the PODs share the same **Jump Host** for only one public IP address is allocated for the -pharos lab. Deploy servers are separated from Jump Host. Every 2 PODs share one **Deploy Server**. +All the PODs share the same **Jump Host** for only one public IP address is allocated for ZTE +Pharos Lab. Deploy servers are separated from Jump Host. Each POD has itsown **Deploy Server**. **Jump Host** diff --git a/docs/labs/zte-sh-lab/pod1_description.rst b/docs/labs/zte-sh-lab/pod-1.rst similarity index 100% rename from docs/labs/zte-sh-lab/pod1_description.rst rename to docs/labs/zte-sh-lab/pod-1.rst diff --git a/docs/labs/zte-sh-lab/pod1_inventory.yaml b/docs/labs/zte-sh-lab/pod-1.yaml similarity index 100% rename from docs/labs/zte-sh-lab/pod1_inventory.yaml rename to docs/labs/zte-sh-lab/pod-1.yaml diff --git a/docs/labs/zte-sh-lab/pod2_description.rst b/docs/labs/zte-sh-lab/pod-2.rst similarity index 100% rename from docs/labs/zte-sh-lab/pod2_description.rst rename to docs/labs/zte-sh-lab/pod-2.rst diff --git a/docs/labs/zte-sh-lab/pod2_inventory.yaml b/docs/labs/zte-sh-lab/pod-2.yaml similarity index 100% rename from docs/labs/zte-sh-lab/pod2_inventory.yaml rename to docs/labs/zte-sh-lab/pod-2.yaml diff --git a/docs/labs/zte-sh-lab/pod3_description.rst b/docs/labs/zte-sh-lab/pod-3.rst similarity index 100% rename from docs/labs/zte-sh-lab/pod3_description.rst rename to docs/labs/zte-sh-lab/pod-3.rst diff --git a/docs/labs/zte-sh-lab/pod3_inventory.yaml b/docs/labs/zte-sh-lab/pod-3.yaml similarity index 100% rename from docs/labs/zte-sh-lab/pod3_inventory.yaml rename to docs/labs/zte-sh-lab/pod-3.yaml -- 2.16.6