Skip to content

Commit 1f005fe

Browse files
committed
(CONT-914) - Opt for facts over fetch_ip
1 parent 3b4bd0e commit 1f005fe

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

spec/acceptance/kubernetes_spec.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,14 @@
99
context 'it should install the module and run' do
1010
before(:all) { change_target_host('controller') }
1111
after(:all) { reset_target_host }
12-
# fetch_ip_hostname_by_role returns an array of 3 elements [hostname, ipaddress, internal_ipaddress]
13-
int_ipaddr1 = fetch_ip_hostname_by_role('controller')[2]
1412

1513
pp = <<-MANIFEST
1614
case $facts['os']['family'] {
1715
'RedHat', 'CentOS': {
1816
class {'kubernetes':
1917
kubernetes_version => '1.22.0',
2018
kubernetes_package_version => '1.22.0',
21-
controller_address => "#{int_ipaddr1}:6443",
19+
controller_address => "$facts['networking'][ip']:6443",
2220
container_runtime => 'docker',
2321
manage_docker => false,
2422
controller => true,

spec/spec_helper_acceptance_local.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ def configure_puppet_server(controller, worker1, worker2)
7575
puppet_cert_sign
7676
# Create site.pp
7777
site_pp = <<-EOS
78-
node /#{controller[0]}/ {
78+
node /#{controller}/ {
7979
class {'kubernetes':
8080
kubernetes_version => '1.20.6',
8181
kubernetes_package_version => '1.20.6',
82-
controller_address => "#{controller[1]}:6443",
82+
controller_address => "$facts['networking'][ip']:6443",
8383
container_runtime => 'docker',
8484
manage_docker => false,
8585
controller => true,
@@ -145,7 +145,7 @@ def execute_agent(role)
145145
ENV['TARGET_HOST'] = target_roles(node)[0][:name]
146146
run_shell("echo #{int_ipaddr1} puppet >> /etc/hosts")
147147
}
148-
configure_puppet_server([hostname1, int_ipaddr1], hostname2, hostname3)
148+
configure_puppet_server(hostname1, hostname2, hostname3)
149149
else
150150
c.filter_run_excluding :integration
151151
end

0 commit comments

Comments
 (0)