diff options
12 files changed, 54 insertions, 54 deletions
diff --git a/config/installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2 b/config/installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2 index bb235fb4..3e536620 100644 --- a/config/installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2 +++ b/config/installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2 @@ -10,11 +10,11 @@ --- TYPE: baremetal FLAVOR: cluster -POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool' # expects string ipmitool +POWER_TOOL: '{{ conf['jumphost']['remote_management']['type'] }}tool' # expects string ipmitool -ipmiUser: {{ conf['jumphost']['remote_params']['user'] }} -ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }} -ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}' +ipmiUser: {{ conf['jumphost']['remote_management']['user'] }} +ipmiPass: {{ conf['jumphost']['remote_management']['pass'] }} +ipmiVer: '{{ conf['jumphost']['remote_management']['versions'][0] }}' hosts: - name: {{ conf['nodes'][0]['name'] }} diff --git a/config/installers/compass4nfv/os-nosdn-openo-ha.yml.j2 b/config/installers/compass4nfv/os-nosdn-openo-ha.yml.j2 index 9e7e01cc..374f42a8 100644 --- a/config/installers/compass4nfv/os-nosdn-openo-ha.yml.j2 +++ b/config/installers/compass4nfv/os-nosdn-openo-ha.yml.j2 @@ -10,11 +10,11 @@ --- TYPE: baremetal FLAVOR: cluster -POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool' # expects string ipmitool +POWER_TOOL: '{{ conf['jumphost']['remote_management']['type'] }}tool' # expects string ipmitool -ipmiUser: {{ conf['jumphost']['remote_params']['user'] }} -ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }} -ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}' +ipmiUser: {{ conf['jumphost']['remote_management']['user'] }} +ipmiPass: {{ conf['jumphost']['remote_management']['pass'] }} +ipmiVer: '{{ conf['jumphost']['remote_management']['versions'][0] }}' deploy_options: orchestrator: diff --git a/config/installers/compass4nfv/os-ocl-nofeature-ha.yml.j2 b/config/installers/compass4nfv/os-ocl-nofeature-ha.yml.j2 index c7272cf3..34063b36 100644 --- a/config/installers/compass4nfv/os-ocl-nofeature-ha.yml.j2 +++ b/config/installers/compass4nfv/os-ocl-nofeature-ha.yml.j2 @@ -10,11 +10,11 @@ --- TYPE: baremetal FLAVOR: cluster -POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool' # expects string ipmitool +POWER_TOOL: '{{ conf['jumphost']['remote_management']['type'] }}tool' # expects string ipmitool -ipmiUser: {{ conf['jumphost']['remote_params']['user'] }} -ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }} -ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}' +ipmiUser: {{ conf['jumphost']['remote_management']['user'] }} +ipmiPass: {{ conf['jumphost']['remote_management']['pass'] }} +ipmiVer: '{{ conf['jumphost']['remote_management']['versions'][0] }}' hosts: - name: {{ conf['nodes'][0]['name'] }} diff --git a/config/installers/compass4nfv/os-odl_l2-moon-ha.yml.j2 b/config/installers/compass4nfv/os-odl_l2-moon-ha.yml.j2 index 72d3f4c7..249c3052 100644 --- a/config/installers/compass4nfv/os-odl_l2-moon-ha.yml.j2 +++ b/config/installers/compass4nfv/os-odl_l2-moon-ha.yml.j2 @@ -9,11 +9,11 @@ --- TYPE: baremetal FLAVOR: cluster -POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool' # expects string ipmitool +POWER_TOOL: '{{ conf['jumphost']['remote_management']['type'] }}tool' # expects string ipmitool -ipmiUser: {{ conf['jumphost']['remote_params']['user'] }} -ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }} -ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}' +ipmiUser: {{ conf['jumphost']['remote_management']['user'] }} +ipmiPass: {{ conf['jumphost']['remote_management']['pass'] }} +ipmiVer: '{{ conf['jumphost']['remote_management']['versions'][0] }}' hosts: - name: {{ conf['nodes'][0]['name'] }} diff --git a/config/installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2 b/config/installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2 index 3a0c222e..884bb23a 100644 --- a/config/installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2 +++ b/config/installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2 @@ -10,11 +10,11 @@ --- TYPE: baremetal FLAVOR: cluster -POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool' # expects string ipmitool +POWER_TOOL: '{{ conf['jumphost']['remote_management']['type'] }}tool' # expects string ipmitool -ipmiUser: {{ conf['jumphost']['remote_params']['user'] }} -ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }} -ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}' +ipmiUser: {{ conf['jumphost']['remote_management']['user'] }} +ipmiPass: {{ conf['jumphost']['remote_management']['pass'] }} +ipmiVer: '{{ conf['jumphost']['remote_management']['versions'][0] }}' hosts: - name: {{ conf['nodes'][0]['name'] }} diff --git a/config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 b/config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 index d019c230..cb36a970 100644 --- a/config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 +++ b/config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 @@ -9,11 +9,11 @@ --- TYPE: baremetal FLAVOR: cluster -POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool' # expects string ipmitool +POWER_TOOL: '{{ conf['jumphost']['remote_management']['type'] }}tool' # expects string ipmitool -ipmiUser: {{ conf['jumphost']['remote_params']['user'] }} -ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }} -ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}' +ipmiUser: {{ conf['jumphost']['remote_management']['user'] }} +ipmiPass: {{ conf['jumphost']['remote_management']['pass'] }} +ipmiVer: '{{ conf['jumphost']['remote_management']['versions'][0] }}' odl_l3_agent: "Enable" diff --git a/config/installers/compass4nfv/os-onos-nofeature-ha.yml.j2 b/config/installers/compass4nfv/os-onos-nofeature-ha.yml.j2 index 2adce440..241cfd32 100644 --- a/config/installers/compass4nfv/os-onos-nofeature-ha.yml.j2 +++ b/config/installers/compass4nfv/os-onos-nofeature-ha.yml.j2 @@ -9,11 +9,11 @@ --- TYPE: baremetal FLAVOR: cluster -POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool' # expects string ipmitool +POWER_TOOL: '{{ conf['jumphost']['remote_management']['type'] }}tool' # expects string ipmitool -ipmiUser: {{ conf['jumphost']['remote_params']['user'] }} -ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }} -ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}' +ipmiUser: {{ conf['jumphost']['remote_management']['user'] }} +ipmiPass: {{ conf['jumphost']['remote_management']['pass'] }} +ipmiVer: '{{ conf['jumphost']['remote_management']['versions'][0] }}' hosts: - name: {{ conf['nodes'][0]['name'] }} diff --git a/config/installers/compass4nfv/os-onos-sfc-ha.yml.j2 b/config/installers/compass4nfv/os-onos-sfc-ha.yml.j2 index 230a601f..dba5fe18 100644 --- a/config/installers/compass4nfv/os-onos-sfc-ha.yml.j2 +++ b/config/installers/compass4nfv/os-onos-sfc-ha.yml.j2 @@ -9,11 +9,11 @@ --- TYPE: baremetal FLAVOR: cluster -POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool' # expects string ipmitool +POWER_TOOL: '{{ conf['jumphost']['remote_management']['type'] }}tool' # expects string ipmitool -ipmiUser: {{ conf['jumphost']['remote_params']['user'] }} -ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }} -ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}' +ipmiUser: {{ conf['jumphost']['remote_management']['user'] }} +ipmiPass: {{ conf['jumphost']['remote_management']['pass'] }} +ipmiVer: '{{ conf['jumphost']['remote_management']['versions'][0] }}' onos_sfc: "Enable" diff --git a/config/installers/daisy/pod_config.yaml.j2 b/config/installers/daisy/pod_config.yaml.j2 index 30147a5e..b7e621c4 100644 --- a/config/installers/daisy/pod_config.yaml.j2 +++ b/config/installers/daisy/pod_config.yaml.j2 @@ -9,7 +9,7 @@ --- -adapter: {{ conf['jumphost']['remote_params']['type'] }} +adapter: {{ conf['jumphost']['remote_management']['type'] }} hosts: {%- set nodes_num = conf['nodes'] | length -%} {%- if nodes_num == 5 %} diff --git a/config/installers/joid/pod_config.yaml.j2 b/config/installers/joid/pod_config.yaml.j2 index e18ba86f..b77fa864 100644 --- a/config/installers/joid/pod_config.yaml.j2 +++ b/config/installers/joid/pod_config.yaml.j2 @@ -31,10 +31,10 @@ lab: spaces: [admin] mac: ["{{ conf['nodes'][0]['interfaces'][2]['mac_address'] }}"] power: - type: {{ conf['jumphost']['remote_params']['type'] }} + type: {{ conf['nodes'][0]['remote_management']['type'] }} address: {{ conf['nodes'][0]['remote_management']['address'] }} - user: {{ conf['jumphost']['remote_params']['user'] }} - pass: {{ conf['jumphost']['remote_params']['pass'] }} + user: {{ conf['nodes'][0]['remote_management']['user'] }} + pass: {{ conf['nodes'][0]['remote_management']['pass'] }} - name: {{ conf['nodes'][1]['name'] }} architecture: {{ conf['nodes'][1]['node']['arch'] }} roles: [compute, control, storage] @@ -55,10 +55,10 @@ lab: spaces: [admin] mac: ["{{ conf['nodes'][1]['interfaces'][2]['mac_address'] }}"] power: - type: {{ conf['jumphost']['remote_params']['type'] }} + type: {{ conf['nodes'][1]['remote_management']['type'] }} address: {{ conf['nodes'][1]['remote_management']['address'] }} - user: {{ conf['jumphost']['remote_params']['user'] }} - pass: {{ conf['jumphost']['remote_params']['pass'] }} + user: {{ conf['nodes'][1]['remote_management']['user'] }} + pass: {{ conf['nodes'][1]['remote_management']['pass'] }} - name: {{ conf['nodes'][2]['name'] }} architecture: {{ conf['nodes'][2]['node']['arch'] }} roles: [compute, control, storage] @@ -77,10 +77,10 @@ lab: mac: ["{{ conf['nodes'][2]['interfaces'][1]['mac_address'] }}"] - ifname: {{ conf['nodes'][2]['interfaces'][2]['name'] }} power: - type: {{ conf['jumphost']['remote_params']['type'] }} + type: {{ conf['nodes'][2]['remote_management']['type'] }} address: {{ conf['nodes'][2]['remote_management']['address'] }} - user: {{ conf['jumphost']['remote_params']['user'] }} - pass: {{ conf['jumphost']['remote_params']['pass'] }} + user: {{ conf['nodes'][2]['remote_management']['user'] }} + pass: {{ conf['nodes'][2]['remote_management']['pass'] }} - name: {{ conf['nodes'][3]['name'] }} architecture: {{ conf['nodes'][3]['node']['arch'] }} roles: [compute, storage] @@ -99,10 +99,10 @@ lab: mac: ["{{ conf['nodes'][3]['interfaces'][1]['mac_address'] }}"] - ifname: {{ conf['nodes'][3]['interfaces'][2]['name'] }} power: - type: ipmi + type: {{ conf['nodes'][3]['remote_management']['type'] }} address: {{ conf['nodes'][3]['remote_management']['address'] }} - user: {{ conf['jumphost']['remote_params']['user'] }} - pass: {{ conf['jumphost']['remote_params']['pass'] }} + user: {{ conf['nodes'][3]['remote_management']['user'] }} + pass: {{ conf['nodes'][3]['remote_management']['pass'] }} - name: {{ conf['nodes'][4]['name'] }} architecture: {{ conf['nodes'][4]['node']['arch'] }} roles: [compute, storage] @@ -121,19 +121,19 @@ lab: mac: ["{{ conf['nodes'][4]['interfaces'][1]['mac_address'] }}"] - ifname: {{ conf['nodes'][1]['interfaces'][2]['name'] }} power: - type: {{ conf['jumphost']['remote_params']['type'] }} + type: {{ conf['nodes'][4]['remote_management']['type'] }} address: {{ conf['nodes'][4]['remote_management']['address'] }} - user: {{ conf['jumphost']['remote_params']['user'] }} - pass: {{ conf['jumphost']['remote_params']['pass'] }} + user: {{ conf['nodes'][4]['remote_management']['user'] }} + pass: {{ conf['nodes'][4]['remote_management']['pass'] }} floating-ip-range: 10.5.15.6,10.5.15.250,10.5.15.1,10.5.15.0/24 ext-port: "ens785f0.505" dns: 8.8.8.8 osdomainname: opnfv: - release: c - distro: trusty - type: nonha - openstack: liberty + release: f + distro: xenial + type: ha + openstack: pike sdncontroller: - type: nosdn storage: diff --git a/config/utils/generate_config.py b/config/utils/generate_config.py index 5dbdb7d1..b2b52f0b 100755 --- a/config/utils/generate_config.py +++ b/config/utils/generate_config.py @@ -65,7 +65,7 @@ ENV.filters['dpkg_arch'] = dpkg_arch # Run `eyaml decrypt` on the whole file, but only if PDF data is encrypted # Note: eyaml return code is 0 even if keys are not available try: - if 'ENC[PKCS7' in open(ARGS.yaml).read(): + if os.path.isfile(ARGS.yaml) and 'ENC[PKCS7' in open(ARGS.yaml).read(): DICT = yaml.safe_load(check_output(['eyaml', 'decrypt', '-f', ARGS.yaml])) except CalledProcessError as ex: diff --git a/labs/zte/idf-pod1.yaml b/labs/zte/idf-pod1.yaml index 3bb9e034..9118ae6a 100644 --- a/labs/zte/idf-pod1.yaml +++ b/labs/zte/idf-pod1.yaml @@ -46,7 +46,7 @@ idf: fuel: jumphost: bridges: - admin: 'pxebr' + admin: 'br6' mgmt: 'br-mgmt' private: ~ public: 'br-external' |