From 17142ba33ae9cdf10bcc36a1329e97a5dfd7d7d6 Mon Sep 17 00:00:00 2001 From: Tao Liu Date: Wed, 21 Feb 2018 13:35:59 -0600 Subject: [PATCH 1/1] Add os region name option for system controller --- lib/puppet/provider/openstack.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/puppet/provider/openstack.rb b/lib/puppet/provider/openstack.rb index 8b8e564..53f2366 100644 --- a/lib/puppet/provider/openstack.rb +++ b/lib/puppet/provider/openstack.rb @@ -40,12 +40,23 @@ class Puppet::Provider::Openstack < Puppet::Provider self.class_variable_get("@@command_timeout") end + def self.hiera_lookup(key) + HieraPuppet.lookup(key, :undef, self, nil, :priority) + end + + def self.systemcontroller? + return true if hiera_lookup('platform::params::distributed_cloud_role') == 'systemcontroller' + end + # with command_timeout def self.openstack(*args) begin action = args[1] Timeout.timeout(command_timeout(action)) do args.unshift('--os-interface', 'internal') + if systemcontroller? + args.unshift('--os-region-name', 'SystemController') + end openstack_command *args end rescue Timeout::Error -- 1.8.3.1