Merge "Remove reference to monolithic puppet-openstack"

.zuul.yaml

@@ -21,7 +21,6 @@
       - openstack/puppet-manila
       - openstack/puppet-neutron
       - openstack/puppet-nova
-      - openstack/puppet-openstack_extras
       - openstack/puppet-openstacklib
       - openstack/puppet-oslo
       - openstack/puppet-ovn

Puppetfile

@@ -54,10 +54,6 @@ mod 'nova',
   :git => 'https://github.com/openstack/puppet-nova',
   :ref => 'master'
 
-mod 'openstack_extras',
-  :git => 'https://github.com/openstack/puppet-openstack_extras',
-  :ref => 'master'
-
 mod 'openstacklib',
   :git => 'https://github.com/openstack/puppet-openstacklib',
   :ref => 'master'

packstack/plugins/puppet_950.py

@@ -149,11 +149,11 @@ def copy_puppet_modules(config, messages):
                            'firewall', 'glance', 'gnocchi', 'heat', 'horizon',
                            'inifile', 'ironic', 'keystone', 'magnum', 'manila',
                            'memcached', 'mysql', 'neutron', 'nova', 'nssdb',
-                           'openstack', 'openstacklib', 'oslo', 'ovn',
-                           'packstack', 'placement', 'rabbitmq', 'redis',
-                           'remote', 'rsync', 'sahara', 'ssh', 'stdlib',
-                           'swift', 'sysctl', 'systemd', 'tempest', 'trove',
-                           'vcsrepo', 'vswitch', 'xinetd'))
+                           'openstacklib', 'oslo', 'ovn', 'packstack',
+                           'placement', 'rabbitmq', 'redis', 'remote', 'rsync',
+                           'sahara', 'ssh', 'stdlib', 'swift', 'sysctl',
+                           'systemd', 'tempest', 'trove', 'vcsrepo', 'vswitch',
+                           'xinetd'))
 
     # write puppet manifest to disk
     manifestfiles.writeManifests()