diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-03 18:38:00 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-04 23:01:39 +0000 |
| commit | 49480ccf256b8739b1b4d0ef7eec9f8fb3d10347 (patch) | |
| tree | 1489574b13a07da4671dd38ccdb016e946214976 | |
| parent | ffae24981c1ff67b7ff8e87d6909f90c2e03923f (diff) | |
lf-pod2, arm-pod5: Fuel Installer Descriptor File
While at it, quote string variables in ericsson-pod1 IDF.
Now that we can determine bridge names from IDF, drop legacy
"local_env" mechanism for baremetal PODs.
Change-Id: I1db41cde503099352adb72d0969c1dd0f8a92a59
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 14fe92acb1006cdb01ff57a588683b5bb2f15d47)
| -rw-r--r-- | labs/arm/idf-pod5.yaml | 12 | ||||
| -rw-r--r-- | labs/arm/pod5/fuel/config/local_env | 2 | ||||
| -rw-r--r-- | labs/ericsson/idf-pod1.yaml | 8 | ||||
| -rw-r--r-- | labs/lf/idf-pod2.yaml | 12 | ||||
| -rw-r--r-- | labs/lf/pod2/fuel/config/local_env | 1 |
5 files changed, 28 insertions, 7 deletions
diff --git a/labs/arm/idf-pod5.yaml b/labs/arm/idf-pod5.yaml new file mode 100644 index 0000000..bf49c0d --- /dev/null +++ b/labs/arm/idf-pod5.yaml @@ -0,0 +1,12 @@ +--- +### ARM POD 5 installer descriptor file ### + +idf: + version: 0.1 + fuel: + jumphost: + bridges: + admin: 'admin7_br0' + mgmt: 'mgmt7_br0' + private: '' + public: 'public7_br0' diff --git a/labs/arm/pod5/fuel/config/local_env b/labs/arm/pod5/fuel/config/local_env deleted file mode 100644 index d5e4dec..0000000 --- a/labs/arm/pod5/fuel/config/local_env +++ /dev/null @@ -1,2 +0,0 @@ -export LIBVIRT_DEFAULT_URI="qemu:///system" -export DEFAULT_BRIDGE=admin7_br0,mgmt7_br0,,public7_br0 diff --git a/labs/ericsson/idf-pod1.yaml b/labs/ericsson/idf-pod1.yaml index 10469d2..1c9f297 100644 --- a/labs/ericsson/idf-pod1.yaml +++ b/labs/ericsson/idf-pod1.yaml @@ -6,7 +6,7 @@ idf: fuel: jumphost: bridges: - admin: pxebr - mgmt: br-mgmt - private: - public: br-external + admin: 'pxebr' + mgmt: 'br-mgmt' + private: '' + public: 'br-external' diff --git a/labs/lf/idf-pod2.yaml b/labs/lf/idf-pod2.yaml new file mode 100644 index 0000000..7932f88 --- /dev/null +++ b/labs/lf/idf-pod2.yaml @@ -0,0 +1,12 @@ +--- +### LF POD 2 installer descriptor file ### + +idf: + version: 0.1 + fuel: + jumphost: + bridges: + admin: 'pxebr' + mgmt: 'br-ctl' + private: '' + public: '' diff --git a/labs/lf/pod2/fuel/config/local_env b/labs/lf/pod2/fuel/config/local_env deleted file mode 100644 index 5d587a2..0000000 --- a/labs/lf/pod2/fuel/config/local_env +++ /dev/null @@ -1 +0,0 @@ -export DEFAULT_BRIDGE=pxebr,br-ctl |