Fix deprecated nodes list in yaql expressions
'nodes' list is deprecated and replaced with 'network_metadata/nodes' hash. Update yaql_exp accordingly. Change-Id: I795f944ca3b1fc49fae07ddc36c2eabcfcc968ed Partial-bug: #1531128
This commit is contained in:
parent
c243464376
commit
8be916680a
|
@ -5,7 +5,7 @@
|
|||
required_for: [keystone, primary-keystone]
|
||||
requires: [netconfig]
|
||||
condition:
|
||||
yaql_exp: "$.uid in added($.nodes.uid)"
|
||||
yaql_exp: "$.uid in added($.network_metadata.nodes.values().uid)"
|
||||
parameters:
|
||||
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/apache/apache.pp
|
||||
puppet_modules: /etc/puppet/modules
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
requires: [post_deployment_start]
|
||||
required_for: [post_deployment_end]
|
||||
condition:
|
||||
yaql_exp: "changed($.nodes) or changed($.get('corosync_roles'))"
|
||||
yaql_exp: "changed($.network_metadata.nodes) or changed($.get('corosync_roles'))"
|
||||
cross-depends:
|
||||
- name: dns-client
|
||||
- name: ntp-server
|
||||
|
@ -59,7 +59,7 @@
|
|||
version: 2.1.0
|
||||
role: ['/.*/']
|
||||
condition:
|
||||
yaql_exp: '$.uid in added($.nodes).uid'
|
||||
yaql_exp: '$.uid in added($.network_metadata.nodes.values()).uid'
|
||||
requires: [upload_configuration]
|
||||
required_for: [pre_deployment_end]
|
||||
parameters:
|
||||
|
@ -228,7 +228,7 @@
|
|||
($.public_ssl.horizon or $.public_ssl.services) and
|
||||
(not (old($.public_ssl.horizon) or old($.public_ssl.services)))) or
|
||||
(($.public_ssl.horizon or $.public_ssl.services) and
|
||||
($.uid in added($.nodes).uid))) and
|
||||
($.uid in added($.network_metadata.nodes.values()).uid))) and
|
||||
$.public_ssl.cert_source = 'self_signed'
|
||||
required_for: [pre_deployment_end]
|
||||
requires: [generate_haproxy_keys]
|
||||
|
@ -249,7 +249,7 @@
|
|||
version: 2.1.0
|
||||
role: ['/.*/']
|
||||
condition:
|
||||
yaql_exp: '$.uid in added($.nodes).uid'
|
||||
yaql_exp: '$.uid in added($.network_metadata.nodes.values()).uid'
|
||||
requires: [pre_deployment_start]
|
||||
required_for: [pre_deployment_end]
|
||||
parameters:
|
||||
|
@ -263,7 +263,7 @@
|
|||
version: 2.1.0
|
||||
role: ['/.*/']
|
||||
condition:
|
||||
yaql_exp: '$.uid in added($.nodes).uid'
|
||||
yaql_exp: '$.uid in added($.network_metadata.nodes.values()).uid'
|
||||
requires: [pre_deployment_start, rsync_core_puppet]
|
||||
required_for: [pre_deployment_end]
|
||||
parameters:
|
||||
|
@ -277,7 +277,7 @@
|
|||
version: 2.1.0
|
||||
role: ['/.*/']
|
||||
condition:
|
||||
yaql_exp: '$.uid in added($.nodes).uid'
|
||||
yaql_exp: '$.uid in added($.network_metadata.nodes.values()).uid'
|
||||
requires: [pre_hiera_config]
|
||||
required_for: [pre_deployment_end]
|
||||
parameters:
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
requires: [hiera]
|
||||
required_for: [fuel_pkgs]
|
||||
condition:
|
||||
yaql_exp: '($.uid in added($.nodes).uid) or changed($.repo_setup)'
|
||||
yaql_exp: '($.uid in added($.network_metadata.nodes.values()).uid) or changed($.repo_setup)'
|
||||
parameters:
|
||||
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/fuel_pkgs/setup_repositories.pp
|
||||
puppet_modules: /etc/puppet/modules
|
||||
|
@ -18,7 +18,7 @@
|
|||
requires: [setup_repositories]
|
||||
required_for: [globals]
|
||||
condition:
|
||||
yaql_exp: '$.uid in added($.nodes).uid'
|
||||
yaql_exp: '$.uid in added($.network_metadata.nodes.values()).uid'
|
||||
parameters:
|
||||
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/fuel_pkgs/fuel_pkgs.pp
|
||||
puppet_modules: /etc/puppet/modules
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
required_for: [setup_repositories]
|
||||
condition:
|
||||
yaql_exp: >
|
||||
($.uid in added($.nodes).uid) or
|
||||
($.uid in added($.network_metadata.nodes.values()).uid) or
|
||||
changed($.plugins)
|
||||
parameters:
|
||||
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/hiera/hiera.pp
|
||||
|
|
|
@ -54,7 +54,7 @@
|
|||
required_for: [globals]
|
||||
requires: [rsync_core_puppet]
|
||||
condition:
|
||||
yaql_exp: '$.uid in added($.nodes).uid'
|
||||
yaql_exp: '$.uid in added($.network_metadata.nodes.values()).uid'
|
||||
parameters:
|
||||
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/netconfig/reserved_ports.pp
|
||||
puppet_modules: /etc/puppet/modules
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
required_for: [deploy_end]
|
||||
requires: [tools]
|
||||
condition:
|
||||
yaql_exp: "$.uid in added($.nodes.uid)"
|
||||
yaql_exp: "$.uid in added($.network_metadata.nodes.values().uid)"
|
||||
parameters:
|
||||
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/umm/umm.pp
|
||||
puppet_modules: /etc/puppet/modules
|
||||
|
|
Loading…
Reference in New Issue