Browse Source

Force qemu emulation in CI and add dmidecode command to logs

Some upstream infra is enabling nested virtualization but it's failing
randomly so let's force qemu virt_type.

We need it to debugs issues with jobs incorrectly detecting
virtualization time.

Change-Id: I1e53bbdcccb6402d343c98abf2696d452717d1a9
(cherry picked from commit c84e3b6e84)

Fix rabbitmq configuration

We can move to the commit hash for puppet-rabbitmq used in RDO queens, since
this is what we are testing in RDO. This requires a few changes:

- Update the URL used in the Puppetfile, and set the branch to 'master'.
- Remove old workarounds in amqp.pp
- Set loopback_users properly, based on what is requested by [1].

[1] - 0ada399b33

Also do below [Queens Only] changes to clear gate issues:-
- Install PyYAML==3.12 as latest version has issues
  with older setuptools(22.0.5).
- Install openstack modules from stable/queens rather
  than master.

Closes-Bug: #1839922
Change-Id: I9262836eb05a47bfe78ea0ac6d1c04199f29f527
(cherry picked from commit b1c78d696a)
tags/12.0.1
Alfredo Moralejo 1 month ago
parent
commit
d18775cdf5

+ 25
- 25
Puppetfile View File

@@ -4,95 +4,95 @@ moduledir '/usr/share/openstack-puppet/modules'
4 4
 
5 5
 mod 'aodh',
6 6
   :git => 'https://github.com/openstack/puppet-aodh',
7
-  :ref => 'master'
7
+  :ref => 'stable/queens'
8 8
 
9 9
 mod 'ceilometer',
10 10
   :git => 'https://github.com/openstack/puppet-ceilometer',
11
-  :ref => 'master'
11
+  :ref => 'stable/queens'
12 12
 
13 13
 mod 'cinder',
14 14
   :git => 'https://github.com/openstack/puppet-cinder',
15
-  :ref => 'master'
15
+  :ref => 'stable/queens'
16 16
 
17 17
 mod 'glance',
18 18
   :git => 'https://github.com/openstack/puppet-glance',
19
-  :ref => 'master'
19
+  :ref => 'stable/queens'
20 20
 
21 21
 mod 'gnocchi',
22 22
   :git => 'https://github.com/openstack/puppet-gnocchi',
23
-  :ref => 'master'
23
+  :ref => 'stable/queens'
24 24
 
25 25
 mod 'heat',
26 26
   :git => 'https://github.com/openstack/puppet-heat',
27
-  :ref => 'master'
27
+  :ref => 'stable/queens'
28 28
 
29 29
 mod 'magnum',
30 30
   :git => 'https://github.com/openstack/puppet-magnum',
31
-  :ref => 'master'
31
+  :ref => 'stable/queens'
32 32
 
33 33
 mod 'horizon',
34 34
   :git => 'https://github.com/openstack/puppet-horizon',
35
-  :ref => 'master'
35
+  :ref => 'stable/queens'
36 36
 
37 37
 mod 'ironic',
38 38
   :git => 'https://github.com/openstack/puppet-ironic',
39
-  :ref => 'master'
39
+  :ref => 'stable/queens'
40 40
 
41 41
 mod 'keystone',
42 42
   :git => 'https://github.com/openstack/puppet-keystone',
43
-  :ref => 'master'
43
+  :ref => 'stable/queens'
44 44
 
45 45
 mod 'manila',
46 46
   :git => 'https://github.com/openstack/puppet-manila',
47
-  :ref => 'master'
47
+  :ref => 'stable/queens'
48 48
 
49 49
 mod 'neutron',
50 50
   :git => 'https://github.com/openstack/puppet-neutron',
51
-  :ref => 'master'
51
+  :ref => 'stable/queens'
52 52
 
53 53
 mod 'nova',
54 54
   :git => 'https://github.com/openstack/puppet-nova',
55
-  :ref => 'master'
55
+  :ref => 'stable/queens'
56 56
 
57 57
 mod 'openstack_extras',
58 58
   :git => 'https://github.com/openstack/puppet-openstack_extras',
59
-  :ref => 'master'
59
+  :ref => 'stable/queens'
60 60
 
61 61
 mod 'openstacklib',
62 62
   :git => 'https://github.com/openstack/puppet-openstacklib',
63
-  :ref => 'master'
63
+  :ref => 'stable/queens'
64 64
 
65 65
 mod 'oslo',
66 66
   :git => 'https://github.com/openstack/puppet-oslo',
67
-  :ref => 'master'
67
+  :ref => 'stable/queens'
68 68
 
69 69
 mod 'ovn',
70 70
   :git => 'https://github.com/openstack/puppet-ovn',
71
-  :ref => 'master'
71
+  :ref => 'stable/queens'
72 72
 
73 73
 mod 'panko',
74 74
   :git => 'https://github.com/openstack/puppet-panko',
75
-  :ref => 'master'
75
+  :ref => 'stable/queens'
76 76
 
77 77
 mod 'sahara',
78 78
   :git => 'https://github.com/openstack/puppet-sahara',
79
-  :ref => 'master'
79
+  :ref => 'stable/queens'
80 80
 
81 81
 mod 'swift',
82 82
   :git => 'https://github.com/openstack/puppet-swift',
83
-  :ref => 'master'
83
+  :ref => 'stable/queens'
84 84
 
85 85
 mod 'tempest',
86 86
   :git => 'https://github.com/openstack/puppet-tempest',
87
-  :ref => 'master'
87
+  :ref => 'stable/queens'
88 88
 
89 89
 mod 'trove',
90 90
   :git => 'https://github.com/openstack/puppet-trove',
91
-  :ref => 'master'
91
+  :ref => 'stable/queens'
92 92
 
