diff --git a/elements/overcloud-contrail-controller/README.md b/elements/overcloud-contrail-controller/README.md deleted file mode 100644 index b8f2e7db..00000000 --- a/elements/overcloud-contrail-controller/README.md +++ /dev/null @@ -1 +0,0 @@ -Install all packages required for the overcloud contrail controller role. diff --git a/elements/overcloud-contrail-controller/element-deps b/elements/overcloud-contrail-controller/element-deps deleted file mode 100644 index cf3a5cda..00000000 --- a/elements/overcloud-contrail-controller/element-deps +++ /dev/null @@ -1,3 +0,0 @@ -package-installs -pkg-map -overcloud-base diff --git a/elements/overcloud-contrail-controller/install.d/package-installs-overcloud-contrail-controller b/elements/overcloud-contrail-controller/install.d/package-installs-overcloud-contrail-controller deleted file mode 100644 index 453ce891..00000000 --- a/elements/overcloud-contrail-controller/install.d/package-installs-overcloud-contrail-controller +++ /dev/null @@ -1,5 +0,0 @@ -contrail_analytics_package -contrail_config_package -contrail_control_package -contrail_database_package -contrail_webui_package diff --git a/elements/overcloud-contrail-controller/pkg-map b/elements/overcloud-contrail-controller/pkg-map deleted file mode 100644 index 38b02ff5..00000000 --- a/elements/overcloud-contrail-controller/pkg-map +++ /dev/null @@ -1,9 +0,0 @@ -{ - "default": { - "contrail_analytics_package": "contrail-openstack-analytics", - "contrail_config_package": "contrail-openstack-config", - "contrail_control_package": "contrail-openstack-control", - "contrail_database_package": "contrail-openstack-database", - "contrail_webui_package": "contrail-openstack-webui" - } -} diff --git a/elements/puppet-modules/environment.d/02-puppet-modules-install-types.sh b/elements/puppet-modules/environment.d/02-puppet-modules-install-types.sh index 26b66787..855e7039 100644 --- a/elements/puppet-modules/environment.d/02-puppet-modules-install-types.sh +++ b/elements/puppet-modules/environment.d/02-puppet-modules-install-types.sh @@ -7,15 +7,12 @@ if [ "$DIB_INSTALLTYPE_puppet_modules" = "source" ]; then puppet-aodh \ puppet-auditd \ puppet-barbican \ - puppet-cassandra \ puppet-ceilometer \ puppet-gnocchi \ puppet-cinder \ puppet-common \ - puppet-contrail \ puppetlabs-concat \ puppet-datacat \ - puppet-elasticsearch \ puppetlabs-firewall \ puppet-galera \ puppetlabs-git \ @@ -25,9 +22,7 @@ if [ "$DIB_INSTALLTYPE_puppet_modules" = "source" ]; then puppet-healthcheck \ puppet-horizon \ puppetlabs-inifile \ - puppet-kafka \ puppet-keystone \ - puppet-kibana3 \ puppet-memcached \ puppetlabs-mysql \ puppet-neutron \ @@ -50,7 +45,6 @@ if [ "$DIB_INSTALLTYPE_puppet_modules" = "source" ]; then puppetlabs-sysctl \ puppet-vswitch \ puppetlabs-xinetd \ - puppet-zookeeper \ puppet-openstacklib \ puppet-snmp \ puppet-tripleo \ diff --git a/elements/puppet-modules/source-repository-puppet-modules b/elements/puppet-modules/source-repository-puppet-modules index 52c3a043..2b3500d0 100644 --- a/elements/puppet-modules/source-repository-puppet-modules +++ b/elements/puppet-modules/source-repository-puppet-modules @@ -2,12 +2,10 @@ puppetlabs-apache git /opt/stack/puppet-modules/apache https://github.com/puppet puppet-aodh git /opt/stack/puppet-modules/aodh https://opendev.org/openstack/puppet-aodh.git puppet-auditd git /opt/stack/puppet-modules/auditd https://github.com/kemra102/puppet-auditd.git puppet-barbican git /opt/stack/puppet-modules/barbican https://opendev.org/openstack/puppet-barbican.git -puppet-cassandra git /opt/stack/puppet-modules/cassandra https://github.com/locp/cassandra.git puppet-ceilometer git /opt/stack/puppet-modules/ceilometer https://opendev.org/openstack/puppet-ceilometer.git puppet-gnocchi git /opt/stack/puppet-modules/gnocchi https://opendev.org/openstack/puppet-gnocchi.git puppet-cinder git /opt/stack/puppet-modules/cinder https://opendev.org/openstack/puppet-cinder.git puppet-common git /opt/stack/puppet-modules/common https://github.com/purpleidea/puppet-common.git -puppet-contrail git /opt/stack/puppet-modules/contrail https://github.com/Juniper/puppet-contrail.git puppetlabs-concat git /opt/stack/puppet-modules/concat https://github.com/puppetlabs/puppetlabs-concat.git puppetlabs-firewall git /opt/stack/puppet-modules/firewall https://github.com/puppetlabs/puppetlabs-firewall.git puppet-glance git /opt/stack/puppet-modules/glance https://opendev.org/openstack/puppet-glance.git @@ -17,7 +15,6 @@ puppet-heat git /opt/stack/puppet-modules/heat https://opendev.org/openstack/pup puppet-healthcheck git /opt/stack/puppet-modules/healthcheck https://github.com/puppet-community/puppet-healthcheck.git puppet-horizon git /opt/stack/puppet-modules/horizon https://opendev.org/openstack/puppet-horizon.git puppetlabs-inifile git /opt/stack/puppet-modules/inifile https://github.com/puppetlabs/puppetlabs-inifile.git -puppet-kafka git /opt/stack/puppet-modules/kafka https://github.com/puppet-community/puppet-kafka.git puppet-keystone git /opt/stack/puppet-modules/keystone https://opendev.org/openstack/puppet-keystone.git puppet-manila git /opt/stack/puppet-modules/manila https://opendev.org/openstack/puppet-manila.git puppet-memcached git /opt/stack/puppet-modules/memcached https://github.com/saz/puppet-memcached.git @@ -41,7 +38,6 @@ puppetlabs-sysctl git /opt/stack/puppet-modules/sysctl https://github.com/puppet puppet-vlan git /opt/stack/puppet-modules/vlan https://github.com/derekhiggins/puppet-vlan.git puppet-vswitch git /opt/stack/puppet-modules/vswitch https://opendev.org/openstack/puppet-vswitch.git puppetlabs-xinetd git /opt/stack/puppet-modules/xinetd https://github.com/puppetlabs/puppetlabs-xinetd.git -puppet-zookeeper git /opt/stack/puppet-modules/zookeeper https://github.com/miguno/puppet-zookeeper.git puppet-openstacklib git /opt/stack/puppet-modules/openstacklib https://opendev.org/openstack/puppet-openstacklib.git puppet-snmp git /opt/stack/puppet-modules/snmp https://github.com/razorsedge/puppet-snmp.git puppet-tripleo git /opt/stack/puppet-modules/tripleo https://opendev.org/openstack/puppet-tripleo.git @@ -51,8 +47,6 @@ puppetlabs-corosync git /opt/stack/puppet-modules/corosync https://github.com/pu puppet-pacemaker git /opt/stack/puppet-modules/pacemaker https://opendev.org/openstack/puppet-pacemaker.git puppet_aviator git /opt/stack/puppet-modules/aviator https://github.com/aimonb/puppet_aviator.git puppet-openstack_extras git /opt/stack/puppet-modules/openstack_extras https://opendev.org/openstack/puppet-openstack_extras.git -puppet-elasticsearch git /opt/stack/puppet-modules/elasticsearch https://github.com/elastic/puppet-elasticsearch.git -puppet-kibana3 git /opt/stack/puppet-modules/kibana3 https://github.com/thejandroman/puppet-kibana3.git puppetlabs-git git /opt/stack/puppet-modules/git https://github.com/puppetlabs/puppetlabs-git.git puppet-datacat git /opt/stack/puppet-modules/datacat https://github.com/richardc/puppet-datacat.git puppet-qdr git /opt/stack/puppet-modules/qdr https://opendev.org/openstack/puppet-qdr.git