diff options
| -rw-r--r-- | config/installers/fuel/pod_config.yml.j2 | 4 | ||||
| -rw-r--r-- | config/utils/README.eyaml.rst | 3 | ||||
| -rwxr-xr-x | config/utils/generate_config.py | 10 |
3 files changed, 11 insertions, 6 deletions
diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 index 078155b4..eccdf5cd 100644 --- a/config/installers/fuel/pod_config.yml.j2 +++ b/config/installers/fuel/pod_config.yml.j2 @@ -8,6 +8,7 @@ {%- if conf.net_config.public.dns is defined -%} {%- set dns_public = conf['net_config']['public']['dns'] -%} {%- endif -%} + {%- set pxe_interface = conf['net_config']['admin']['interface'] -%} {%- else -%} {%- set net_admin = '192.168.11.0' -%} {%- set net_mgmt = '172.16.10.0' -%} @@ -15,13 +16,12 @@ {%- set net_public = '172.30.10.0' -%} {%- set vlan_mgmt = '300' -%} {%- set vlan_private = '1000' -%} + {%- set pxe_interface = 0 -%} {%- endif -%} {%- if dns_public is not defined -%} {%- set dns_public = [ '8.8.8.8', '8.8.4.4' ] -%} {%- endif -%} - -{%- set pxe_interface = 0 -%} --- parameters: _param: diff --git a/config/utils/README.eyaml.rst b/config/utils/README.eyaml.rst index 083d5192..386a21bb 100644 --- a/config/utils/README.eyaml.rst +++ b/config/utils/README.eyaml.rst @@ -12,7 +12,7 @@ Prerequisites .. code-block:: bash - $ sudo yum install ruby-gems || sudo apt-get install ruby + $ sudo yum install rubygems || sudo apt-get install ruby $ sudo gem install hiera-eyaml $ eyaml createkeys @@ -22,6 +22,7 @@ Prerequisites $ sudo mkdir -p /etc/eyaml_keys/ $ sudo mv ./keys/* /etc/eyaml_keys/ + $ sudo rmdir ./keys #. Set up eyaml config.yaml 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(_) |