93 93
 mod 'vswitch',
94 94
   :git => 'https://github.com/openstack/puppet-vswitch',
95
-  :ref => 'master'
95
+  :ref => 'stable/queens'
96 96
 
97 97
 ## Non-OpenStack modules
98 98
 
@@ -129,8 +129,8 @@ mod 'nssdb',
129 129
   :ref => 'master'
130 130
 
131 131
 mod 'rabbitmq',
132
-  :git => 'https://github.com/puppetlabs/puppetlabs-rabbitmq',
133
-  :ref => '5.6.0'
132
+  :git => 'https://github.com/voxpupuli/puppet-rabbitmq',
133
+  :ref => '7613f08657d6640b22ec0f4cb55cf5b3c2f2e397'
134 134
 
135 135
 mod 'redis',
136 136
   :git => 'https://github.com/arioch/puppet-redis',

+ 2
- 11
packstack/puppet/modules/packstack/manifests/amqp.pp View File

@@ -28,11 +28,11 @@ define enable_rabbitmq {
28 28
       package_provider         => 'yum',
29 29
       repos_ensure             => false,
30 30
       admin_enable             => false,
31
+      loopback_users           => [],
31 32
       # FIXME: it's ugly to not to require client certs
32 33
       ssl_fail_if_no_peer_cert => true,
33 34
       config_variables         => {
34 35
      'tcp_listen_options' => '[binary,{packet, raw},{reuseaddr, true},{backlog, 128},{nodelay, true},{exit_on_close, false},{keepalive, true}]',
35
-     'loopback_users'     => '[]',
36 36
       },
37 37
     }
38 38
   } else {
@@ -44,21 +44,12 @@ define enable_rabbitmq {
44 44
       package_provider => 'yum',
45 45
       repos_ensure     => false,
46 46
       admin_enable     => false,
47
+      loopback_users   => [],
47 48
       config_variables => {
48 49
      'tcp_listen_options' => '[binary,{packet, raw},{reuseaddr, true},{backlog, 128},{nodelay, true},{exit_on_close, false},{keepalive, true}]',
49
-     'loopback_users'     => '[]',
50 50
       },
51 51
     }
52 52
   }
53
-
54
-  # TO-DO: remove this workaround as soon as this is fixed in puppetlabs-rabbitmq module
55
-  #        https://github.com/puppetlabs/puppetlabs-rabbitmq/pull/454
56
-  File <| path == '/etc/rabbitmq/rabbitmq.config' |> {
57
-    ensure  => present,
58
-    owner   => 'rabbitmq',
59
-    group   => 'rabbitmq',
60
-    mode    => '0640',
61
-  }
62 53
 }
63 54
 
64 55
 class packstack::amqp ()

+ 2
- 0
run_tests.sh View File

@@ -240,6 +240,8 @@ fi
240 240
 if [ "${INSTALL_FROM_SOURCE}" = true ]; then
241 241
   # pycparser 2.19 seems to have trouble with older setuptools versions
242 242
   $SUDO pip install pycparser==2.18
243
+  # PyYAML > 5 has some issue with setuptools queens version(22.0.5), try installing stable version
244
+  $SUDO pip install PyYAML==3.12
243 245
   $SUDO pip install .
244 246
   export GEM_BIN_DIR=/tmp/packstackgems/bin/
245 247
   export PUPPETFILE_DIR=/usr/share/openstack-puppet/modules

+ 1
- 0
tests/scenario001.sh View File

@@ -36,6 +36,7 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
36 36
           --os-horizon-ssl=y \
37 37
           --amqp-enable-ssl=y \
38 38
           --glance-backend=file \
39
+          --nova-libvirt-virt-type=qemu \
39 40
           --provision-uec-kernel-url="/tmp/cirros/cirros-0.3.5-x86_64-vmlinuz" \
40 41
           --provision-uec-ramdisk-url="/tmp/cirros/cirros-0.3.5-x86_64-initrd" \
41 42
           --provision-uec-disk-url="/tmp/cirros/cirros-0.3.5-x86_64-disk.img" \

+ 1
- 0
tests/scenario002.sh View File

@@ -41,6 +41,7 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
41 41
           --os-sahara-install=y \
42 42
           --os-trove-install=y \
43 43
           --keystone-token-format=UUID \
44
+          --nova-libvirt-virt-type=qemu \
44 45
           --provision-uec-kernel-url="/tmp/cirros/cirros-0.3.5-x86_64-vmlinuz" \
45 46
           --provision-uec-ramdisk-url="/tmp/cirros/cirros-0.3.5-x86_64-initrd" \
46 47
           --provision-uec-disk-url="/tmp/cirros/cirros-0.3.5-x86_64-disk.img" \

+ 1
- 0
tests/scenario003.sh View File

@@ -39,6 +39,7 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
39 39
           --os-heat-install=y \
40 40
           --os-magnum-install=y \
41 41
           --os-panko-install=y \
42
+          --nova-libvirt-virt-type=qemu \
42 43
           --provision-uec-kernel-url="/tmp/cirros/cirros-0.3.5-x86_64-vmlinuz" \
43 44
           --provision-uec-ramdisk-url="/tmp/cirros/cirros-0.3.5-x86_64-initrd" \
44 45
           --provision-uec-disk-url="/tmp/cirros/cirros-0.3.5-x86_64-disk.img" \

+ 1
- 0
tools/copy-logs.sh View File

@@ -52,6 +52,7 @@ function get_diag_commands {
52 52
         'rpm -qa'
53 53
         'journalctl --no-pager'
54 54
         'ulimit -n'
55
+        'dmidecode'
55 56
     )
56 57
 
57 58
     echo "Installing required RPM packages..."

Loading…
Cancel
Save