Start moving away from search queries to static config items for cookbooks #718

vuntz · 2017-01-04T10:48:34Z

See crowbar/crowbar-core#947 for the background.

houndci-bot · 2017-01-04T10:49:00Z

crowbar_framework/app/models/trove_service.rb

+          role.default_attributes["trove"]["keystone_instance"],
+          "keystone"
+        )
+        insecure = insecure || keystone_config["insecure"]


Style/SelfAssignment: Use self-assignment shorthand ||=. (https://github.com/bbatsov/ruby-style-guide#self-assignment)

houndci-bot · 2017-01-04T10:49:00Z

crowbar_framework/app/models/trove_service.rb

+      # currently, there's no insecure setting
+      insecure = false
+      #use_ssl = role.default_attributes["trove"]["api"]["protocol"] == "https"
+      #insecure = use_ssl && role.default_attributes["trove"]["ssl"]["insecure"]


Style/LeadingCommentSpace: Missing space after #. (https://github.com/bbatsov/ruby-style-guide#hash-space)

houndci-bot · 2017-01-04T10:49:00Z

crowbar_framework/app/models/trove_service.rb

+    else
+      # currently, there's no insecure setting
+      insecure = false
+      #use_ssl = role.default_attributes["trove"]["api"]["protocol"] == "https"


Style/LeadingCommentSpace: Missing space after #. (https://github.com/bbatsov/ruby-style-guide#hash-space)

houndci-bot · 2017-01-04T10:49:01Z

crowbar_framework/app/models/swift_service.rb

+          role.default_attributes["swift"]["keystone_instance"],
+          "keystone"
+        )
+        insecure = insecure || keystone_config["insecure"]


Style/SelfAssignment: Use self-assignment shorthand ||=. (https://github.com/bbatsov/ruby-style-guide#self-assignment)

houndci-bot · 2017-01-04T10:49:01Z

crowbar_framework/app/models/sahara_service.rb

+          role.default_attributes["sahara"]["keystone_instance"],
+          "keystone"
+        )
+        insecure = insecure || keystone_config["insecure"]


