diff options
Diffstat (limited to 'config')
-rw-r--r-- | config/installers/fuel/pod_config.yml.j2 | 15 | ||||
-rwxr-xr-x | config/utils/generate_config.py | 10 |
2 files changed, 19 insertions, 6 deletions
diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 index 392ca90f..28c61888 100644 --- a/config/installers/fuel/pod_config.yml.j2 +++ b/config/installers/fuel/pod_config.yml.j2 @@ -32,17 +32,26 @@ parameters: _param: +{%- if conf.idf is defined %} + opnfv_jump_bridge_admin: {{ conf['idf']['fuel']['jumphost']['bridges']['admin'] }} + opnfv_jump_bridge_mgmt: {{ conf['idf']['fuel']['jumphost']['bridges']['mgmt'] }} + opnfv_jump_bridge_private: {{ conf['idf']['fuel']['jumphost']['bridges']['private'] }} + opnfv_jump_bridge_public: {{ conf['idf']['fuel']['jumphost']['bridges']['public'] }} +{%- endif %} + opnfv_infra_config_address: {{ net_mgmt | ipaddr_index('100') }} opnfv_infra_maas_node01_address: {{ net_mgmt | ipaddr_index('3') }} opnfv_infra_maas_node01_deploy_address: {{ net_admin | ipaddr_index('3') }} - opnfv_infra_compute_node01_address: {{ net_mgmt | ipaddr_index('141') }} - opnfv_infra_compute_node02_address: {{ net_mgmt | ipaddr_index('142') }} - opnfv_infra_compute_node03_address: {{ net_mgmt | ipaddr_index('143') }} opnfv_infra_kvm_address: {{ net_mgmt | ipaddr_index('140') }} opnfv_infra_kvm_node01_address: {{ net_mgmt | ipaddr_index('141') }} opnfv_infra_kvm_node02_address: {{ net_mgmt | ipaddr_index('142') }} opnfv_infra_kvm_node03_address: {{ net_mgmt | ipaddr_index('143') }} + opnfv_infra_maas_pxe_network_address: {{ net_admin }} + opnfv_infra_maas_pxe_address: {{ net_admin | ipaddr_index('3') }} + opnfv_infra_maas_pxe_start_address: {{ net_admin | ipaddr_index('5') }} + opnfv_infra_maas_pxe_end_address: {{ net_admin | ipaddr_index('250') }} + opnfv_openstack_gateway_node01_address: {{ net_mgmt | ipaddr_index('124') }} opnfv_openstack_gateway_node02_address: {{ net_mgmt | ipaddr_index('125') }} opnfv_openstack_gateway_node03_address: {{ net_mgmt | ipaddr_index('126') }} diff --git a/config/utils/generate_config.py b/config/utils/generate_config.py index ba4192cb..37108808 100755 --- a/config/utils/generate_config.py +++ b/config/utils/generate_config.py @@ -57,9 +57,13 @@ ENV.filters['dpkg_arch'] = dpkg_arch try: DICT = yaml.safe_load(check_output(['eyaml', 'decrypt', '-f', ARGS.yaml])) except CalledProcessError as ex: - pass -if not DICT: - logging.warn('PDF decryption failed, fallback to using raw data.') + logging.error('eyaml decryption failed, keys might be missing') +except OSError as ex: + logging.warn('eyaml not found, skipping decryption') +try: + DICT +except NameError as ex: + logging.warn('PDF decryption skipped, fallback to using raw data.') with open(ARGS.yaml) as _: DICT = yaml.safe_load(_) |