diff options
| -rw-r--r-- | config/installers/fuel/pod_config.yml.j2 | 16 | ||||
| -rw-r--r-- | labs/ericsson/pod1.yaml | 22 | ||||
| -rw-r--r-- | labs/ericsson/pod2.yaml | 22 | ||||
| -rw-r--r-- | labs/intel/pod18.yaml | 6 | ||||
| -rw-r--r-- | labs/nokia/pod1.yaml | 1 |
5 files changed, 56 insertions, 11 deletions
diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 index 8d40f3d9..04eff45c 100644 --- a/config/installers/fuel/pod_config.yml.j2 +++ b/config/installers/fuel/pod_config.yml.j2 @@ -6,7 +6,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## --- -{%- if conf.idf is defined and conf.idf.fuel is defined -%} +{%- if conf.idf is defined and conf.idf.fuel is defined %} {%- if conf.idf.net_config is defined -%} {%- set net_admin = conf.idf.net_config.admin.network -%} {%- set net_mgmt = conf.idf.net_config.mgmt.network -%} @@ -22,6 +22,10 @@ {%- if conf.idf.net_config.public.gateway is defined -%} {%- set net_public_gw = conf.idf.net_config.public.gateway -%} {%- endif -%} + {%- if conf.idf.fuel.network.public_pool is defined -%} + {%- set net_public_pool_start = conf.idf.fuel.network.public_pool.start_ip -%} + {%- set net_public_pool_end = conf.idf.fuel.network.public_pool.end_ip -%} + {%- endif -%} {%- else -%} {%- set net_admin = '192.168.11.0' -%} {%- set net_mgmt = '172.16.10.0' -%} @@ -37,7 +41,11 @@ {%- set dns_public = [ '8.8.8.8', '8.8.4.4' ] -%} {%- endif -%} {%- if net_public_gw is not defined -%} - {%- set net_public_gw = net_public | ipaddr_index('1') -%} + {%- set net_public_gw = net_public | ipaddr_index('1') -%} + {%- endif -%} + {%- if net_public_pool_start is not defined or net_public_pool_end is not defined -%} + {%- set net_public_pool_start = net_public | ipaddr_index('80') -%} + {%- set net_public_pool_end = net_public | ipaddr_index('100') -%} {%- endif %} parameters: _param: @@ -105,8 +113,8 @@ parameters: opnfv_net_public: {{ net_public }}/{{ net_public_mask }} opnfv_net_public_mask: {{ net_public_mask | netmask }} opnfv_net_public_gw: {{ net_public_gw }} - opnfv_net_public_pool_start: {{ net_public | ipaddr_index(80) }} - opnfv_net_public_pool_end: {{ net_public | ipaddr_index(100) }} + opnfv_net_public_pool_start: {{ net_public_pool_start }} + opnfv_net_public_pool_end: {{ net_public_pool_end }} opnfv_name_servers: {{ dns_public }} opnfv_dns_server01: '{{ dns_public[0] }}' diff --git a/labs/ericsson/pod1.yaml b/labs/ericsson/pod1.yaml index 1c2f5ae4..d8a51556 100644 --- a/labs/ericsson/pod1.yaml +++ b/labs/ericsson/pod1.yaml @@ -40,8 +40,26 @@ jumphost: versions: - 1.0 - 2.0 - user: - pass: + user: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAuQkYMXyWaXfQQUhqa1uKr3idY/TDnYF+fMyb + uuI1EFGnqXyJyY5C6CxyR61sTBrni49LPh/EmuLWzv0SLclJYnIfSOQrCbO5 + Sy4IFen6eMGd4x8OLLN0cQBSRnpxFRnmGnnqdLjcZYDYSfvP8U0vE46cRFM+ + PWRBMJm9+2iz/+wPY8z1aqQ03YycSgKo7R7hEXlarqjJexr/mnP+WLXnz/yN + qi0/E9q93X8e0JnQnxRG69K/AOih4pjW4kW8T53JbFmSq5whTdF7SpGAsUqt + +5pr5Bs/9yMk9g00XqDmhiCNlNO8ADSDKW1YWQXWHQFMazwZI4GipQA9P/I6 + CXRrKTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCtE4yYqripA3lKyuS4 + O7T2gBBL83JWGyHgxbluxLakRfZx] + pass: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAcNPG79QTsU1TDQZBWMENe+jI9rOfqabAiXJb + K+fbSVRY9gUTis2Bxaq/fWq4VGycPDfeZIKfGK5lgwaxd+yWbfHpHU2Itfav + L5s7zoH8yCk6vvfdTGEa+rM/CupqMRF0l/N/bFHMjf1TpUycw37KfaEcpV8T + /+ZJdpNCt+C5n67liLWr/fIGtcZB7HVFlIJOfniVoF9EfSwrNkKAJ5vYSAGe + KYhqgbQ1EFWf9/dJdAq0A4HuKixiMpc6qOX/moNTLTRPd6jN2veT7t4blqZM + cQU8Y3avbnAurd6Bu5i52d9kGebkUfYqUnkNCzyObi6WU5ZuJ8oxdzcQghb3 + sIRM3jA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDA0e139hbToTK8gZ1/ + UoEfgBDHho1xQ2fi5kh1g0FyFTpw] remote_management: <<: *remoteparas address: 172.16.1.21/24 diff --git a/labs/ericsson/pod2.yaml b/labs/ericsson/pod2.yaml index 4d25af48..c0aef2c2 100644 --- a/labs/ericsson/pod2.yaml +++ b/labs/ericsson/pod2.yaml @@ -33,8 +33,26 @@ jumphost: versions: - 1.0 - 2.0 - user: - pass: + user: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAZ+KIpufJFbXv6vcsevPYdhO2lBkYCnmoMKNa + lwDsynavzbIDeZmUlpf8xCOu/f7/VQfQdJCd6aZSScALlPSYgr39b0SPPfnr + Kx3jfOZnu8SEK+UJIalvebApmMdKM/vaKTWENV5PXyGcYwf8Q2lVxyXpxLVs + /FkDg1kB2VpdYaVfseY98LgLkP06uyfBPXH189BlQrxZcw3Af64BYgWfpDDt + w3RzIGCxAOMMZ8lEOnY4ofrsWaQA5YH12ezOT3Mwd/wkOuqcU19fOYaeS9Ou + 050m6H9DJDnR5btjLIrjjKINp5Nf6hHG5mngUc5JVdRKNvD0ONBi6Bj0cvGF + STfaXTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDSD+x9ybRnBdCQaY7n + aDlygBA4t2kc8UOwZYE6ZZaFUgl1] + pass: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAkHaGqpTmg+YSLPS5AwhB1N6MBA9cXTA1oacT + 8bY1aLBi7HKbacJQjHOfr2FoIAABkgV7N+BXKfebMighfcDC9XtKGYnV3tCD + XpreNZgX8NmVaYOLP6sFkAk53oYljswKOVVUrAqXplZx4kBXYm0Az2beGg5J + 5LRNwu9Eh4SRYN4dFN/XKQMtsQzKjMWTBLde9snrbhYfOxSsAR0B4FD7WWik + viKQY82C6C3KbcBeESMPE/lgBj7KIPbYkpzk9N5GafK+XkUS2aopAAkQFGll + 60Y0/9LOwPzItCB1q/kEENgz1aw/nHeH3xQsErwepuZiW3SkMncPQ9L5Q5PR + hlricTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB8T/wzhjtvtwZ+Iz2Y + SKM7gBBWbUmwjBdGX6aurCiyVGv2] remote_management: <<: *remoteparas address: 172.16.2.11/24 diff --git a/labs/intel/pod18.yaml b/labs/intel/pod18.yaml index 22738910..24c14fda 100644 --- a/labs/intel/pod18.yaml +++ b/labs/intel/pod18.yaml @@ -39,8 +39,8 @@ jumphost: versions: - 1.0 - 2.0 - user: - pass: + user: changeme + pass: changeme remote_management: <<: *remoteparas address: 10.10.180.10 @@ -123,7 +123,7 @@ nodes: remote_management: <<: *remoteparas address: 10.10.180.12/24 - mac_address: "A4:BF:01:16:31:1G" + mac_address: "A4:BF:01:16:31:1F" interfaces: - name: 'nic1' speed: 1gb diff --git a/labs/nokia/pod1.yaml b/labs/nokia/pod1.yaml index 037d4f97..6b684aeb 100644 --- a/labs/nokia/pod1.yaml +++ b/labs/nokia/pod1.yaml @@ -8,6 +8,7 @@ --- ### Nokia POD descriptor file ### +version: 1.0 details: pod_owner: Mika Rautakumpu contact: opnfv-public-lab-admin@list.nokia.com |