Style/SelfAssignment: Use self-assignment shorthand ||=. (https://github.com/bbatsov/ruby-style-guide#self-assignment)

houndci-bot · 2017-01-04T10:49:02Z

crowbar_framework/app/models/sahara_service.rb

+      # currently, there's no insecure setting
+      insecure = false
+      #use_ssl = role.default_attributes["sahara"]["api"]["protocol"] == "https"
+      #insecure = use_ssl && role.default_attributes["sahara"]["ssl"]["insecure"]


Style/LeadingCommentSpace: Missing space after #. (https://github.com/bbatsov/ruby-style-guide#hash-space)

houndci-bot · 2017-01-04T10:49:02Z

crowbar_framework/app/models/sahara_service.rb

+    else
+      # currently, there's no insecure setting
+      insecure = false
+      #use_ssl = role.default_attributes["sahara"]["api"]["protocol"] == "https"


Style/LeadingCommentSpace: Missing space after #. (https://github.com/bbatsov/ruby-style-guide#hash-space)

houndci-bot · 2017-01-04T10:49:02Z

crowbar_framework/app/models/rabbitmq_service.rb

+      user = role.default_attributes["rabbitmq"]["user"]
+      password = role.default_attributes["rabbitmq"]["password"]
+      # avoid duplicated /
+      vhost = role.default_attributes["rabbitmq"]["vhost"].sub(/^\/*/, "")


Style/RegexpLiteral: Use %r around regular expression. (https://github.com/SUSE/style-guides/blob/master/Ruby.md#styleregexpliteral)

houndci-bot · 2017-01-04T10:49:03Z

crowbar_framework/app/models/nova_service.rb

+          role.default_attributes["nova"]["keystone_instance"],
+          "keystone"
+        )
+        insecure = insecure || keystone_config["insecure"]


Style/SelfAssignment: Use self-assignment shorthand ||=. (https://github.com/bbatsov/ruby-style-guide#self-assignment)

houndci-bot · 2017-01-04T10:49:03Z

crowbar_framework/app/models/neutron_service.rb

+          role.default_attributes["neutron"]["keystone_instance"],
+          "keystone"
+        )
+        insecure = insecure || keystone_config["insecure"]


Style/SelfAssignment: Use self-assignment shorthand ||=. (https://github.com/bbatsov/ruby-style-guide#self-assignment)

houndci-bot · 2017-01-04T10:49:03Z

crowbar_framework/app/models/manila_service.rb

+          role.default_attributes["manila"]["keystone_instance"],
+          "keystone"
+        )
+        insecure = insecure || keystone_config["insecure"]


Style/SelfAssignment: Use self-assignment shorthand ||=. (https://github.com/bbatsov/ruby-style-guide#self-assignment)

houndci-bot · 2017-01-04T10:49:03Z

crowbar_framework/app/models/magnum_service.rb

+          role.default_attributes["magnum"]["keystone_instance"],
+          "keystone"
+        )
+        insecure = insecure || keystone_config["insecure"]


Style/SelfAssignment: Use self-assignment shorthand ||=. (https://github.com/bbatsov/ruby-style-guide#self-assignment)

houndci-bot · 2017-01-04T10:49:04Z

crowbar_framework/app/models/magnum_service.rb

+      # currently, there's no insecure setting
+      insecure = false
+      #use_ssl = role.default_attributes["magnum"]["api"]["protocol"] == "https"
+      #insecure = use_ssl && role.default_attributes["magnum"]["ssl"]["insecure"]


Style/LeadingCommentSpace: Missing space after #. (https://github.com/bbatsov/ruby-style-guide#hash-space)

houndci-bot · 2017-01-04T10:49:04Z

crowbar_framework/app/models/magnum_service.rb

+    else
+      # currently, there's no insecure setting
+      insecure = false
+      #use_ssl = role.default_attributes["magnum"]["api"]["protocol"] == "https"


Style/LeadingCommentSpace: Missing space after #. (https://github.com/bbatsov/ruby-style-guide#hash-space)

houndci-bot · 2017-01-04T10:49:04Z

crowbar_framework/app/models/heat_service.rb

+          role.default_attributes["heat"]["keystone_instance"],
+          "keystone"
+        )
+        insecure = insecure || keystone_config["insecure"]


Style/SelfAssignment: Use self-assignment shorthand ||=. (https://github.com/bbatsov/ruby-style-guide#self-assignment)

houndci-bot · 2017-01-04T10:49:05Z

crowbar_framework/app/models/glance_service.rb

+          role.default_attributes["glance"]["keystone_instance"],
+          "keystone"
+        )
+        insecure = insecure || keystone_config["insecure"]


Style/SelfAssignment: Use self-assignment shorthand ||=. (https://github.com/bbatsov/ruby-style-guide#self-assignment)

Itxaka · 2017-01-05T14:55:14Z

crowbar_framework/app/models/heat_service.rb

+    @logger.debug("Heat apply_role_post_chef_call: leaving")
+  end
+
+  def save_config_to_databag(old_role, role)


This looks like a perfect candidate for DRY

To some extent, yes. But not completely as the path to the attributes is not always the same, and also because some barclamps will have more data in the config later on.

Improved things a bit.

Itxaka · 2017-01-05T15:12:41Z

Looking pretty good!

houndci-bot · 2017-01-06T10:02:35Z

chef/cookbooks/glance/recipes/api.rb

-  cinder_api_insecure = cinder[:cinder][:api][:protocol] == "https" && cinder[:cinder][:ssl][:insecure]
-end
+swift_insecure = Config.load("openstack", "swift")["insecure"] || false
+cinder_insecure = Config.load("openstack", "cinder")["insecure"] || false


Lint/UselessAssignment: Useless assignment to variable - cinder_insecure. (https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars)

houndci-bot · 2017-01-06T10:02:35Z

chef/cookbooks/glance/recipes/api.rb

-  cinder_api_insecure = cinder[:cinder][:api][:protocol] == "https" && cinder[:cinder][:ssl][:insecure]
-end
+swift_insecure = Config.load("openstack", "swift")["insecure"] || false
+cinder_insecure = Config.load("openstack", "cinder")["insecure"] || false


Lint/UselessAssignment: Useless assignment to variable - cinder_insecure. (https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars)

Sorry, you're wrong...

houndci-bot · 2017-01-06T10:02:35Z

chef/cookbooks/glance/recipes/api.rb

-  cinder = cinders[0]
-  cinder_api_insecure = cinder[:cinder][:api][:protocol] == "https" && cinder[:cinder][:ssl][:insecure]
-end
+swift_insecure = Config.load("openstack", "swift")["insecure"] || false


Lint/UselessAssignment: Useless assignment to variable - swift_insecure. (https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars)

houndci-bot · 2017-01-06T10:02:35Z

chef/cookbooks/glance/recipes/api.rb

-  cinder = cinders[0]
-  cinder_api_insecure = cinder[:cinder][:api][:protocol] == "https" && cinder[:cinder][:ssl][:insecure]
-end
+swift_insecure = Config.load("openstack", "swift")["insecure"] || false


Lint/UselessAssignment: Useless assignment to variable - swift_insecure. (https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars)

Sorry, you're wrong...

houndci-bot · 2017-01-06T10:02:35Z

chef/cookbooks/ceilometer/recipes/server.rb

-                           "ceilometer_config_environment:#{node[:ceilometer][:config][:environment]}"
-      )
+    mongodb_nodes = node_search_with_cache("roles:ceilometer-server").select do |n|
+      n[:ceilometer][:ha][:mongodb][:replica_set][:member] rescue false


Style/RescueModifier: Avoid using rescue in its modifier form. (https://github.com/bbatsov/ruby-style-guide#no-rescue-modifiers)

houndci-bot · 2017-01-06T10:02:35Z

chef/cookbooks/ceilometer/recipes/server.rb

-                           "ceilometer_config_environment:#{node[:ceilometer][:config][:environment]}"
-      )
+    mongodb_nodes = node_search_with_cache("roles:ceilometer-server").select do |n|
+      n[:ceilometer][:ha][:mongodb][:replica_set][:member] rescue false


Style/RescueModifier: Avoid using rescue in its modifier form. (https://github.com/bbatsov/ruby-style-guide#no-rescue-modifiers)

houndci-bot · 2017-01-06T10:02:36Z

chef/cookbooks/ceilometer/recipes/mongodb.rb

-                     "ceilometer_ha_mongodb_replica_set_member:true AND "\
-                     "ceilometer_config_environment:#{node[:ceilometer][:config][:environment]}")
+    members = node_search_with_cache("roles:ceilometer-server").select do |n|
+      n[:ceilometer][:ha][:mongodb][:replica_set][:member] rescue false


Style/RescueModifier: Avoid using rescue in its modifier form. (https://github.com/bbatsov/ruby-style-guide#no-rescue-modifiers)

houndci-bot · 2017-01-06T10:02:36Z

chef/cookbooks/ceilometer/recipes/mongodb.rb

-                     "ceilometer_ha_mongodb_replica_set_member:true AND "\
-                     "ceilometer_config_environment:#{node[:ceilometer][:config][:environment]}")
+    members = node_search_with_cache("roles:ceilometer-server").select do |n|
+      n[:ceilometer][:ha][:mongodb][:replica_set][:member] rescue false


Style/RescueModifier: Avoid using rescue in its modifier form. (https://github.com/bbatsov/ruby-style-guide#no-rescue-modifiers)

houndci-bot · 2017-01-06T10:02:36Z

chef/cookbooks/ceilometer/recipes/common.rb

-                      "ceilometer_config_environment:#{node[:ceilometer][:config][:environment]}"
-                     )
+    db_hosts = node_search_with_cache("roles:ceilometer-server").select do |n|
+      n[:ceilometer][:ha][:mongodb][:replica_set][:member] rescue false


Style/RescueModifier: Avoid using rescue in its modifier form. (https://github.com/bbatsov/ruby-style-guide#no-rescue-modifiers)

houndci-bot · 2017-01-26T13:08:12Z

chef/cookbooks/nova/recipes/trusted_flavors.rb

@@ -29,8 +29,7 @@
  nova = node
  keystone_settings = KeystoneHelper.keystone_settings(node, @cookbook_name)

-  nova_insecure = node[:nova][:ssl][:insecure]
-  ssl_insecure = keystone_settings["insecure"] || nova_insecure
+  ssl_insecure = Config.load("openstack", "nova")["insecure"] || false


Style/IndentationConsistency: Inconsistent indentation detected.

rsalevsky · 2017-03-03T09:21:55Z

Needs a rebase.

houndci-bot · 2017-03-03T12:16:17Z

chef/cookbooks/magnum/recipes/post_install.rb

-openstack_args_nova = (nova_controller[:nova][:ssl][:enabled] &&
-  nova_controller[:nova][:ssl][:insecure]) || keystone_settings["insecure"] ? "--insecure" : ""
+nova_config = Barclamp::Config.load("openstack", "nova", node[:magnum][:nova_instance])
+openstack_args_nova = (nova_config["insecure"] || false) ? "--insecure" : ""


Style/TernaryParentheses: Omit parentheses for ternary conditions.
Lint/LiteralInCondition: Literal false appeared in a condition.

houndci-bot · 2017-03-03T12:16:17Z

chef/cookbooks/magnum/recipes/post_install.rb

-openstack_args_glance = (glance_server[:glance][:api][:protocol] == "https" &&
-  glance_server[:glance][:ssl][:insecure]) || keystone_settings["insecure"] ? "--insecure" : ""
+glance_config = Barclamp::Config.load("openstack", "glance", node[:magnum][:glance_instance])
+openstack_args_glance = (glance_config["insecure"] || false) ? "--insecure" : ""


Style/TernaryParentheses: Omit parentheses for ternary conditions.
Lint/LiteralInCondition: Literal false appeared in a condition.

houndci-bot · 2017-03-03T12:16:17Z

crowbar_framework/lib/openstack/data_bag_config.rb

+module Openstack
+  class DataBagConfig
+    class << self
+      def insecure(barclamp, role)


Metrics/CyclomaticComplexity: Cyclomatic complexity for insecure is too high. [9/6]
Metrics/PerceivedComplexity: Perceived complexity for insecure is too high. [10/7]

houndci-bot · 2017-03-03T12:16:17Z

chef/cookbooks/nova/recipes/trusted_flavors.rb

+    novacmd = "#{novacmd} --os-user-domain-name Default --os-project-domain-name Default"
+  end
+
+  flavors.keys.each do |id|


Style/IndentationConsistency: Inconsistent indentation detected.

houndci-bot · 2017-03-03T12:16:17Z

chef/cookbooks/nova/recipes/trusted_flavors.rb

+  if ssl_insecure
+    novacmd = "#{novacmd} --insecure"
+  end
+  if keystone_settings["api_version"] != "2.0"


Style/IndentationConsistency: Inconsistent indentation detected.

houndci-bot · 2017-03-03T12:16:17Z

chef/cookbooks/nova/recipes/trusted_flavors.rb

+    "vcpu"=>2,
+    "disk"=>40,
+    "mem"=>4096}
+ }


Style/MultilineHashBraceLayout: Closing hash brace must be on the same line as the last hash element when opening brace is on the same line as the first hash element.

houndci-bot · 2017-03-03T12:16:17Z

chef/cookbooks/nova/recipes/trusted_flavors.rb

+   {"name"=>"m1.trusted.medium",
+    "vcpu"=>2,
+    "disk"=>40,
+    "mem"=>4096}


Style/SpaceAroundOperators: Surrounding space missing for operator =>. (https://github.com/bbatsov/ruby-style-guide#spaces-operators)
Style/SpaceInsideHashLiteralBraces: Space inside } missing. (https://github.com/bbatsov/ruby-style-guide#spaces-operators)

houndci-bot · 2017-03-03T12:16:18Z

chef/cookbooks/nova/recipes/trusted_flavors.rb

+  10=>
+   {"name"=>"m1.trusted.medium",
+    "vcpu"=>2,
+    "disk"=>40,


Style/SpaceAroundOperators: Surrounding space missing for operator =>. (https://github.com/bbatsov/ruby-style-guide#spaces-operators)

houndci-bot · 2017-03-03T12:16:18Z

chef/cookbooks/nova/recipes/trusted_flavors.rb

+    "mem"=>2048},
+  10=>
+   {"name"=>"m1.trusted.medium",
+    "vcpu"=>2,


Style/SpaceAroundOperators: Surrounding space missing for operator =>. (https://github.com/bbatsov/ruby-style-guide#spaces-operators)

houndci-bot · 2017-03-03T12:16:18Z

chef/cookbooks/nova/recipes/trusted_flavors.rb

+    "disk"=>20,
+    "mem"=>2048},
+  10=>
+   {"name"=>"m1.trusted.medium",


Style/SpaceInsideHashLiteralBraces: Space inside { missing. (https://github.com/bbatsov/ruby-style-guide#spaces-operators)
Style/SpaceAroundOperators: Surrounding space missing for operator =>. (https://github.com/bbatsov/ruby-style-guide#spaces-operators)

All openstack services should provide this, and it happens quite a bit that other services only need this flag about another service. So it's a good candidate to start with.

We can check this out with the data bag config now.

aodh, barbican, ceilometer, magnum, trove and sahara

vuntz · 2017-03-03T12:17:29Z

Needs a rebase.

done

houndci-bot · 2017-03-03T12:17:41Z

chef/cookbooks/nova/libraries/availability_zone.rb

@@ -35,7 +35,7 @@ def self.fetch_set_az_command_no_arg(node, cookbook_name)
    command << "--os-region-name"
    command << keystone_settings["endpoint_region"]

-    if keystone_settings["insecure"] || nova_insecure
+    if ssl_insecure


Style/IfUnlessModifier: Favor modifier if usage when having a single-line body. Another good alternative is the usage of control flow &&/||. (https://github.com/bbatsov/ruby-style-guide#if-as-a-modifier)

dirkmueller · 2017-08-18T10:54:38Z

This has been splitted into individual commits and is being reworked again in #1143 so closing this one.

vuntz added the wip label Jan 4, 2017

houndci-bot reviewed Jan 4, 2017

View reviewed changes

dirkmueller added this to the Cloud 7 Update1 milestone Jan 4, 2017

Itxaka reviewed Jan 5, 2017

View reviewed changes

vuntz force-pushed the databagconfig branch from b8167c5 to 42095ac Compare January 6, 2017 10:02

houndci-bot reviewed Jan 6, 2017

View reviewed changes

vuntz force-pushed the databagconfig branch from 71cd765 to 249a316 Compare January 26, 2017 09:37

vuntz added wip and removed wip labels Jan 26, 2017

vuntz force-pushed the databagconfig branch 2 times, most recently from afa108d to f29c043 Compare January 26, 2017 12:30

houndci-bot reviewed Jan 26, 2017

View reviewed changes

vuntz force-pushed the databagconfig branch 3 times, most recently from 44c97ea to bc53167 Compare January 31, 2017 13:37

vuntz removed the wip label Jan 31, 2017

vuntz mentioned this pull request Feb 7, 2017

magnum: Adds some post-install tasks #838

Merged

vuntz mentioned this pull request Feb 22, 2017

neutron recipes on compute nodes should not look at attributes from neutron-server nodes sap-oc/crowbar-openstack#11

Open

5 tasks

vuntz added 2 commits March 3, 2017 10:25

rabbitmq: Use new data bag item config infrastructure

625c341

nova: Minor cleanup

b5fe60f

vuntz force-pushed the databagconfig branch from bc53167 to d998103 Compare March 3, 2017 12:16

houndci-bot reviewed Mar 3, 2017

View reviewed changes

vuntz added 3 commits March 3, 2017 13:17

openstack: Use new data bag item config infrastructure for insecure bit

ac527e4

All openstack services should provide this, and it happens quite a bit that other services only need this flag about another service. So it's a good candidate to start with.

cookbooks: Avoid searches just to see if a service is deployed

25ee4dc

We can check this out with the data bag config now.

horizon: Set insecure flag also with more openstack components

4a5e986

aodh, barbican, ceilometer, magnum, trove and sahara

vuntz force-pushed the databagconfig branch from d998103 to 4a5e986 Compare March 3, 2017 12:17

houndci-bot reviewed Mar 3, 2017

View reviewed changes

matelakat mentioned this pull request Mar 28, 2017

[backport] Start moving away from search queries to static config items for cookbooks sap-oc/crowbar-openstack#31

Open

dirkmueller removed this from the Cloud 7 Update1 milestone Mar 28, 2017

jsuchome added the needs backport to SOC7 (stable/4.0) label Jun 15, 2017

crowbar deleted a comment from houndci-bot Aug 3, 2017

dirkmueller closed this Aug 18, 2017

Itxaka mentioned this pull request Aug 18, 2017

Fix databag approach #1143

Merged

Start moving away from search queries to static config items for cookbooks #718

Start moving away from search queries to static config items for cookbooks #718

Conversation

vuntz commented Jan 4, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Itxaka commented Jan 5, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rsalevsky commented Mar 3, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vuntz commented Mar 3, 2017

Choose a reason for hiding this comment

dirkmueller commented Aug 18, 2017

vuntz commented Jan 4, 2017 •

edited

Loading