From c653eaee1c4091701e8da0f2c6f193e7126d8c49 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Wed, 29 Mar 2017 15:12:11 +0100 Subject: [PATCH] Remove unused elements Most elements in this repo are old, untested and no longer used, so remove all those we're not using (as proven via CI). I think there are some remaining things we build into the images but no longer need, but those can be handled via follow-up patches. Change-Id: I221c5a3f82a2500c90646fc69439a210cf64e5e1 --- elements/ansible/README.md | 12 - .../cleanup.d/50-remove-source-ansible | 5 - elements/ansible/element-deps | 1 - .../environment.d/10-ansible-venv-dir.bash | 4 - .../30-ansible-package | 4 - .../ansible-source-install/30-ansible-source | 37 - elements/apache2/README.md | 13 - elements/apache2/element-deps | 4 - elements/apache2/install.d/15-apache2 | 8 - .../install.d/package-installs-apache2 | 1 - .../etc/ssl/certs/ssl-cert-snakeoil.pem | 1 - .../etc/ssl/private/ssl-cert-snakeoil.key | 1 - .../post-configure.d/13-apache2 | 41 -- elements/apache2/post-install.d/15-apache2 | 4 - elements/apache2/svc-map | 3 - elements/bandersnatch/README.md | 8 - elements/bandersnatch/element-deps | 5 - .../bandersnatch/install.d/76-bandersnatch | 31 - .../post-configure.d/50-bandersnatch | 7 - elements/bm-dnsmasq/README.md | 12 - elements/bm-dnsmasq/bin/filter-bootps | 31 - elements/bm-dnsmasq/element-deps | 4 - .../install.d/75-filter-bootps-cronjob | 13 - elements/bm-dnsmasq/install.d/81-bm-dnsmasq | 62 -- .../install.d/package-installs-bm-dnsmasq | 2 - .../post-configure.d/80-bm-dnsmasq | 4 - elements/boot-stack/README.md | 59 -- elements/boot-stack/bin/boot-stack-logs | 30 - elements/boot-stack/bin/reset-db | 57 -- elements/boot-stack/element-deps | 15 - elements/boot-stack/install.d/01-boot-stack | 25 - .../install.d/package-installs-boot-stack | 4 - .../boot-stack/os-apply-config/root/stackrc | 7 - .../os-apply-config/root/stackrc.oac | 1 - .../configure.d/53-init-openstack | 15 - .../pre-configure.d/97-fedora-iptables | 7 - elements/ceilometer-agent-central/README.md | 1 - .../ceilometer-agent-central/element-deps | 7 - .../package-installs-ceilometer-agent-central | 1 - .../69-ceilometer-agent-central | 4 - .../69-ceilometer-agent-central | 6 - elements/ceilometer-agent-central/pkg-map | 5 - elements/ceilometer-agent-central/svc-map | 3 - elements/ceilometer-agent-compute/README.md | 8 - .../ceilometer-agent-compute/element-deps | 5 - .../package-installs-ceilometer-agent-compute | 1 - .../69-ceilometer-agent-compute | 6 - .../package-installs-ceilometer-agent-compute | 1 - .../69-ceilometer-agent-compute | 7 - elements/ceilometer-agent-compute/pkg-map | 5 - elements/ceilometer-agent-compute/svc-map | 3 - .../ceilometer-agent-notification/README.md | 1 - .../element-deps | 5 - ...age-installs-ceilometer-agent-notification | 1 - .../69-ceilometer-agent-notification | 4 - .../69-ceilometer-agent-notification | 6 - .../ceilometer-agent-notification/pkg-map | 5 - .../ceilometer-agent-notification/svc-map | 3 - elements/ceilometer-alarm-evaluator/README.md | 1 - .../ceilometer-alarm-evaluator/element-deps | 5 - ...ackage-installs-ceilometer-alarm-evaluator | 1 - .../69-ceilometer-alarm-evaluator | 4 - .../69-ceilometer-alarm-evaluator | 6 - elements/ceilometer-alarm-evaluator/pkg-map | 5 - elements/ceilometer-alarm-evaluator/svc-map | 3 - elements/ceilometer-alarm-notifier/README.md | 1 - .../ceilometer-alarm-notifier/element-deps | 6 - ...package-installs-ceilometer-alarm-notifier | 1 - .../69-ceilometer-alarm-notifier | 4 - .../69-ceilometer-alarm-notifier | 6 - elements/ceilometer-alarm-notifier/pkg-map | 5 - elements/ceilometer-alarm-notifier/svc-map | 3 - elements/ceilometer-api/README.md | 1 - elements/ceilometer-api/element-deps | 7 - .../package-installs-ceilometer-api | 1 - .../69-ceilometer-api | 4 - .../configure.d/90-ceilometer-db-sync | 6 - .../post-configure.d/69-ceilometer-api | 10 - .../97-fedora-ceilometer-api-iptables | 5 - elements/ceilometer-api/pkg-map | 5 - elements/ceilometer-api/svc-map | 3 - elements/ceilometer-collector/README.md | 1 - elements/ceilometer-collector/element-deps | 5 - .../package-installs-ceilometer-collector | 1 - .../69-ceilometer-collector | 4 - .../post-configure.d/69-ceilometer-collector | 6 - elements/ceilometer-collector/pkg-map | 5 - elements/ceilometer-collector/svc-map | 3 - .../ceilometer-overcloud-config/README.md | 2 - .../ceilometer-overcloud-config/element-deps | 2 - .../etc/ceilometer/pipeline.yaml | 78 -- .../ceilometer-undercloud-config/README.md | 2 - .../ceilometer-undercloud-config/element-deps | 2 - .../etc/ceilometer/pipeline.yaml | 38 - elements/ceilometer/README.md | 10 - .../cleanup.d/50-remove-source-ceilometer | 5 - elements/ceilometer/element-deps | 6 - .../environment.d/10-ceilometer-venv-dir.bash | 6 - .../package-installs-ceilometer | 1 - .../ceilometer-source-install/68-ceilometer | 19 - .../install.d/package-installs-ceilometer | 2 - .../etc/ceilometer/ceilometer.conf | 111 --- elements/ceilometer/pkg-map | 5 - .../ceilometer/source-repository-ceilometer | 1 - elements/check_mk-agent/README.md | 52 -- elements/check_mk-agent/element-deps | 4 - .../install.d/05-check_mk-agent | 11 - .../install.d/99-check_mk_local_checks | 23 - .../install.d/package-installs-check_mk-agent | 3 - .../97-check-mk-agent-iptables | 8 - elements/check_mk-agent/svc-map | 2 - elements/cinder-api/README.md | 1 - elements/cinder-api/element-deps | 6 - .../cinder-source-install/73-cinder-api | 7 - .../configure.d/90-cinder-db-sync | 6 - .../post-configure.d/73-cinder-api | 7 - .../pre-configure.d/97-cinder-api-iptables | 4 - elements/cinder-api/svc-map | 6 - elements/cinder-lio/README.md | 4 - elements/cinder-lio/element-deps | 2 - .../cinder-source-install/73-cinder-rtstool | 5 - .../install.d/package-installs-cinder-lio | 1 - elements/cinder-tgt/README.md | 4 - elements/cinder-tgt/element-deps | 2 - elements/cinder-tgt/install.d/72-cinder-tgt | 6 - .../install.d/package-installs-cinder-tgt | 1 - .../post-configure.d/74-cinder-tgt | 5 - elements/cinder-tgt/svc-map | 4 - elements/cinder-volume-nfs/README.md | 14 - elements/cinder-volume-nfs/element-deps | 3 - .../os-apply-config/etc/cinder/nfs_shares.txt | 3 - .../post-configure.d/70-cinder-nfs-dir | 5 - elements/cinder-volume/README.md | 1 - elements/cinder-volume/element-deps | 5 - .../cinder-source-install/74-cinder-volume | 14 - .../post-configure.d/70-cinder-conversion-dir | 6 - .../72-cinder-resize-volume-groups | 32 - .../post-configure.d/74-cinder-volume | 16 - .../pre-configure.d/97-cinder-volume-iptables | 4 - elements/cinder-volume/pkg-map | 16 - elements/cinder-volume/svc-map | 3 - elements/cinder/README.md | 15 - .../cinder/cleanup.d/50-remove-source-cinder | 5 - elements/cinder/element-deps | 7 - .../environment.d/10-cinder-venv-dir.bash | 6 - elements/cinder/install.d/73-cinder | 7 - .../cinder-package-install/72-cinder | 9 - .../install.d/cinder-source-install/72-cinder | 18 - .../os-apply-config/etc/cinder/cinder.conf | 104 --- .../os-apply-config/etc/cinder/rootwrap.conf | 30 - .../00-cinder-disable-requiretty | 8 - elements/cinder/source-repository-cinder | 1 - elements/collectl/README.md | 5 - elements/collectl/element-deps | 2 - elements/collectl/install.d/85-collectl | 16 - elements/collectl/svc-map | 2 - elements/common-venv/README.md | 1 - .../environment.d/01-common-venv-dir.bash | 6 - elements/contrail-repo/README.md | 6 - elements/contrail-repo/element-deps | 2 - .../post-install.d/10-contrail-setup | 5 - .../pre-install.d/10-contrail-repo | 12 - elements/corosync/README.md | 15 - elements/corosync/element-deps | 4 - .../install.d/package-installs-corosync | 1 - .../etc/corosync/corosync.conf | 45 -- .../os-apply-config/etc/default/corosync | 1 - .../post-configure.d/14-corosync | 6 - elements/corosync/svc-map | 2 - elements/debian-mirror/README.md | 20 - elements/debian-mirror/element-deps | 1 - elements/debian-mirror/install.d/82-debmirror | 7 - .../os-apply-config/etc/apt/mirror.list | 17 - elements/delorean-repo/README.md | 18 - elements/delorean-repo/element-deps | 1 - elements/delorean-repo/pkg-map | 5 - .../pre-install.d/01-delorean-clean-metadata | 5 - .../pre-install.d/01-delorean-repo | 25 - .../pre-install.d/03-install-yum-priorities | 5 - elements/devstack/README.md | 5 - elements/devstack/block-device-size.d/10-size | 8 - elements/devstack/element-deps | 2 - .../devstack/install.d/52-image-toolchain | 14 - elements/devstack/install.d/53-devstack | 12 - elements/devstack/install.d/97-haveged | 7 - .../devstack/install.d/98-baremetal-network | 26 - elements/devstack/install.d/99-ssh | 8 - elements/devstack/source-repository-devstack | 1 - elements/devstack/source-repository-incubator | 1 - elements/disable-os-collect-config/README.md | 7 - .../15-disable-os-collect-config | 11 - elements/diskimage-builder/README.md | 5 - elements/diskimage-builder/element-deps | 2 - .../install.d/55-diskimage-builder | 7 - .../source-repository-diskimage-builder | 1 - elements/geard/README.md | 4 - elements/geard/element-deps | 2 - elements/geard/install.d/44-geard | 11 - .../pre-configure.d/97-gearman-iptables | 30 - elements/geard/svc-map | 3 - elements/glance/README.md | 39 - .../glance/cleanup.d/50-remove-source-glance | 5 - elements/glance/element-deps | 7 - .../environment.d/10-glance-venv-dir.bash | 6 - .../glance-package-install/75-glance | 11 - .../install.d/glance-source-install/75-glance | 18 - .../etc/glance/glance-api.conf | 177 ----- .../etc/glance/glance-cache.conf | 58 -- .../etc/glance/glance-registry.conf | 74 -- .../etc/glance/glance-scrubber.conf | 60 -- .../configure.d/10-glance-state | 6 - .../configure.d/20-glance-selinux | 10 - .../configure.d/90-glance-db-sync | 6 - .../post-configure.d/75-glance | 8 - .../pre-configure.d/97-glance-fedora-iptables | 5 - elements/glance/source-repository-glance | 1 - elements/glance/svc-map | 7 - elements/haproxy/README.md | 132 ---- elements/haproxy/element-deps | 3 - elements/haproxy/install.d/76-haproxy | 11 - .../install.d/package-installs-haproxy | 1 - .../os-apply-config/etc/haproxy/haproxy.cfg | 84 --- .../configure.d/20-haproxy-nonlocal-bind | 6 - .../configure.d/20-haproxy-selinux | 9 - .../os-refresh-config/configure.d/21-haproxy | 11 - .../pre-configure.d/98-haproxy-iptables | 41 -- elements/haproxy/svc-map | 2 - elements/heat-api/README.md | 25 - elements/heat-api/element-deps | 3 - .../heat-package-install/10-heat-api | 9 - .../install.d/heat-source-install/10-heat-api | 9 - .../post-configure.d/79-heat-api | 11 - .../97-heat-api-fedora-iptables | 6 - elements/heat-api/svc-map | 9 - elements/heat-cfntools/README.md | 3 - elements/heat-cfntools/element-deps | 2 - .../heat-cfntools/install.d/05-heat-cfntools | 31 - elements/heat-cfntools/install.d/10-ec2-user | 41 -- .../install.d/package-installs-heat-cfntools | 3 - elements/heat-engine/README.md | 20 - elements/heat-engine/element-deps | 4 - .../heat-engine/install.d/20-heat-crontab | 11 - .../package-installs-heat-engine | 1 - .../heat-source-install/10-heat-engine | 10 - .../package-installs-heat-engine | 1 - .../configure.d/90-heat-db-sync | 7 - .../post-configure.d/79-heat-engine | 8 - elements/heat-engine/svc-map | 3 - elements/heat/README.md | 16 - elements/heat/cleanup.d/50-remove-source-heat | 5 - elements/heat/element-deps | 5 - .../heat/environment.d/10-heat-venv-dir.bash | 6 - .../install.d/heat-package-install/05-heat | 7 - .../install.d/heat-source-install/05-heat | 13 - .../heat/os-apply-config/etc/heat/heat.conf | 695 ------------------ elements/heat/source-repository-heat | 1 - elements/horizon/README.md | 15 - .../cleanup.d/50-remove-source-horizon | 5 - elements/horizon/element-deps | 7 - .../environment.d/10-horizon-venv-dir.bash | 6 - .../files/etc/httpd/conf.d/horizon.conf | 40 - .../horizon/files/etc/httpd/conf.d/ports.conf | 12 - .../horizon-package-install/100-horizon | 12 - .../horizon-source-install/100-horizon | 58 -- .../etc/horizon/.secret_key_store | 1 - .../etc/horizon/local_settings.py | 96 --- .../configure.d/20-horizon-selinux | 10 - .../configure.d/25-horizon-fedora-iptables | 5 - .../post-configure.d/14-horizon | 34 - elements/horizon/source-repository-horizon | 1 - elements/hosts/README.md | 5 - elements/hosts/element-deps | 2 - .../os-refresh-config/configure.d/51-hosts | 51 -- elements/hosts/package-installs.yaml | 1 - elements/hosts/pkg-map | 7 - elements/icinga-core/README.md | 2 - elements/icinga-core/install.d/05-icinga-core | 12 - elements/icinga-web/README.md | 2 - elements/icinga-web/install.d/06-icinga-web | 9 - elements/ironic-api/README.md | 1 - elements/ironic-api/element-deps | 7 - .../package-installs-ironic-api | 1 - .../ironic-source-install/68-ironic-api | 4 - .../configure.d/90-ironic-db-sync | 7 - .../post-configure.d/68-ironic-api | 7 - .../97-fedora-ironic-api-iptables | 5 - elements/ironic-api/pkg-map | 5 - elements/ironic-api/svc-map | 3 - elements/ironic-conductor/README.md | 1 - elements/ironic-conductor/element-deps | 6 - .../install.d/69-ironic-tftp-support | 61 -- .../package-installs-ironic-conductor | 1 - .../ironic-source-install/68-ironic-conductor | 9 - .../state/var/lib/ironic/virtual-power-key | 1 - .../post-configure.d/68-ironic-conductor | 22 - .../ironic-conductor/package-installs.yaml | 5 - elements/ironic-conductor/pkg-map | 5 - elements/ironic-conductor/svc-map | 3 - elements/ironic/README.md | 16 - elements/ironic/cleanup.d/50-remove-ironic | 5 - elements/ironic/element-deps | 8 - .../environment.d/10-ironic-venv-dir.bash | 6 - .../package-installs-ironic | 1 - .../install.d/ironic-source-install/68-ironic | 18 - .../ironic/install.d/package-installs-ironic | 2 - .../os-apply-config/etc/ironic/ironic.conf | 63 -- elements/ironic/pkg-map | 5 - .../00-ironic-disable-requiretty | 8 - elements/ironic/source-repository-ironic | 1 - elements/jenkins/README.md | 25 - elements/jenkins/install.d/10-jenkins | 10 - elements/jenkins/install.d/11-jenkins-plugins | 13 - elements/jenkins/install.d/defaults | 5 - elements/jenkins/pre-install.d/10-jenkins | 8 - elements/keepalived/README.md | 50 -- .../keepalived/bin/keepalived_vip_change.sh | 30 - elements/keepalived/element-deps | 2 - elements/keepalived/files/keepalived.crontab | 1 - elements/keepalived/install.d/76-keepalived | 12 - .../keepalived/install.d/78-keepalived-reload | 7 - .../install.d/package-installs-keepalived | 2 - .../os-apply-config/etc/default/keepalived | 4 - .../etc/keepalived/keepalived.conf | 63 -- .../etc/keepalived/virtual_ips | 3 - .../etc/logrotate.d/keepalived | 10 - .../configure.d/20-keepalived-selinux | 12 - .../configure.d/22-keepalived | 17 - elements/keepalived/svc-map | 3 - elements/keystone/README.md | 90 --- elements/keystone/cleanup-keystone-tokens.sh | 30 - .../cleanup.d/50-remove-source-keystone | 5 - elements/keystone/element-deps | 8 - .../environment.d/10-keystone-venv-dir.bash | 6 - .../keystone-package-install/05-keystone | 15 - .../package-installs-keystone | 2 - .../keystone-source-install/05-keystone | 9 - .../keystone-source-install/70-keystone | 36 - elements/keystone/keystone.crontab | 2 - .../etc/keystone/domains/keystone.ldap.conf | 14 - .../etc/keystone/keystone.conf | 76 -- .../mnt/state/etc/keystone/ssl/certs/ca.pem | 1 - .../etc/keystone/ssl/certs/signing_cert.pem | 1 - .../etc/keystone/ssl/private/signing_key.pem | 1 - .../configure.d/10-keystone-state | 13 - .../configure.d/20-keystone-selinux | 10 - .../configure.d/90-keystone-db-sync | 7 - .../post-configure.d/70-keystone | 7 - .../97-keystone-fedora-iptables | 6 - elements/keystone/pkg-map | 24 - elements/keystone/source-repository-keystone | 1 - elements/keystone/svc-map | 4 - elements/mariadb-common/README.md | 2 - elements/mariadb-common/element-deps | 2 - elements/mariadb-common/install.d/11-mariadb | 41 -- .../pre-configure.d/50-mariadb-socket | 11 - elements/mariadb-dev-rpm/README.md | 4 - elements/mariadb-dev-rpm/element-provides | 1 - .../package-installs-mariadb-dev-rpm | 1 - elements/mariadb-dev/README.md | 4 - elements/mariadb-dev/element-provides | 1 - elements/mariadb-dev/environment.d/20-mariadb | 10 - elements/mariadb-dev/install.d/03-mariadb-dev | 10 - .../install.d/package-installs-mariadb-dev | 1 - .../pre-install.d/05-mysql-mariadb-repo | 45 -- elements/mariadb-rpm/README.md | 4 - elements/mariadb-rpm/element-deps | 3 - elements/mariadb-rpm/element-provides | 1 - .../install.d/10-mariadb-rpm-packages | 8 - .../configure.d/52-mariadb-rpm-init | 37 - elements/mariadb-rpm/pkg-map | 8 - elements/mariadb/README.md | 5 - elements/mariadb/element-deps | 2 - elements/mariadb/element-provides | 1 - .../mariadb/install.d/10-mariadb-packages | 7 - .../configure.d/52-mariadb-init | 22 - elements/memcached/README.md | 7 - elements/memcached/element-deps | 2 - elements/memcached/install.d/74-memcached | 12 - .../install.d/package-installs-memcached | 1 - elements/multipath/README.md | 11 - elements/multipath/files/multipath.conf | 3 - elements/multipath/install.d/90-multipath | 23 - elements/multipath/pkg-map | 10 - elements/mysql-common/README.md | 42 -- elements/mysql-common/element-deps | 6 - .../install.d/11-mysql-clustercheck | 15 - elements/mysql-common/install.d/clustercheck | 117 --- .../install.d/clustercheck-tripleo | 7 - elements/mysql-common/install.d/mysqlchk | 16 - .../install.d/package-installs-mysql-common | 2 - .../etc/ssl/mysql/from-heat.crt | 1 - .../etc/ssl/mysql/from-heat.key | 1 - .../mnt/state/etc/mysql/conf.d/README | 9 - .../mnt/state/etc/mysql/conf.d/cluster.cnf | 21 - .../mnt/state/etc/mysql/dbusers.json | 1 - .../mnt/state/etc/mysql/debian.cnf | 3 - .../mnt/state/etc/mysql/my.cnf | 88 --- .../mnt/state/etc/mysql/mysqlchk.my.cnf | 6 - .../mnt/state/etc/mysql/passthru.cnf | 19 - .../mnt/state/etc/mysql/static-dbusers.json | 9 - .../mnt/state/root/metadata.my.cnf | 5 - .../configure.d/51-mysql-server-id | 32 - .../post-configure.d/10-mysql-permissions | 14 - .../post-configure.d/50-mysql-users | 121 --- .../post-configure.d/60-mysql-secure | 88 --- .../pre-configure.d/97-mysql-galera-iptables | 6 - .../pre-configure.d/97-mysql-iptables | 4 - .../pre-configure.d/97-mysql-selinux | 19 - elements/mysql-dev/README.md | 4 - elements/mysql-dev/element-deps | 1 - elements/mysql-dev/install.d/03-mysql-dev | 5 - elements/mysql-dev/pkg-map | 10 - elements/mysql-mariadb-compat/README.md | 2 - elements/mysql-mariadb-compat/element-deps | 1 - .../post-install.d/10-var-run-mysqld | 7 - elements/mysql-migration/README.md | 41 -- elements/mysql-migration/element-deps | 3 - .../etc/mysql/migration_default | 4 - .../os-apply-config/root/metadata.my.cnf | 10 - .../migration.d/10-bootstrap-mysql | 86 --- elements/mysql/README.md | 23 - elements/mysql/element-deps | 4 - elements/mysql/install.d/10-mysql | 66 -- .../mysql/install.d/20-galera-libssl-symlink | 53 -- .../mysql/install.d/package-installs-mysql | 4 - .../configure.d/52-mysql-init | 61 -- .../pre-configure.d/40-mysql | 12 - elements/nagios3/README.md | 24 - elements/nagios3/bin/refresh-nagios-from-nova | 90 --- elements/nagios3/element-deps | 5 - elements/nagios3/install.d/17-nagios | 20 - elements/nagios3/install.d/nagios3-crontab | 2 - .../nagios3/install.d/package-installs-nagios | 1 - .../etc/nagios3/nova_access_info | 10 - .../post-configure.d/17-nagios | 7 - elements/network-utils/README.md | 20 - elements/network-utils/bin/ensure-bridge | 346 --------- elements/network-utils/element-deps | 1 - .../network-utils/install.d/70-network-utils | 4 - elements/neutron-dhcp-agent/README.md | 7 - elements/neutron-dhcp-agent/element-deps | 3 - .../80-neutron-dhcp-agent | 7 - .../80-neutron-dhcp-agent | 12 - .../post-configure.d/80-neutron-dhcp-agent | 6 - elements/neutron-network-node/README.md | 16 - elements/neutron-network-node/element-deps | 5 - .../post-configure.d/80-neutron-networking | 14 - elements/neutron-openvswitch-agent/README.md | 95 --- .../bin/init-neutron-ovs | 120 --- .../neutron-openvswitch-agent/element-deps | 3 - ...-disable-upstart-network-interface-logging | 9 - .../80-neutron-openvswitch-agent | 17 - .../80-neutron-openvswitch-agent | 8 - .../configure.d/21-neutron-openvswitch-agent | 4 - .../80-neutron-openvswitch-agent | 6 - .../pre-configure.d/72-openvswitch-iptables | 7 - elements/neutron-ovs-cleanup/README.md | 3 - elements/neutron-ovs-cleanup/element-deps | 1 - .../81-neutron-ovs-cleanup | 14 - .../neutron-ovs-cleanup.conf | 12 - .../neutron-ovs-cleanup.service | 15 - .../post-configure.d/81-neutron-ovs-cleanup | 4 - elements/neutron-router/README.md | 16 - elements/neutron-router/element-deps | 5 - .../neutron-source-install/80-neutron-router | 15 - .../post-configure.d/80-neutron-router | 8 - elements/neutron-router/package-installs.yaml | 3 - elements/neutron-router/pkg-map | 13 - elements/neutron-server/README.md | 1 - elements/neutron-server/element-deps | 2 - .../neutron-package-install/76-neutron | 13 - .../package-installs-neutron-server | 2 - .../neutron-source-install/80-neutron-server | 5 - .../post-configure.d/79-neutron-server | 6 - elements/neutron/README.md | 13 - .../cleanup.d/50-remove-source-neutron | 5 - elements/neutron/element-deps | 8 - .../environment.d/10-neutron-venv-dir.bash | 6 - .../neutron-source-install/76-neutron | 22 - .../os-apply-config/etc/dnsmasq.d/only-lo | 2 - .../etc/neutron/dhcp_agent.ini | 28 - .../etc/neutron/dnsmasq/dnsmasq-neutron.conf | 1 - .../os-apply-config/etc/neutron/l3_agent.ini | 33 - .../etc/neutron/metadata_agent.ini | 26 - .../os-apply-config/etc/neutron/neutron.conf | 122 --- .../etc/neutron/plugins/ml2/ml2_conf.ini | 68 -- .../os-apply-config/etc/neutron/rootwrap.conf | 19 - .../configure.d/10-neutron-state | 6 - .../configure.d/20-neutron-selinux | 18 - .../configure.d/90-neutron-db-sync | 6 - .../97-fedora-neutron-iptables | 14 - elements/neutron/source-repository-neutron | 1 - elements/nfs-client/README.md | 1 - elements/nfs-client/install.d/51-nfs-utils | 5 - elements/nfs-client/pkg-map | 16 - elements/nfs-server/README.md | 28 - elements/nfs-server/element-deps | 4 - elements/nfs-server/install.d/68-nfs-server | 4 - .../nfs-server/os-apply-config/etc/exports | 3 - .../post-configure.d/74-nfs-server | 27 - .../pre-configure.d/97-nfs-iptables | 9 - elements/nfs-server/pkg-map | 16 - elements/nova-api/README.md | 2 - elements/nova-api/element-deps | 5 - .../package-installs-nova-api | 5 - .../install.d/nova-source-install/80-nova-api | 18 - .../configure.d/90-nova-db-sync | 6 - .../post-configure.d/80-nova-api | 26 - .../97-nova-api-fedora-iptables | 5 - elements/nova-baremetal/README.md | 17 - elements/nova-baremetal/element-deps | 5 - elements/nova-baremetal/install.d/80-pxelinux | 39 - .../82-nova-bm-deploy-helper-link | 13 - .../nova-source-install/81-nova-bm-services | 6 - .../mnt/state/var/lib/nova/virtual-power-key | 1 - .../configure.d/80-nova-baremetal | 5 - .../configure.d/81-nat-metadata | 6 - .../configure.d/82-nova-baremetal-selinux | 8 - .../configure.d/90-nova-baremetal-db-sync | 6 - .../post-configure.d/70-enable-iscsid | 10 - .../post-configure.d/80-nova-baremetal | 6 - .../97-fedora-nova-baremetal-iptables | 5 - elements/nova-compute/README.md | 1 - elements/nova-compute/element-deps | 1 - .../nova-package-install/80-nova-compute | 14 - .../nova-source-install/80-nova-compute | 24 - .../post-configure.d/80-nova-compute | 8 - elements/nova-ironic/README.md | 4 - elements/nova-ironic/element-deps | 6 - .../package-installs-nova-ironic | 1 - .../81-nova-ironic-driver | 15 - .../configure.d/81-nat-metadata | 6 - elements/nova-ironic/pkg-map | 5 - elements/nova-kvm/README.md | 4 - elements/nova-kvm/element-deps | 6 - elements/nova-kvm/install.d/81-nova-kvm | 26 - .../nova-kvm/install.d/default_libvirt_bin | 12 - elements/nova-kvm/install.d/default_libvirtd | 24 - .../nova-package-install/80-nova-kvm | 9 - .../install.d/nova-source-install/80-nova-kvm | 22 - .../package-installs-nova-kvm | 5 - .../os-apply-config/etc/libvirt/libvirtd.conf | 9 - .../os-refresh-config/configure.d/80-nova-kvm | 8 - .../post-configure.d/80-libvirt-bin | 4 - .../pre-configure.d/98-nova-iptables | 5 - elements/nova-novncproxy/README.md | 8 - .../cleanup.d/50-remove-source-novnc | 5 - elements/nova-novncproxy/element-deps | 2 - .../package-installs-nova-novncproxy | 2 - .../novnc-source-install/50-install-novnc | 12 - .../post-configure.d/81-nova-novncproxy | 5 - .../98-nova-novncproxy-fedora-iptables | 6 - .../nova-novncproxy/source-repository-novnc | 1 - elements/nova/README.md | 42 -- elements/nova/cleanup.d/50-remove-source-nova | 6 - elements/nova/element-deps | 5 - .../nova/environment.d/10-nova-venv-dir.bash | 7 - .../install.d/nova-source-install/74-nova | 20 - .../etc/nova/api/nova-api.conf | 14 - .../etc/nova/cert/nova-cert.conf | 14 - .../etc/nova/compute/nova-compute.conf | 14 - .../etc/nova/conductor/nova-conductor.conf | 14 - .../nova/consoleauth/nova-consoleauth.conf | 14 - .../nova/os-apply-config/etc/nova/nova.conf | 253 ------- .../etc/nova/scheduler/nova-scheduler.conf | 14 - .../configure.d/10-nova-state | 7 - .../configure.d/20-nova-selinux | 10 - .../pre-install.d/00-nova-disable-requiretty | 8 - elements/nova/source-repository-nova | 1 - elements/nscd/README.md | 5 - elements/nscd/install.d/90-nscd | 20 - elements/openstack-clients/README.md | 12 - .../bin/install-openstack-client | 88 --- .../50-remove-source-openstack-clients | 13 - elements/openstack-clients/element-deps | 4 - .../10-openstack-clients-venv-dir.bash | 82 --- .../install.d/50-openstack-clients | 5 - .../51-ceilometerclient | 5 - .../51-ceilometerclient | 7 - .../51-cinderclient | 5 - .../51-cinderclient | 7 - .../51-glanceclient | 5 - .../51-glanceclient | 7 - .../51-heatclient | 5 - .../51-heatclient | 7 - .../51-ironicclient | 5 - .../51-ironicclient | 7 - .../51-neutronclient | 5 - .../51-neutronclient | 5 - .../51-novaclient | 5 - .../51-novaclient | 7 - .../51-openstackclient | 5 - .../51-openstackclient | 7 - .../51-swiftclient | 5 - .../51-swiftclient | 11 - .../51-tuskarclient | 5 - .../51-tuskarclient | 7 - .../source-repository-clients | 10 - elements/openstack-db/README.md | 2 - elements/openstack-db/element-deps | 2 - .../openstack-db/install.d/50-openstack-db | 19 - .../openstack-db/source-repository-openstack | 5 - elements/openstack-ssl/README.md | 42 -- elements/openstack-ssl/element-deps | 1 - .../os-apply-config/etc/ssl/from-heat.crt | 1 - .../os-apply-config/etc/ssl/from-heat.key | 1 - .../etc/stunnel/from-heat.conf | 13 - .../pre-configure.d/70-stunnel-permissions | 24 - elements/openvswitch-datapath/README.md | 4 - elements/openvswitch-datapath/element-deps | 2 - .../install.d/75-openvswitch-datapath | 13 - elements/openvswitch-datapath/pkg-map | 14 - elements/os-is-bootstrap-host/README.md | 23 - .../bin/os-is-bootstrap-host | 18 - elements/pacemaker/README.md | 11 - elements/pacemaker/bin/pcmk-service-create | 95 --- elements/pacemaker/element-deps | 6 - .../install.d/package-installs-pacemaker | 1 - .../etc/corosync/service.d/pacemaker | 4 - .../post-configure.d/15-pacemaker | 12 - .../post-configure.d/16-base-opts-pacemaker | 13 - elements/postfix/README.md | 23 - elements/postfix/element-deps | 3 - .../install.d/package-installs-postfix | 1 - elements/postfix/os-apply-config/etc/mailname | 1 - .../os-apply-config/etc/postfix/main.cf | 34 - .../os-refresh-config/configure.d/59-postfix | 14 - .../post-configure.d/59-postfix | 4 - elements/postfix/pre-install.d/59-postfix | 10 - elements/pypi-mirror/README.md | 2 - elements/pypi-mirror/element-deps | 2 - elements/pypi-mirror/install.d/50-pypi-mirror | 49 -- .../pypi-mirror/source-repository-pypi-mirror | 1 - elements/pypi-openstack/README.md | 17 - .../00-unconfigure-openstack-pypi-mirror | 16 - .../00-configure-openstack-pypi-mirror | 25 - elements/qpidd/README.md | 60 -- elements/qpidd/element-deps | 2 - elements/qpidd/install.d/20-qpidd | 23 - .../qpidd/os-apply-config/etc/qpid/qpidd.acl | 40 - .../post-configure.d/73-qpidd | 11 - elements/rabbitmq-server/README.md | 98 --- .../bin/rabbitmq_is_in_cluster | 64 -- .../rabbitmq-server/bin/rabbitmq_join_cluster | 81 -- .../rabbitmq-server/bin/rabbitmq_reset_node | 50 -- .../bin/rabbitmq_size_of_cluster | 53 -- elements/rabbitmq-server/element-deps | 9 - .../files/etc/init/rabbitmq-server.conf | 27 - .../files/etc/rabbitmq/rabbitmq-env.conf | 7 - .../install.d/20-rabbitmq-server | 46 -- .../package-installs-rabbitmq-server | 1 - .../etc/rabbitmq/heat_password_handle | 1 - .../etc/rabbitmq/heat_users.json | 1 - .../etc/rabbitmq/rabbitmq.config | 23 - .../security/limits.d/rabbitmq_limits.conf | 5 - .../var/lib/rabbitmq/.erlang.cookie | 1 - .../var/lib/rabbitmq/.erlang.cookie.oac | 3 - .../configure.d/20-rabbitmq-server-selinux | 13 - .../post-configure.d/51-rabbitmq | 136 ---- .../post-configure.d/52-rabbitmq-passwords | 126 ---- .../97-rabbitmq-server-fedora-iptables | 5 - .../pre-configure.d/98-rabbitmq-iptables | 4 - elements/rally/README.md | 11 - elements/rally/element-deps | 2 - .../environment.d/10-rally-venv-dir.bash | 3 - .../install.d/rally-source-install/51-rally | 12 - elements/rally/source-repository-rally | 1 - elements/rdo-release/README.md | 5 - .../environment.d/10-rdo-release-name.bash | 1 - .../pre-install.d/10-rdo-release-repo | 5 - elements/remove-serial-console/README.md | 9 - .../finalise.d/60-purge-serial-console | 19 - elements/restore-ssh-host-keys/README.md | 16 - elements/restore-ssh-host-keys/element-deps | 1 - .../pre-configure.d/10-restore-ssh-host-keys | 19 - elements/salt-master/README.md | 1 - elements/salt-master/install.d/10-salt-master | 7 - .../salt-master/pre-install.d/10-salt-master | 8 - elements/salt-minion/README.md | 1 - elements/salt-minion/install.d/10-salt-minion | 7 - .../salt-minion/pre-install.d/10-salt-minion | 8 - elements/seed-debug-logging/README.md | 3 - elements/seed-debug-logging/debug.json | 23 - elements/seed-debug-logging/element-deps | 1 - .../install.d/02-seed-debug-logging | 6 - elements/seed-stack-config/README.md | 32 - elements/seed-stack-config/config.json | 100 --- elements/seed-stack-config/element-deps | 2 - .../install.d/01-seed-stack-heat-metadata | 13 - .../install.d/11-seed-stack-heat-metadata | 10 - .../var/opt/seed-stack/masquerade | 22 - .../post-configure.d/80-seedstack-masquerade | 6 - elements/selinux/README.md | 18 - elements/selinux/bin/add-selinux-file-context | 50 -- .../selinux/bin/add-selinux-path-substitution | 53 -- .../selinux/bin/restore-selinux-file-context | 39 - .../tripleo-selinux-keepalived.te | 35 - .../tripleo-selinux-keystone.te | 15 - .../tripleo-selinux-mariadb.te | 92 --- .../tripleo-selinux-neutron.te | 13 - .../custom-policies/tripleo-selinux-nova.te | 18 - .../tripleo-selinux-openvswitch.te | 14 - .../tripleo-selinux-rabbitmq.te | 20 - .../tripleo-selinux-rhsmcertd.te | 19 - .../custom-policies/tripleo-selinux-ssh.te | 13 - .../custom-policies/tripleo-selinux-swift.te | 14 - .../100-install-custom-selinux-policies | 22 - .../20-compile-and-install-selinux-policies | 21 - elements/snmpd/README.md | 23 - elements/snmpd/element-deps | 3 - elements/snmpd/files/check_proc_open_files.py | 93 --- elements/snmpd/files/snmp | 1 - elements/snmpd/install.d/67-snmpd | 12 - .../snmpd/os-apply-config/etc/default/snmpd | 20 - .../snmpd/os-apply-config/etc/snmp/snmpd.conf | 39 - .../post-configure.d/67-snmpd | 7 - elements/snmpd/pkg-map | 15 - elements/sosreport/README.md | 10 - .../sosreport/cleanup.d/90-sos-tmp-plugins | 23 - .../environment.d/90-sos-plugins-env | 19 - .../sosreport/extra-data.d/90-sos-plugins | 23 - elements/sosreport/install.d/65-sosreport | 23 - elements/sosreport/pkg-map | 10 - elements/squid/README.md | 5 - elements/squid/element-deps | 4 - elements/squid/install.d/30-squid | 5 - .../os-apply-config/etc/squid/squid.conf | 65 -- .../post-configure.d/80-squid | 5 - .../pre-configure.d/97-squid-iptables | 5 - elements/ssl-ca/README.md | 18 - .../os-apply-config/etc/ssl/from-heat-ca.crt | 1 - .../configure.d/51-ssl-load-ca-certs | 37 - elements/stackuser/README.md | 4 - elements/stackuser/install.d/50-user | 28 - elements/stunnel/README.md | 27 - .../usr/lib/systemd/system/stunnel4.service | 13 - elements/stunnel/install.d/70-install-stunnel | 38 - .../configure.d/21-restart-stunnel | 22 - elements/swift-proxy/README.md | 13 - .../swift_proxy_healthcheck.py | 66 -- elements/swift-proxy/element-deps | 2 - .../swift-package-install/76-swift-proxy | 5 - .../swift-source-install/76-swift-proxy | 15 - .../etc/swift/proxy-server.conf | 91 --- .../post-configure.d/74-swift-proxy | 6 - .../pre-configure.d/72-swift-proxy-iptables | 8 - elements/swift-ring/README.md | 1 - elements/swift-ring/element-deps | 3 - .../environment.d/10-swift-ring-venv-dir.bash | 6 - .../swift-package-install/75-swift-ring | 6 - .../swift-source-install/75-swift-ring | 10 - elements/swift-ring/pkg-map | 12 - elements/swift-ring/source-repository-swift | 1 - elements/swift-storage/README.md | 1 - elements/swift-storage/element-deps | 3 - .../install.d/76-swift-storage-common | 22 - .../install.d/package-installs-swift-storage | 1 - .../package-installs-swift-storage | 4 - .../swift-source-install/76-swift-storage | 21 - .../os-apply-config/etc/rsyncd.conf | 25 - .../etc/swift/account-server.conf | 45 -- .../etc/swift/container-server.conf | 47 -- .../etc/swift/object-server.conf | 46 -- .../configure.d/10-swift-storage-state | 5 - .../configure.d/15-swift-storage-location | 5 - .../configure.d/20-swift-storage-selinux | 16 - .../configure.d/21-swift-storage-iptables | 25 - .../post-configure.d/74-swift-storage | 30 - elements/swift/README.md | 21 - .../swift/cleanup.d/50-remove-source-swift | 5 - elements/swift/element-deps | 3 - .../environment.d/10-swift-venv-dir.bash | 6 - .../package-installs-swift | 1 - .../install.d/swift-source-install/75-swift | 10 - .../swift-source-install/76-swift-cffi | 14 - .../package-installs-swift | 1 - .../os-apply-config/etc/swift/swift.conf | 17 - .../configure.d/20-swift-selinux | 9 - .../os-refresh-config/configure.d/73-swift | 78 -- elements/swift/source-repository-swift | 1 - elements/sysctl/README.md | 38 - elements/sysctl/bin/sysctl-append-value | 34 - elements/sysctl/bin/sysctl-set-value | 42 -- elements/sysctl/bin/sysctl-write-value | 25 - elements/sysctl/element-deps | 1 - elements/sysctl/install.d/10-sysctl-install | 4 - .../configure.d/10-sysctl-apply-config | 12 - elements/tempest/README.md | 23 - elements/tempest/bin/run-tempest | 114 --- .../cleanup.d/50-remove-source-tempest | 5 - elements/tempest/element-deps | 3 - .../environment.d/10-tempest-venv-dir.bash | 6 - elements/tempest/install.d/51-tempest | 38 - .../install.d/package-installs-tempest | 2 - .../tempest/os-apply-config/etc/tempestrunrc | 24 - .../opt/stack/tempest/etc/tempest.conf | 53 -- elements/tempest/pkg-map | 17 - elements/tempest/source-repository-tempest | 1 - elements/tempest/tests2skip.py | 70 -- elements/tempest/tests2skip.txt | 43 -- elements/tripleo-cd/README.md | 34 - elements/tripleo-cd/bin/deploy-testenv | 48 -- elements/tripleo-cd/bin/prepare-ci-overcloud | 150 ---- elements/tripleo-cd/bin/tripleo-cd.sh | 64 -- elements/tripleo-cd/configs/hp1_ci_env.json | 8 - elements/tripleo-cd/configs/hp1_networks.json | 34 - elements/tripleo-cd/configs/hp1_oc_env.json | 7 - elements/tripleo-cd/configs/hp1_uc_env.json | 11 - elements/tripleo-cd/configs/hp2_ci_env.json | 10 - elements/tripleo-cd/configs/hp2_networks.json | 34 - elements/tripleo-cd/configs/hp2_oc_env.json | 7 - elements/tripleo-cd/configs/hp2_uc_env.json | 10 - elements/tripleo-cd/configs/te_commonrc | 23 - elements/tripleo-cd/configs/te_hp1rc | 18 - elements/tripleo-cd/configs/te_hp2rc | 17 - elements/tripleo-cd/configs/te_localrc | 21 - elements/tripleo-cd/configs/te_rh1rc | 14 - elements/tripleo-cd/deploy-ci-overcloud | 113 --- elements/tripleo-cd/element-deps | 3 - elements/tripleo-cd/install.d/10-tripleo-cd | 38 - .../source-repository-tripleo-incubator | 4 - elements/tripleo-heat-templates/README.md | 1 - elements/tripleo-heat-templates/element-deps | 1 - .../10-tripleo-heat-templates | 6 - elements/tripleo-heat-templates/pkg-map | 5 - .../source-repository-tripleo-heat-templates | 1 - elements/tripleo-staging/README.md | 4 - .../pre-install.d/01-bleeding-edge | 6 - elements/trove-api/README.md | 82 --- elements/trove-api/element-deps | 3 - .../trove-source-install/80-trove-api | 6 - .../os-apply-config/etc/trove/api-paste.ini | 42 -- .../etc/trove/guestagent_image | 1 - .../os-apply-config/etc/trove/trove.conf | 198 ----- .../post-configure.d/82-trove-api | 11 - .../post-configure.d/83-trove-update-image | 16 - .../99-trove-api-fedora-iptables | 5 - elements/trove/README.md | 1 - elements/trove/element-deps | 3 - .../environment.d/10-trove-venv-dir.bash | 7 - .../install.d/trove-source-install/77-trove | 4 - .../configure.d/16-trove-state | 3 - elements/trove/source-repository-trove | 1 - elements/use-ephemeral/README.md | 49 -- .../use-ephemeral/bin/register-state-path | 68 -- elements/use-ephemeral/element-deps | 1 - .../finalise.d/00-cleanup-stateful-paths | 40 - .../pre-configure.d/00-fix-ephemeral-mount | 18 - .../pre-configure.d/01-setup-stateful-paths | 46 -- 849 files changed, 14540 deletions(-) delete mode 100644 elements/ansible/README.md delete mode 100755 elements/ansible/cleanup.d/50-remove-source-ansible delete mode 100644 elements/ansible/element-deps delete mode 100755 elements/ansible/environment.d/10-ansible-venv-dir.bash delete mode 100644 elements/ansible/install.d/ansible-package-install/30-ansible-package delete mode 100755 elements/ansible/install.d/ansible-source-install/30-ansible-source delete mode 100644 elements/apache2/README.md delete mode 100644 elements/apache2/element-deps delete mode 100755 elements/apache2/install.d/15-apache2 delete mode 100644 elements/apache2/install.d/package-installs-apache2 delete mode 100644 elements/apache2/os-apply-config/etc/ssl/certs/ssl-cert-snakeoil.pem delete mode 100644 elements/apache2/os-apply-config/etc/ssl/private/ssl-cert-snakeoil.key delete mode 100755 elements/apache2/os-refresh-config/post-configure.d/13-apache2 delete mode 100755 elements/apache2/post-install.d/15-apache2 delete mode 100644 elements/apache2/svc-map delete mode 100644 elements/bandersnatch/README.md delete mode 100644 elements/bandersnatch/element-deps delete mode 100755 elements/bandersnatch/install.d/76-bandersnatch delete mode 100755 elements/bandersnatch/os-refresh-config/post-configure.d/50-bandersnatch delete mode 100644 elements/bm-dnsmasq/README.md delete mode 100755 elements/bm-dnsmasq/bin/filter-bootps delete mode 100644 elements/bm-dnsmasq/element-deps delete mode 100755 elements/bm-dnsmasq/install.d/75-filter-bootps-cronjob delete mode 100755 elements/bm-dnsmasq/install.d/81-bm-dnsmasq delete mode 100644 elements/bm-dnsmasq/install.d/package-installs-bm-dnsmasq delete mode 100755 elements/bm-dnsmasq/os-refresh-config/post-configure.d/80-bm-dnsmasq delete mode 100644 elements/boot-stack/README.md delete mode 100755 elements/boot-stack/bin/boot-stack-logs delete mode 100755 elements/boot-stack/bin/reset-db delete mode 100644 elements/boot-stack/element-deps delete mode 100755 elements/boot-stack/install.d/01-boot-stack delete mode 100644 elements/boot-stack/install.d/package-installs-boot-stack delete mode 100644 elements/boot-stack/os-apply-config/root/stackrc delete mode 100644 elements/boot-stack/os-apply-config/root/stackrc.oac delete mode 100755 elements/boot-stack/os-refresh-config/configure.d/53-init-openstack delete mode 100755 elements/boot-stack/os-refresh-config/pre-configure.d/97-fedora-iptables delete mode 100644 elements/ceilometer-agent-central/README.md delete mode 100644 elements/ceilometer-agent-central/element-deps delete mode 100644 elements/ceilometer-agent-central/install.d/ceilometer-package-install/package-installs-ceilometer-agent-central delete mode 100755 elements/ceilometer-agent-central/install.d/ceilometer-source-install/69-ceilometer-agent-central delete mode 100755 elements/ceilometer-agent-central/os-refresh-config/post-configure.d/69-ceilometer-agent-central delete mode 100644 elements/ceilometer-agent-central/pkg-map delete mode 100644 elements/ceilometer-agent-central/svc-map delete mode 100644 elements/ceilometer-agent-compute/README.md delete mode 100644 elements/ceilometer-agent-compute/element-deps delete mode 100644 elements/ceilometer-agent-compute/install.d/ceilometer-package-install/package-installs-ceilometer-agent-compute delete mode 100755 elements/ceilometer-agent-compute/install.d/ceilometer-source-install/69-ceilometer-agent-compute delete mode 100644 elements/ceilometer-agent-compute/install.d/package-installs-ceilometer-agent-compute delete mode 100755 elements/ceilometer-agent-compute/os-refresh-config/post-configure.d/69-ceilometer-agent-compute delete mode 100644 elements/ceilometer-agent-compute/pkg-map delete mode 100644 elements/ceilometer-agent-compute/svc-map delete mode 100644 elements/ceilometer-agent-notification/README.md delete mode 100644 elements/ceilometer-agent-notification/element-deps delete mode 100644 elements/ceilometer-agent-notification/install.d/ceilometer-package-install/package-installs-ceilometer-agent-notification delete mode 100755 elements/ceilometer-agent-notification/install.d/ceilometer-source-install/69-ceilometer-agent-notification delete mode 100755 elements/ceilometer-agent-notification/os-refresh-config/post-configure.d/69-ceilometer-agent-notification delete mode 100644 elements/ceilometer-agent-notification/pkg-map delete mode 100644 elements/ceilometer-agent-notification/svc-map delete mode 100644 elements/ceilometer-alarm-evaluator/README.md delete mode 100644 elements/ceilometer-alarm-evaluator/element-deps delete mode 100644 elements/ceilometer-alarm-evaluator/install.d/ceilometer-package-install/package-installs-ceilometer-alarm-evaluator delete mode 100755 elements/ceilometer-alarm-evaluator/install.d/ceilometer-source-install/69-ceilometer-alarm-evaluator delete mode 100755 elements/ceilometer-alarm-evaluator/os-refresh-config/post-configure.d/69-ceilometer-alarm-evaluator delete mode 100644 elements/ceilometer-alarm-evaluator/pkg-map delete mode 100644 elements/ceilometer-alarm-evaluator/svc-map delete mode 100644 elements/ceilometer-alarm-notifier/README.md delete mode 100644 elements/ceilometer-alarm-notifier/element-deps delete mode 100644 elements/ceilometer-alarm-notifier/install.d/ceilometer-package-install/package-installs-ceilometer-alarm-notifier delete mode 100755 elements/ceilometer-alarm-notifier/install.d/ceilometer-source-install/69-ceilometer-alarm-notifier delete mode 100755 elements/ceilometer-alarm-notifier/os-refresh-config/post-configure.d/69-ceilometer-alarm-notifier delete mode 100644 elements/ceilometer-alarm-notifier/pkg-map delete mode 100644 elements/ceilometer-alarm-notifier/svc-map delete mode 100644 elements/ceilometer-api/README.md delete mode 100644 elements/ceilometer-api/element-deps delete mode 100644 elements/ceilometer-api/install.d/ceilometer-package-install/package-installs-ceilometer-api delete mode 100755 elements/ceilometer-api/install.d/ceilometer-source-install/69-ceilometer-api delete mode 100755 elements/ceilometer-api/os-refresh-config/configure.d/90-ceilometer-db-sync delete mode 100755 elements/ceilometer-api/os-refresh-config/post-configure.d/69-ceilometer-api delete mode 100755 elements/ceilometer-api/os-refresh-config/pre-configure.d/97-fedora-ceilometer-api-iptables delete mode 100644 elements/ceilometer-api/pkg-map delete mode 100644 elements/ceilometer-api/svc-map delete mode 100644 elements/ceilometer-collector/README.md delete mode 100644 elements/ceilometer-collector/element-deps delete mode 100644 elements/ceilometer-collector/install.d/ceilometer-package-install/package-installs-ceilometer-collector delete mode 100755 elements/ceilometer-collector/install.d/ceilometer-source-install/69-ceilometer-collector delete mode 100755 elements/ceilometer-collector/os-refresh-config/post-configure.d/69-ceilometer-collector delete mode 100644 elements/ceilometer-collector/pkg-map delete mode 100644 elements/ceilometer-collector/svc-map delete mode 100644 elements/ceilometer-overcloud-config/README.md delete mode 100644 elements/ceilometer-overcloud-config/element-deps delete mode 100644 elements/ceilometer-overcloud-config/os-apply-config/etc/ceilometer/pipeline.yaml delete mode 100644 elements/ceilometer-undercloud-config/README.md delete mode 100644 elements/ceilometer-undercloud-config/element-deps delete mode 100644 elements/ceilometer-undercloud-config/os-apply-config/etc/ceilometer/pipeline.yaml delete mode 100644 elements/ceilometer/README.md delete mode 100755 elements/ceilometer/cleanup.d/50-remove-source-ceilometer delete mode 100644 elements/ceilometer/element-deps delete mode 100644 elements/ceilometer/environment.d/10-ceilometer-venv-dir.bash delete mode 100644 elements/ceilometer/install.d/ceilometer-package-install/package-installs-ceilometer delete mode 100755 elements/ceilometer/install.d/ceilometer-source-install/68-ceilometer delete mode 100644 elements/ceilometer/install.d/package-installs-ceilometer delete mode 100644 elements/ceilometer/os-apply-config/etc/ceilometer/ceilometer.conf delete mode 100644 elements/ceilometer/pkg-map delete mode 100644 elements/ceilometer/source-repository-ceilometer delete mode 100644 elements/check_mk-agent/README.md delete mode 100644 elements/check_mk-agent/element-deps delete mode 100755 elements/check_mk-agent/install.d/05-check_mk-agent delete mode 100755 elements/check_mk-agent/install.d/99-check_mk_local_checks delete mode 100644 elements/check_mk-agent/install.d/package-installs-check_mk-agent delete mode 100755 elements/check_mk-agent/os-refresh-config/pre-configure.d/97-check-mk-agent-iptables delete mode 100644 elements/check_mk-agent/svc-map delete mode 100644 elements/cinder-api/README.md delete mode 100644 elements/cinder-api/element-deps delete mode 100755 elements/cinder-api/install.d/cinder-source-install/73-cinder-api delete mode 100755 elements/cinder-api/os-refresh-config/configure.d/90-cinder-db-sync delete mode 100755 elements/cinder-api/os-refresh-config/post-configure.d/73-cinder-api delete mode 100755 elements/cinder-api/os-refresh-config/pre-configure.d/97-cinder-api-iptables delete mode 100644 elements/cinder-api/svc-map delete mode 100644 elements/cinder-lio/README.md delete mode 100644 elements/cinder-lio/element-deps delete mode 100755 elements/cinder-lio/install.d/cinder-source-install/73-cinder-rtstool delete mode 100644 elements/cinder-lio/install.d/package-installs-cinder-lio delete mode 100644 elements/cinder-tgt/README.md delete mode 100644 elements/cinder-tgt/element-deps delete mode 100755 elements/cinder-tgt/install.d/72-cinder-tgt delete mode 100644 elements/cinder-tgt/install.d/package-installs-cinder-tgt delete mode 100755 elements/cinder-tgt/os-refresh-config/post-configure.d/74-cinder-tgt delete mode 100644 elements/cinder-tgt/svc-map delete mode 100644 elements/cinder-volume-nfs/README.md delete mode 100644 elements/cinder-volume-nfs/element-deps delete mode 100644 elements/cinder-volume-nfs/os-apply-config/etc/cinder/nfs_shares.txt delete mode 100755 elements/cinder-volume-nfs/os-refresh-config/post-configure.d/70-cinder-nfs-dir delete mode 100644 elements/cinder-volume/README.md delete mode 100644 elements/cinder-volume/element-deps delete mode 100755 elements/cinder-volume/install.d/cinder-source-install/74-cinder-volume delete mode 100755 elements/cinder-volume/os-refresh-config/post-configure.d/70-cinder-conversion-dir delete mode 100755 elements/cinder-volume/os-refresh-config/post-configure.d/72-cinder-resize-volume-groups delete mode 100755 elements/cinder-volume/os-refresh-config/post-configure.d/74-cinder-volume delete mode 100755 elements/cinder-volume/os-refresh-config/pre-configure.d/97-cinder-volume-iptables delete mode 100644 elements/cinder-volume/pkg-map delete mode 100644 elements/cinder-volume/svc-map delete mode 100644 elements/cinder/README.md delete mode 100755 elements/cinder/cleanup.d/50-remove-source-cinder delete mode 100644 elements/cinder/element-deps delete mode 100644 elements/cinder/environment.d/10-cinder-venv-dir.bash delete mode 100755 elements/cinder/install.d/73-cinder delete mode 100755 elements/cinder/install.d/cinder-package-install/72-cinder delete mode 100755 elements/cinder/install.d/cinder-source-install/72-cinder delete mode 100644 elements/cinder/os-apply-config/etc/cinder/cinder.conf delete mode 100644 elements/cinder/os-apply-config/etc/cinder/rootwrap.conf delete mode 100755 elements/cinder/pre-install.d/00-cinder-disable-requiretty delete mode 100644 elements/cinder/source-repository-cinder delete mode 100644 elements/collectl/README.md delete mode 100644 elements/collectl/element-deps delete mode 100755 elements/collectl/install.d/85-collectl delete mode 100644 elements/collectl/svc-map delete mode 100644 elements/common-venv/README.md delete mode 100644 elements/common-venv/environment.d/01-common-venv-dir.bash delete mode 100644 elements/contrail-repo/README.md delete mode 100644 elements/contrail-repo/element-deps delete mode 100755 elements/contrail-repo/post-install.d/10-contrail-setup delete mode 100755 elements/contrail-repo/pre-install.d/10-contrail-repo delete mode 100644 elements/corosync/README.md delete mode 100644 elements/corosync/element-deps delete mode 100644 elements/corosync/install.d/package-installs-corosync delete mode 100644 elements/corosync/os-apply-config/etc/corosync/corosync.conf delete mode 100644 elements/corosync/os-apply-config/etc/default/corosync delete mode 100755 elements/corosync/os-refresh-config/post-configure.d/14-corosync delete mode 100644 elements/corosync/svc-map delete mode 100644 elements/debian-mirror/README.md delete mode 100644 elements/debian-mirror/element-deps delete mode 100755 elements/debian-mirror/install.d/82-debmirror delete mode 100644 elements/debian-mirror/os-apply-config/etc/apt/mirror.list delete mode 100644 elements/delorean-repo/README.md delete mode 100644 elements/delorean-repo/element-deps delete mode 100644 elements/delorean-repo/pkg-map delete mode 100755 elements/delorean-repo/pre-install.d/01-delorean-clean-metadata delete mode 100755 elements/delorean-repo/pre-install.d/01-delorean-repo delete mode 100755 elements/delorean-repo/pre-install.d/03-install-yum-priorities delete mode 100644 elements/devstack/README.md delete mode 100755 elements/devstack/block-device-size.d/10-size delete mode 100644 elements/devstack/element-deps delete mode 100755 elements/devstack/install.d/52-image-toolchain delete mode 100755 elements/devstack/install.d/53-devstack delete mode 100755 elements/devstack/install.d/97-haveged delete mode 100755 elements/devstack/install.d/98-baremetal-network delete mode 100755 elements/devstack/install.d/99-ssh delete mode 100644 elements/devstack/source-repository-devstack delete mode 100644 elements/devstack/source-repository-incubator delete mode 100644 elements/disable-os-collect-config/README.md delete mode 100755 elements/disable-os-collect-config/os-refresh-config/pre-configure.d/15-disable-os-collect-config delete mode 100644 elements/diskimage-builder/README.md delete mode 100644 elements/diskimage-builder/element-deps delete mode 100755 elements/diskimage-builder/install.d/55-diskimage-builder delete mode 100644 elements/diskimage-builder/source-repository-diskimage-builder delete mode 100644 elements/geard/README.md delete mode 100644 elements/geard/element-deps delete mode 100755 elements/geard/install.d/44-geard delete mode 100755 elements/geard/os-refresh-config/pre-configure.d/97-gearman-iptables delete mode 100644 elements/geard/svc-map delete mode 100644 elements/glance/README.md delete mode 100755 elements/glance/cleanup.d/50-remove-source-glance delete mode 100644 elements/glance/element-deps delete mode 100644 elements/glance/environment.d/10-glance-venv-dir.bash delete mode 100755 elements/glance/install.d/glance-package-install/75-glance delete mode 100755 elements/glance/install.d/glance-source-install/75-glance delete mode 100644 elements/glance/os-apply-config/etc/glance/glance-api.conf delete mode 100644 elements/glance/os-apply-config/etc/glance/glance-cache.conf delete mode 100644 elements/glance/os-apply-config/etc/glance/glance-registry.conf delete mode 100644 elements/glance/os-apply-config/etc/glance/glance-scrubber.conf delete mode 100755 elements/glance/os-refresh-config/configure.d/10-glance-state delete mode 100755 elements/glance/os-refresh-config/configure.d/20-glance-selinux delete mode 100755 elements/glance/os-refresh-config/configure.d/90-glance-db-sync delete mode 100755 elements/glance/os-refresh-config/post-configure.d/75-glance delete mode 100755 elements/glance/os-refresh-config/pre-configure.d/97-glance-fedora-iptables delete mode 100644 elements/glance/source-repository-glance delete mode 100644 elements/glance/svc-map delete mode 100644 elements/haproxy/README.md delete mode 100644 elements/haproxy/element-deps delete mode 100755 elements/haproxy/install.d/76-haproxy delete mode 100644 elements/haproxy/install.d/package-installs-haproxy delete mode 100644 elements/haproxy/os-apply-config/etc/haproxy/haproxy.cfg delete mode 100755 elements/haproxy/os-refresh-config/configure.d/20-haproxy-nonlocal-bind delete mode 100755 elements/haproxy/os-refresh-config/configure.d/20-haproxy-selinux delete mode 100755 elements/haproxy/os-refresh-config/configure.d/21-haproxy delete mode 100755 elements/haproxy/os-refresh-config/pre-configure.d/98-haproxy-iptables delete mode 100644 elements/haproxy/svc-map delete mode 100644 elements/heat-api/README.md delete mode 100644 elements/heat-api/element-deps delete mode 100755 elements/heat-api/install.d/heat-package-install/10-heat-api delete mode 100755 elements/heat-api/install.d/heat-source-install/10-heat-api delete mode 100755 elements/heat-api/os-refresh-config/post-configure.d/79-heat-api delete mode 100755 elements/heat-api/os-refresh-config/pre-configure.d/97-heat-api-fedora-iptables delete mode 100644 elements/heat-api/svc-map delete mode 100644 elements/heat-cfntools/README.md delete mode 100644 elements/heat-cfntools/element-deps delete mode 100755 elements/heat-cfntools/install.d/05-heat-cfntools delete mode 100755 elements/heat-cfntools/install.d/10-ec2-user delete mode 100644 elements/heat-cfntools/install.d/package-installs-heat-cfntools delete mode 100644 elements/heat-engine/README.md delete mode 100644 elements/heat-engine/element-deps delete mode 100755 elements/heat-engine/install.d/20-heat-crontab delete mode 100644 elements/heat-engine/install.d/heat-package-install/package-installs-heat-engine delete mode 100755 elements/heat-engine/install.d/heat-source-install/10-heat-engine delete mode 100644 elements/heat-engine/install.d/heat-source-install/package-installs-heat-engine delete mode 100755 elements/heat-engine/os-refresh-config/configure.d/90-heat-db-sync delete mode 100755 elements/heat-engine/os-refresh-config/post-configure.d/79-heat-engine delete mode 100644 elements/heat-engine/svc-map delete mode 100644 elements/heat/README.md delete mode 100755 elements/heat/cleanup.d/50-remove-source-heat delete mode 100644 elements/heat/element-deps delete mode 100644 elements/heat/environment.d/10-heat-venv-dir.bash delete mode 100755 elements/heat/install.d/heat-package-install/05-heat delete mode 100755 elements/heat/install.d/heat-source-install/05-heat delete mode 100644 elements/heat/os-apply-config/etc/heat/heat.conf delete mode 100644 elements/heat/source-repository-heat delete mode 100644 elements/horizon/README.md delete mode 100755 elements/horizon/cleanup.d/50-remove-source-horizon delete mode 100644 elements/horizon/element-deps delete mode 100644 elements/horizon/environment.d/10-horizon-venv-dir.bash delete mode 100644 elements/horizon/files/etc/httpd/conf.d/horizon.conf delete mode 100644 elements/horizon/files/etc/httpd/conf.d/ports.conf delete mode 100755 elements/horizon/install.d/horizon-package-install/100-horizon delete mode 100755 elements/horizon/install.d/horizon-source-install/100-horizon delete mode 100644 elements/horizon/os-apply-config/etc/horizon/.secret_key_store delete mode 100644 elements/horizon/os-apply-config/etc/horizon/local_settings.py delete mode 100755 elements/horizon/os-refresh-config/configure.d/20-horizon-selinux delete mode 100755 elements/horizon/os-refresh-config/configure.d/25-horizon-fedora-iptables delete mode 100755 elements/horizon/os-refresh-config/post-configure.d/14-horizon delete mode 100644 elements/horizon/source-repository-horizon delete mode 100644 elements/hosts/README.md delete mode 100644 elements/hosts/element-deps delete mode 100755 elements/hosts/os-refresh-config/configure.d/51-hosts delete mode 100644 elements/hosts/package-installs.yaml delete mode 100644 elements/hosts/pkg-map delete mode 100644 elements/icinga-core/README.md delete mode 100755 elements/icinga-core/install.d/05-icinga-core delete mode 100644 elements/icinga-web/README.md delete mode 100755 elements/icinga-web/install.d/06-icinga-web delete mode 100644 elements/ironic-api/README.md delete mode 100644 elements/ironic-api/element-deps delete mode 100644 elements/ironic-api/install.d/ironic-package-install/package-installs-ironic-api delete mode 100755 elements/ironic-api/install.d/ironic-source-install/68-ironic-api delete mode 100755 elements/ironic-api/os-refresh-config/configure.d/90-ironic-db-sync delete mode 100755 elements/ironic-api/os-refresh-config/post-configure.d/68-ironic-api delete mode 100755 elements/ironic-api/os-refresh-config/pre-configure.d/97-fedora-ironic-api-iptables delete mode 100644 elements/ironic-api/pkg-map delete mode 100644 elements/ironic-api/svc-map delete mode 100644 elements/ironic-conductor/README.md delete mode 100644 elements/ironic-conductor/element-deps delete mode 100755 elements/ironic-conductor/install.d/69-ironic-tftp-support delete mode 100644 elements/ironic-conductor/install.d/ironic-package-install/package-installs-ironic-conductor delete mode 100755 elements/ironic-conductor/install.d/ironic-source-install/68-ironic-conductor delete mode 100644 elements/ironic-conductor/os-apply-config/mnt/state/var/lib/ironic/virtual-power-key delete mode 100755 elements/ironic-conductor/os-refresh-config/post-configure.d/68-ironic-conductor delete mode 100644 elements/ironic-conductor/package-installs.yaml delete mode 100644 elements/ironic-conductor/pkg-map delete mode 100644 elements/ironic-conductor/svc-map delete mode 100644 elements/ironic/README.md delete mode 100755 elements/ironic/cleanup.d/50-remove-ironic delete mode 100644 elements/ironic/element-deps delete mode 100644 elements/ironic/environment.d/10-ironic-venv-dir.bash delete mode 100644 elements/ironic/install.d/ironic-package-install/package-installs-ironic delete mode 100755 elements/ironic/install.d/ironic-source-install/68-ironic delete mode 100644 elements/ironic/install.d/package-installs-ironic delete mode 100644 elements/ironic/os-apply-config/etc/ironic/ironic.conf delete mode 100644 elements/ironic/pkg-map delete mode 100755 elements/ironic/pre-install.d/00-ironic-disable-requiretty delete mode 100644 elements/ironic/source-repository-ironic delete mode 100644 elements/jenkins/README.md delete mode 100755 elements/jenkins/install.d/10-jenkins delete mode 100755 elements/jenkins/install.d/11-jenkins-plugins delete mode 100644 elements/jenkins/install.d/defaults delete mode 100755 elements/jenkins/pre-install.d/10-jenkins delete mode 100644 elements/keepalived/README.md delete mode 100755 elements/keepalived/bin/keepalived_vip_change.sh delete mode 100644 elements/keepalived/element-deps delete mode 100644 elements/keepalived/files/keepalived.crontab delete mode 100755 elements/keepalived/install.d/76-keepalived delete mode 100755 elements/keepalived/install.d/78-keepalived-reload delete mode 100644 elements/keepalived/install.d/package-installs-keepalived delete mode 100644 elements/keepalived/os-apply-config/etc/default/keepalived delete mode 100644 elements/keepalived/os-apply-config/etc/keepalived/keepalived.conf delete mode 100644 elements/keepalived/os-apply-config/etc/keepalived/virtual_ips delete mode 100644 elements/keepalived/os-apply-config/etc/logrotate.d/keepalived delete mode 100755 elements/keepalived/os-refresh-config/configure.d/20-keepalived-selinux delete mode 100755 elements/keepalived/os-refresh-config/configure.d/22-keepalived delete mode 100644 elements/keepalived/svc-map delete mode 100644 elements/keystone/README.md delete mode 100755 elements/keystone/cleanup-keystone-tokens.sh delete mode 100755 elements/keystone/cleanup.d/50-remove-source-keystone delete mode 100644 elements/keystone/element-deps delete mode 100644 elements/keystone/environment.d/10-keystone-venv-dir.bash delete mode 100755 elements/keystone/install.d/keystone-package-install/05-keystone delete mode 100644 elements/keystone/install.d/keystone-package-install/package-installs-keystone delete mode 100755 elements/keystone/install.d/keystone-source-install/05-keystone delete mode 100755 elements/keystone/install.d/keystone-source-install/70-keystone delete mode 100644 elements/keystone/keystone.crontab delete mode 100644 elements/keystone/os-apply-config/etc/keystone/domains/keystone.ldap.conf delete mode 100644 elements/keystone/os-apply-config/etc/keystone/keystone.conf delete mode 100644 elements/keystone/os-apply-config/mnt/state/etc/keystone/ssl/certs/ca.pem delete mode 100644 elements/keystone/os-apply-config/mnt/state/etc/keystone/ssl/certs/signing_cert.pem delete mode 100644 elements/keystone/os-apply-config/mnt/state/etc/keystone/ssl/private/signing_key.pem delete mode 100755 elements/keystone/os-refresh-config/configure.d/10-keystone-state delete mode 100755 elements/keystone/os-refresh-config/configure.d/20-keystone-selinux delete mode 100755 elements/keystone/os-refresh-config/configure.d/90-keystone-db-sync delete mode 100755 elements/keystone/os-refresh-config/post-configure.d/70-keystone delete mode 100755 elements/keystone/os-refresh-config/pre-configure.d/97-keystone-fedora-iptables delete mode 100644 elements/keystone/pkg-map delete mode 100644 elements/keystone/source-repository-keystone delete mode 100644 elements/keystone/svc-map delete mode 100644 elements/mariadb-common/README.md delete mode 100644 elements/mariadb-common/element-deps delete mode 100755 elements/mariadb-common/install.d/11-mariadb delete mode 100755 elements/mariadb-common/os-refresh-config/pre-configure.d/50-mariadb-socket delete mode 100644 elements/mariadb-dev-rpm/README.md delete mode 100644 elements/mariadb-dev-rpm/element-provides delete mode 100644 elements/mariadb-dev-rpm/install.d/package-installs-mariadb-dev-rpm delete mode 100644 elements/mariadb-dev/README.md delete mode 100644 elements/mariadb-dev/element-provides delete mode 100755 elements/mariadb-dev/environment.d/20-mariadb delete mode 100755 elements/mariadb-dev/install.d/03-mariadb-dev delete mode 100644 elements/mariadb-dev/install.d/package-installs-mariadb-dev delete mode 100755 elements/mariadb-dev/pre-install.d/05-mysql-mariadb-repo delete mode 100644 elements/mariadb-rpm/README.md delete mode 100644 elements/mariadb-rpm/element-deps delete mode 100644 elements/mariadb-rpm/element-provides delete mode 100755 elements/mariadb-rpm/install.d/10-mariadb-rpm-packages delete mode 100755 elements/mariadb-rpm/os-refresh-config/configure.d/52-mariadb-rpm-init delete mode 100644 elements/mariadb-rpm/pkg-map delete mode 100644 elements/mariadb/README.md delete mode 100644 elements/mariadb/element-deps delete mode 100644 elements/mariadb/element-provides delete mode 100755 elements/mariadb/install.d/10-mariadb-packages delete mode 100755 elements/mariadb/os-refresh-config/configure.d/52-mariadb-init delete mode 100644 elements/memcached/README.md delete mode 100644 elements/memcached/element-deps delete mode 100755 elements/memcached/install.d/74-memcached delete mode 100644 elements/memcached/install.d/package-installs-memcached delete mode 100644 elements/multipath/README.md delete mode 100644 elements/multipath/files/multipath.conf delete mode 100755 elements/multipath/install.d/90-multipath delete mode 100644 elements/multipath/pkg-map delete mode 100644 elements/mysql-common/README.md delete mode 100644 elements/mysql-common/element-deps delete mode 100755 elements/mysql-common/install.d/11-mysql-clustercheck delete mode 100644 elements/mysql-common/install.d/clustercheck delete mode 100644 elements/mysql-common/install.d/clustercheck-tripleo delete mode 100644 elements/mysql-common/install.d/mysqlchk delete mode 100644 elements/mysql-common/install.d/package-installs-mysql-common delete mode 100644 elements/mysql-common/os-apply-config/etc/ssl/mysql/from-heat.crt delete mode 100644 elements/mysql-common/os-apply-config/etc/ssl/mysql/from-heat.key delete mode 100644 elements/mysql-common/os-apply-config/mnt/state/etc/mysql/conf.d/README delete mode 100644 elements/mysql-common/os-apply-config/mnt/state/etc/mysql/conf.d/cluster.cnf delete mode 100644 elements/mysql-common/os-apply-config/mnt/state/etc/mysql/dbusers.json delete mode 100644 elements/mysql-common/os-apply-config/mnt/state/etc/mysql/debian.cnf delete mode 100644 elements/mysql-common/os-apply-config/mnt/state/etc/mysql/my.cnf delete mode 100644 elements/mysql-common/os-apply-config/mnt/state/etc/mysql/mysqlchk.my.cnf delete mode 100644 elements/mysql-common/os-apply-config/mnt/state/etc/mysql/passthru.cnf delete mode 100644 elements/mysql-common/os-apply-config/mnt/state/etc/mysql/static-dbusers.json delete mode 100644 elements/mysql-common/os-apply-config/mnt/state/root/metadata.my.cnf delete mode 100755 elements/mysql-common/os-refresh-config/configure.d/51-mysql-server-id delete mode 100755 elements/mysql-common/os-refresh-config/post-configure.d/10-mysql-permissions delete mode 100755 elements/mysql-common/os-refresh-config/post-configure.d/50-mysql-users delete mode 100755 elements/mysql-common/os-refresh-config/post-configure.d/60-mysql-secure delete mode 100755 elements/mysql-common/os-refresh-config/pre-configure.d/97-mysql-galera-iptables delete mode 100755 elements/mysql-common/os-refresh-config/pre-configure.d/97-mysql-iptables delete mode 100755 elements/mysql-common/os-refresh-config/pre-configure.d/97-mysql-selinux delete mode 100644 elements/mysql-dev/README.md delete mode 100644 elements/mysql-dev/element-deps delete mode 100755 elements/mysql-dev/install.d/03-mysql-dev delete mode 100644 elements/mysql-dev/pkg-map delete mode 100644 elements/mysql-mariadb-compat/README.md delete mode 100644 elements/mysql-mariadb-compat/element-deps delete mode 100755 elements/mysql-mariadb-compat/post-install.d/10-var-run-mysqld delete mode 100644 elements/mysql-migration/README.md delete mode 100644 elements/mysql-migration/element-deps delete mode 100644 elements/mysql-migration/os-apply-config/etc/mysql/migration_default delete mode 100644 elements/mysql-migration/os-apply-config/root/metadata.my.cnf delete mode 100755 elements/mysql-migration/os-refresh-config/migration.d/10-bootstrap-mysql delete mode 100644 elements/mysql/README.md delete mode 100644 elements/mysql/element-deps delete mode 100755 elements/mysql/install.d/10-mysql delete mode 100755 elements/mysql/install.d/20-galera-libssl-symlink delete mode 100644 elements/mysql/install.d/package-installs-mysql delete mode 100755 elements/mysql/os-refresh-config/configure.d/52-mysql-init delete mode 100755 elements/mysql/os-refresh-config/pre-configure.d/40-mysql delete mode 100644 elements/nagios3/README.md delete mode 100755 elements/nagios3/bin/refresh-nagios-from-nova delete mode 100644 elements/nagios3/element-deps delete mode 100755 elements/nagios3/install.d/17-nagios delete mode 100644 elements/nagios3/install.d/nagios3-crontab delete mode 100644 elements/nagios3/install.d/package-installs-nagios delete mode 100644 elements/nagios3/os-apply-config/etc/nagios3/nova_access_info delete mode 100755 elements/nagios3/os-refresh-config/post-configure.d/17-nagios delete mode 100644 elements/network-utils/README.md delete mode 100755 elements/network-utils/bin/ensure-bridge delete mode 100644 elements/network-utils/element-deps delete mode 100755 elements/network-utils/install.d/70-network-utils delete mode 100644 elements/neutron-dhcp-agent/README.md delete mode 100644 elements/neutron-dhcp-agent/element-deps delete mode 100755 elements/neutron-dhcp-agent/install.d/neutron-package-install/80-neutron-dhcp-agent delete mode 100755 elements/neutron-dhcp-agent/install.d/neutron-source-install/80-neutron-dhcp-agent delete mode 100755 elements/neutron-dhcp-agent/os-refresh-config/post-configure.d/80-neutron-dhcp-agent delete mode 100644 elements/neutron-network-node/README.md delete mode 100644 elements/neutron-network-node/element-deps delete mode 100755 elements/neutron-network-node/os-refresh-config/post-configure.d/80-neutron-networking delete mode 100644 elements/neutron-openvswitch-agent/README.md delete mode 100755 elements/neutron-openvswitch-agent/bin/init-neutron-ovs delete mode 100644 elements/neutron-openvswitch-agent/element-deps delete mode 100755 elements/neutron-openvswitch-agent/install.d/90-disable-upstart-network-interface-logging delete mode 100755 elements/neutron-openvswitch-agent/install.d/neutron-package-install/80-neutron-openvswitch-agent delete mode 100755 elements/neutron-openvswitch-agent/install.d/neutron-source-install/80-neutron-openvswitch-agent delete mode 100755 elements/neutron-openvswitch-agent/os-refresh-config/configure.d/21-neutron-openvswitch-agent delete mode 100755 elements/neutron-openvswitch-agent/os-refresh-config/post-configure.d/80-neutron-openvswitch-agent delete mode 100755 elements/neutron-openvswitch-agent/os-refresh-config/pre-configure.d/72-openvswitch-iptables delete mode 100644 elements/neutron-ovs-cleanup/README.md delete mode 100644 elements/neutron-ovs-cleanup/element-deps delete mode 100755 elements/neutron-ovs-cleanup/install.d/neutron-source-install/81-neutron-ovs-cleanup delete mode 100644 elements/neutron-ovs-cleanup/install.d/neutron-source-install/neutron-ovs-cleanup.conf delete mode 100644 elements/neutron-ovs-cleanup/install.d/neutron-source-install/neutron-ovs-cleanup.service delete mode 100755 elements/neutron-ovs-cleanup/os-refresh-config/post-configure.d/81-neutron-ovs-cleanup delete mode 100644 elements/neutron-router/README.md delete mode 100644 elements/neutron-router/element-deps delete mode 100755 elements/neutron-router/install.d/neutron-source-install/80-neutron-router delete mode 100755 elements/neutron-router/os-refresh-config/post-configure.d/80-neutron-router delete mode 100644 elements/neutron-router/package-installs.yaml delete mode 100644 elements/neutron-router/pkg-map delete mode 100644 elements/neutron-server/README.md delete mode 100644 elements/neutron-server/element-deps delete mode 100755 elements/neutron-server/install.d/neutron-package-install/76-neutron delete mode 100644 elements/neutron-server/install.d/neutron-package-install/package-installs-neutron-server delete mode 100755 elements/neutron-server/install.d/neutron-source-install/80-neutron-server delete mode 100755 elements/neutron-server/os-refresh-config/post-configure.d/79-neutron-server delete mode 100644 elements/neutron/README.md delete mode 100755 elements/neutron/cleanup.d/50-remove-source-neutron delete mode 100644 elements/neutron/element-deps delete mode 100644 elements/neutron/environment.d/10-neutron-venv-dir.bash delete mode 100755 elements/neutron/install.d/neutron-source-install/76-neutron delete mode 100644 elements/neutron/os-apply-config/etc/dnsmasq.d/only-lo delete mode 100644 elements/neutron/os-apply-config/etc/neutron/dhcp_agent.ini delete mode 100644 elements/neutron/os-apply-config/etc/neutron/dnsmasq/dnsmasq-neutron.conf delete mode 100644 elements/neutron/os-apply-config/etc/neutron/l3_agent.ini delete mode 100644 elements/neutron/os-apply-config/etc/neutron/metadata_agent.ini delete mode 100644 elements/neutron/os-apply-config/etc/neutron/neutron.conf delete mode 100644 elements/neutron/os-apply-config/etc/neutron/plugins/ml2/ml2_conf.ini delete mode 100644 elements/neutron/os-apply-config/etc/neutron/rootwrap.conf delete mode 100755 elements/neutron/os-refresh-config/configure.d/10-neutron-state delete mode 100755 elements/neutron/os-refresh-config/configure.d/20-neutron-selinux delete mode 100755 elements/neutron/os-refresh-config/configure.d/90-neutron-db-sync delete mode 100755 elements/neutron/os-refresh-config/pre-configure.d/97-fedora-neutron-iptables delete mode 100644 elements/neutron/source-repository-neutron delete mode 100644 elements/nfs-client/README.md delete mode 100755 elements/nfs-client/install.d/51-nfs-utils delete mode 100644 elements/nfs-client/pkg-map delete mode 100644 elements/nfs-server/README.md delete mode 100644 elements/nfs-server/element-deps delete mode 100755 elements/nfs-server/install.d/68-nfs-server delete mode 100644 elements/nfs-server/os-apply-config/etc/exports delete mode 100755 elements/nfs-server/os-refresh-config/post-configure.d/74-nfs-server delete mode 100755 elements/nfs-server/os-refresh-config/pre-configure.d/97-nfs-iptables delete mode 100644 elements/nfs-server/pkg-map delete mode 100644 elements/nova-api/README.md delete mode 100644 elements/nova-api/element-deps delete mode 100644 elements/nova-api/install.d/nova-package-install/package-installs-nova-api delete mode 100755 elements/nova-api/install.d/nova-source-install/80-nova-api delete mode 100755 elements/nova-api/os-refresh-config/configure.d/90-nova-db-sync delete mode 100755 elements/nova-api/os-refresh-config/post-configure.d/80-nova-api delete mode 100755 elements/nova-api/os-refresh-config/pre-configure.d/97-nova-api-fedora-iptables delete mode 100644 elements/nova-baremetal/README.md delete mode 100644 elements/nova-baremetal/element-deps delete mode 100755 elements/nova-baremetal/install.d/80-pxelinux delete mode 100755 elements/nova-baremetal/install.d/nova-package-install/82-nova-bm-deploy-helper-link delete mode 100755 elements/nova-baremetal/install.d/nova-source-install/81-nova-bm-services delete mode 100644 elements/nova-baremetal/os-apply-config/mnt/state/var/lib/nova/virtual-power-key delete mode 100755 elements/nova-baremetal/os-refresh-config/configure.d/80-nova-baremetal delete mode 100755 elements/nova-baremetal/os-refresh-config/configure.d/81-nat-metadata delete mode 100755 elements/nova-baremetal/os-refresh-config/configure.d/82-nova-baremetal-selinux delete mode 100755 elements/nova-baremetal/os-refresh-config/configure.d/90-nova-baremetal-db-sync delete mode 100755 elements/nova-baremetal/os-refresh-config/post-configure.d/70-enable-iscsid delete mode 100755 elements/nova-baremetal/os-refresh-config/post-configure.d/80-nova-baremetal delete mode 100755 elements/nova-baremetal/os-refresh-config/pre-configure.d/97-fedora-nova-baremetal-iptables delete mode 100644 elements/nova-compute/README.md delete mode 100644 elements/nova-compute/element-deps delete mode 100755 elements/nova-compute/install.d/nova-package-install/80-nova-compute delete mode 100755 elements/nova-compute/install.d/nova-source-install/80-nova-compute delete mode 100755 elements/nova-compute/os-refresh-config/post-configure.d/80-nova-compute delete mode 100644 elements/nova-ironic/README.md delete mode 100644 elements/nova-ironic/element-deps delete mode 100644 elements/nova-ironic/install.d/ironic-package-install/package-installs-nova-ironic delete mode 100755 elements/nova-ironic/install.d/ironic-source-install/81-nova-ironic-driver delete mode 100755 elements/nova-ironic/os-refresh-config/configure.d/81-nat-metadata delete mode 100644 elements/nova-ironic/pkg-map delete mode 100644 elements/nova-kvm/README.md delete mode 100644 elements/nova-kvm/element-deps delete mode 100755 elements/nova-kvm/install.d/81-nova-kvm delete mode 100644 elements/nova-kvm/install.d/default_libvirt_bin delete mode 100644 elements/nova-kvm/install.d/default_libvirtd delete mode 100755 elements/nova-kvm/install.d/nova-package-install/80-nova-kvm delete mode 100755 elements/nova-kvm/install.d/nova-source-install/80-nova-kvm delete mode 100644 elements/nova-kvm/install.d/nova-source-install/package-installs-nova-kvm delete mode 100644 elements/nova-kvm/os-apply-config/etc/libvirt/libvirtd.conf delete mode 100755 elements/nova-kvm/os-refresh-config/configure.d/80-nova-kvm delete mode 100755 elements/nova-kvm/os-refresh-config/post-configure.d/80-libvirt-bin delete mode 100755 elements/nova-kvm/os-refresh-config/pre-configure.d/98-nova-iptables delete mode 100644 elements/nova-novncproxy/README.md delete mode 100755 elements/nova-novncproxy/cleanup.d/50-remove-source-novnc delete mode 100644 elements/nova-novncproxy/element-deps delete mode 100644 elements/nova-novncproxy/install.d/novnc-package-install/package-installs-nova-novncproxy delete mode 100755 elements/nova-novncproxy/install.d/novnc-source-install/50-install-novnc delete mode 100755 elements/nova-novncproxy/os-refresh-config/post-configure.d/81-nova-novncproxy delete mode 100755 elements/nova-novncproxy/os-refresh-config/pre-configure.d/98-nova-novncproxy-fedora-iptables delete mode 100644 elements/nova-novncproxy/source-repository-novnc delete mode 100644 elements/nova/README.md delete mode 100755 elements/nova/cleanup.d/50-remove-source-nova delete mode 100644 elements/nova/element-deps delete mode 100644 elements/nova/environment.d/10-nova-venv-dir.bash delete mode 100755 elements/nova/install.d/nova-source-install/74-nova delete mode 100644 elements/nova/os-apply-config/etc/nova/api/nova-api.conf delete mode 100644 elements/nova/os-apply-config/etc/nova/cert/nova-cert.conf delete mode 100644 elements/nova/os-apply-config/etc/nova/compute/nova-compute.conf delete mode 100644 elements/nova/os-apply-config/etc/nova/conductor/nova-conductor.conf delete mode 100644 elements/nova/os-apply-config/etc/nova/consoleauth/nova-consoleauth.conf delete mode 100644 elements/nova/os-apply-config/etc/nova/nova.conf delete mode 100644 elements/nova/os-apply-config/etc/nova/scheduler/nova-scheduler.conf delete mode 100755 elements/nova/os-refresh-config/configure.d/10-nova-state delete mode 100755 elements/nova/os-refresh-config/configure.d/20-nova-selinux delete mode 100755 elements/nova/pre-install.d/00-nova-disable-requiretty delete mode 100644 elements/nova/source-repository-nova delete mode 100644 elements/nscd/README.md delete mode 100755 elements/nscd/install.d/90-nscd delete mode 100644 elements/openstack-clients/README.md delete mode 100755 elements/openstack-clients/bin/install-openstack-client delete mode 100755 elements/openstack-clients/cleanup.d/50-remove-source-openstack-clients delete mode 100644 elements/openstack-clients/element-deps delete mode 100755 elements/openstack-clients/environment.d/10-openstack-clients-venv-dir.bash delete mode 100755 elements/openstack-clients/install.d/50-openstack-clients delete mode 100755 elements/openstack-clients/install.d/python-ceilometerclient-package-install/51-ceilometerclient delete mode 100755 elements/openstack-clients/install.d/python-ceilometerclient-source-install/51-ceilometerclient delete mode 100755 elements/openstack-clients/install.d/python-cinderclient-package-install/51-cinderclient delete mode 100755 elements/openstack-clients/install.d/python-cinderclient-source-install/51-cinderclient delete mode 100755 elements/openstack-clients/install.d/python-glanceclient-package-install/51-glanceclient delete mode 100755 elements/openstack-clients/install.d/python-glanceclient-source-install/51-glanceclient delete mode 100755 elements/openstack-clients/install.d/python-heatclient-package-install/51-heatclient delete mode 100755 elements/openstack-clients/install.d/python-heatclient-source-install/51-heatclient delete mode 100755 elements/openstack-clients/install.d/python-ironicclient-package-install/51-ironicclient delete mode 100755 elements/openstack-clients/install.d/python-ironicclient-source-install/51-ironicclient delete mode 100755 elements/openstack-clients/install.d/python-neutronclient-package-install/51-neutronclient delete mode 100755 elements/openstack-clients/install.d/python-neutronclient-source-install/51-neutronclient delete mode 100755 elements/openstack-clients/install.d/python-novaclient-package-install/51-novaclient delete mode 100755 elements/openstack-clients/install.d/python-novaclient-source-install/51-novaclient delete mode 100755 elements/openstack-clients/install.d/python-openstackclient-package-install/51-openstackclient delete mode 100755 elements/openstack-clients/install.d/python-openstackclient-source-install/51-openstackclient delete mode 100755 elements/openstack-clients/install.d/python-swiftclient-package-install/51-swiftclient delete mode 100755 elements/openstack-clients/install.d/python-swiftclient-source-install/51-swiftclient delete mode 100755 elements/openstack-clients/install.d/python-tuskarclient-package-install/51-tuskarclient delete mode 100644 elements/openstack-clients/install.d/python-tuskarclient-source-install/51-tuskarclient delete mode 100644 elements/openstack-clients/source-repository-clients delete mode 100644 elements/openstack-db/README.md delete mode 100644 elements/openstack-db/element-deps delete mode 100755 elements/openstack-db/install.d/50-openstack-db delete mode 100644 elements/openstack-db/source-repository-openstack delete mode 100644 elements/openstack-ssl/README.md delete mode 100644 elements/openstack-ssl/element-deps delete mode 100644 elements/openstack-ssl/os-apply-config/etc/ssl/from-heat.crt delete mode 100644 elements/openstack-ssl/os-apply-config/etc/ssl/from-heat.key delete mode 100644 elements/openstack-ssl/os-apply-config/etc/stunnel/from-heat.conf delete mode 100755 elements/openstack-ssl/os-refresh-config/pre-configure.d/70-stunnel-permissions delete mode 100644 elements/openvswitch-datapath/README.md delete mode 100644 elements/openvswitch-datapath/element-deps delete mode 100755 elements/openvswitch-datapath/install.d/75-openvswitch-datapath delete mode 100644 elements/openvswitch-datapath/pkg-map delete mode 100644 elements/os-is-bootstrap-host/README.md delete mode 100755 elements/os-is-bootstrap-host/bin/os-is-bootstrap-host delete mode 100644 elements/pacemaker/README.md delete mode 100755 elements/pacemaker/bin/pcmk-service-create delete mode 100644 elements/pacemaker/element-deps delete mode 100644 elements/pacemaker/install.d/package-installs-pacemaker delete mode 100644 elements/pacemaker/os-apply-config/etc/corosync/service.d/pacemaker delete mode 100755 elements/pacemaker/os-refresh-config/post-configure.d/15-pacemaker delete mode 100755 elements/pacemaker/os-refresh-config/post-configure.d/16-base-opts-pacemaker delete mode 100644 elements/postfix/README.md delete mode 100644 elements/postfix/element-deps delete mode 100644 elements/postfix/install.d/package-installs-postfix delete mode 100644 elements/postfix/os-apply-config/etc/mailname delete mode 100644 elements/postfix/os-apply-config/etc/postfix/main.cf delete mode 100755 elements/postfix/os-refresh-config/configure.d/59-postfix delete mode 100755 elements/postfix/os-refresh-config/post-configure.d/59-postfix delete mode 100755 elements/postfix/pre-install.d/59-postfix delete mode 100644 elements/pypi-mirror/README.md delete mode 100644 elements/pypi-mirror/element-deps delete mode 100755 elements/pypi-mirror/install.d/50-pypi-mirror delete mode 100644 elements/pypi-mirror/source-repository-pypi-mirror delete mode 100644 elements/pypi-openstack/README.md delete mode 100755 elements/pypi-openstack/post-install.d/00-unconfigure-openstack-pypi-mirror delete mode 100755 elements/pypi-openstack/pre-install.d/00-configure-openstack-pypi-mirror delete mode 100644 elements/qpidd/README.md delete mode 100644 elements/qpidd/element-deps delete mode 100755 elements/qpidd/install.d/20-qpidd delete mode 100644 elements/qpidd/os-apply-config/etc/qpid/qpidd.acl delete mode 100755 elements/qpidd/os-refresh-config/post-configure.d/73-qpidd delete mode 100644 elements/rabbitmq-server/README.md delete mode 100755 elements/rabbitmq-server/bin/rabbitmq_is_in_cluster delete mode 100755 elements/rabbitmq-server/bin/rabbitmq_join_cluster delete mode 100755 elements/rabbitmq-server/bin/rabbitmq_reset_node delete mode 100755 elements/rabbitmq-server/bin/rabbitmq_size_of_cluster delete mode 100644 elements/rabbitmq-server/element-deps delete mode 100644 elements/rabbitmq-server/files/etc/init/rabbitmq-server.conf delete mode 100644 elements/rabbitmq-server/files/etc/rabbitmq/rabbitmq-env.conf delete mode 100755 elements/rabbitmq-server/install.d/20-rabbitmq-server delete mode 100644 elements/rabbitmq-server/install.d/package-installs-rabbitmq-server delete mode 100644 elements/rabbitmq-server/os-apply-config/etc/rabbitmq/heat_password_handle delete mode 100644 elements/rabbitmq-server/os-apply-config/etc/rabbitmq/heat_users.json delete mode 100644 elements/rabbitmq-server/os-apply-config/etc/rabbitmq/rabbitmq.config delete mode 100644 elements/rabbitmq-server/os-apply-config/etc/security/limits.d/rabbitmq_limits.conf delete mode 100644 elements/rabbitmq-server/os-apply-config/var/lib/rabbitmq/.erlang.cookie delete mode 100644 elements/rabbitmq-server/os-apply-config/var/lib/rabbitmq/.erlang.cookie.oac delete mode 100755 elements/rabbitmq-server/os-refresh-config/configure.d/20-rabbitmq-server-selinux delete mode 100755 elements/rabbitmq-server/os-refresh-config/post-configure.d/51-rabbitmq delete mode 100755 elements/rabbitmq-server/os-refresh-config/post-configure.d/52-rabbitmq-passwords delete mode 100755 elements/rabbitmq-server/os-refresh-config/pre-configure.d/97-rabbitmq-server-fedora-iptables delete mode 100755 elements/rabbitmq-server/os-refresh-config/pre-configure.d/98-rabbitmq-iptables delete mode 100644 elements/rally/README.md delete mode 100644 elements/rally/element-deps delete mode 100644 elements/rally/environment.d/10-rally-venv-dir.bash delete mode 100755 elements/rally/install.d/rally-source-install/51-rally delete mode 100644 elements/rally/source-repository-rally delete mode 100644 elements/rdo-release/README.md delete mode 100644 elements/rdo-release/environment.d/10-rdo-release-name.bash delete mode 100755 elements/rdo-release/pre-install.d/10-rdo-release-repo delete mode 100644 elements/remove-serial-console/README.md delete mode 100755 elements/remove-serial-console/finalise.d/60-purge-serial-console delete mode 100644 elements/restore-ssh-host-keys/README.md delete mode 100644 elements/restore-ssh-host-keys/element-deps delete mode 100755 elements/restore-ssh-host-keys/os-refresh-config/pre-configure.d/10-restore-ssh-host-keys delete mode 100644 elements/salt-master/README.md delete mode 100755 elements/salt-master/install.d/10-salt-master delete mode 100755 elements/salt-master/pre-install.d/10-salt-master delete mode 100644 elements/salt-minion/README.md delete mode 100755 elements/salt-minion/install.d/10-salt-minion delete mode 100755 elements/salt-minion/pre-install.d/10-salt-minion delete mode 100644 elements/seed-debug-logging/README.md delete mode 100644 elements/seed-debug-logging/debug.json delete mode 100644 elements/seed-debug-logging/element-deps delete mode 100755 elements/seed-debug-logging/install.d/02-seed-debug-logging delete mode 100644 elements/seed-stack-config/README.md delete mode 100644 elements/seed-stack-config/config.json delete mode 100644 elements/seed-stack-config/element-deps delete mode 100755 elements/seed-stack-config/install.d/01-seed-stack-heat-metadata delete mode 100755 elements/seed-stack-config/install.d/11-seed-stack-heat-metadata delete mode 100644 elements/seed-stack-config/os-apply-config/var/opt/seed-stack/masquerade delete mode 100755 elements/seed-stack-config/os-refresh-config/post-configure.d/80-seedstack-masquerade delete mode 100644 elements/selinux/README.md delete mode 100755 elements/selinux/bin/add-selinux-file-context delete mode 100755 elements/selinux/bin/add-selinux-path-substitution delete mode 100755 elements/selinux/bin/restore-selinux-file-context delete mode 100644 elements/selinux/custom-policies/tripleo-selinux-keepalived.te delete mode 100644 elements/selinux/custom-policies/tripleo-selinux-keystone.te delete mode 100644 elements/selinux/custom-policies/tripleo-selinux-mariadb.te delete mode 100644 elements/selinux/custom-policies/tripleo-selinux-neutron.te delete mode 100644 elements/selinux/custom-policies/tripleo-selinux-nova.te delete mode 100644 elements/selinux/custom-policies/tripleo-selinux-openvswitch.te delete mode 100644 elements/selinux/custom-policies/tripleo-selinux-rabbitmq.te delete mode 100644 elements/selinux/custom-policies/tripleo-selinux-rhsmcertd.te delete mode 100644 elements/selinux/custom-policies/tripleo-selinux-ssh.te delete mode 100644 elements/selinux/custom-policies/tripleo-selinux-swift.te delete mode 100755 elements/selinux/install.d/100-install-custom-selinux-policies delete mode 100755 elements/selinux/os-refresh-config/configure.d/20-compile-and-install-selinux-policies delete mode 100644 elements/snmpd/README.md delete mode 100644 elements/snmpd/element-deps delete mode 100755 elements/snmpd/files/check_proc_open_files.py delete mode 100644 elements/snmpd/files/snmp delete mode 100755 elements/snmpd/install.d/67-snmpd delete mode 100644 elements/snmpd/os-apply-config/etc/default/snmpd delete mode 100644 elements/snmpd/os-apply-config/etc/snmp/snmpd.conf delete mode 100755 elements/snmpd/os-refresh-config/post-configure.d/67-snmpd delete mode 100644 elements/snmpd/pkg-map delete mode 100644 elements/sosreport/README.md delete mode 100755 elements/sosreport/cleanup.d/90-sos-tmp-plugins delete mode 100755 elements/sosreport/environment.d/90-sos-plugins-env delete mode 100755 elements/sosreport/extra-data.d/90-sos-plugins delete mode 100755 elements/sosreport/install.d/65-sosreport delete mode 100644 elements/sosreport/pkg-map delete mode 100644 elements/squid/README.md delete mode 100644 elements/squid/element-deps delete mode 100755 elements/squid/install.d/30-squid delete mode 100644 elements/squid/os-apply-config/etc/squid/squid.conf delete mode 100755 elements/squid/os-refresh-config/post-configure.d/80-squid delete mode 100755 elements/squid/os-refresh-config/pre-configure.d/97-squid-iptables delete mode 100644 elements/ssl-ca/README.md delete mode 100644 elements/ssl-ca/os-apply-config/etc/ssl/from-heat-ca.crt delete mode 100755 elements/ssl-ca/os-refresh-config/configure.d/51-ssl-load-ca-certs delete mode 100644 elements/stackuser/README.md delete mode 100755 elements/stackuser/install.d/50-user delete mode 100644 elements/stunnel/README.md delete mode 100644 elements/stunnel/files/usr/lib/systemd/system/stunnel4.service delete mode 100755 elements/stunnel/install.d/70-install-stunnel delete mode 100755 elements/stunnel/os-refresh-config/configure.d/21-restart-stunnel delete mode 100644 elements/swift-proxy/README.md delete mode 100755 elements/swift-proxy/check_mk_checks/swift_proxy_healthcheck.py delete mode 100644 elements/swift-proxy/element-deps delete mode 100755 elements/swift-proxy/install.d/swift-package-install/76-swift-proxy delete mode 100755 elements/swift-proxy/install.d/swift-source-install/76-swift-proxy delete mode 100644 elements/swift-proxy/os-apply-config/etc/swift/proxy-server.conf delete mode 100755 elements/swift-proxy/os-refresh-config/post-configure.d/74-swift-proxy delete mode 100644 elements/swift-proxy/os-refresh-config/pre-configure.d/72-swift-proxy-iptables delete mode 100644 elements/swift-ring/README.md delete mode 100644 elements/swift-ring/element-deps delete mode 100644 elements/swift-ring/environment.d/10-swift-ring-venv-dir.bash delete mode 100755 elements/swift-ring/install.d/swift-package-install/75-swift-ring delete mode 100755 elements/swift-ring/install.d/swift-source-install/75-swift-ring delete mode 100644 elements/swift-ring/pkg-map delete mode 100644 elements/swift-ring/source-repository-swift delete mode 100644 elements/swift-storage/README.md delete mode 100644 elements/swift-storage/element-deps delete mode 100755 elements/swift-storage/install.d/76-swift-storage-common delete mode 100644 elements/swift-storage/install.d/package-installs-swift-storage delete mode 100644 elements/swift-storage/install.d/swift-package-install/package-installs-swift-storage delete mode 100755 elements/swift-storage/install.d/swift-source-install/76-swift-storage delete mode 100644 elements/swift-storage/os-apply-config/etc/rsyncd.conf delete mode 100644 elements/swift-storage/os-apply-config/etc/swift/account-server.conf delete mode 100644 elements/swift-storage/os-apply-config/etc/swift/container-server.conf delete mode 100644 elements/swift-storage/os-apply-config/etc/swift/object-server.conf delete mode 100755 elements/swift-storage/os-refresh-config/configure.d/10-swift-storage-state delete mode 100755 elements/swift-storage/os-refresh-config/configure.d/15-swift-storage-location delete mode 100755 elements/swift-storage/os-refresh-config/configure.d/20-swift-storage-selinux delete mode 100755 elements/swift-storage/os-refresh-config/configure.d/21-swift-storage-iptables delete mode 100755 elements/swift-storage/os-refresh-config/post-configure.d/74-swift-storage delete mode 100644 elements/swift/README.md delete mode 100755 elements/swift/cleanup.d/50-remove-source-swift delete mode 100644 elements/swift/element-deps delete mode 100644 elements/swift/environment.d/10-swift-venv-dir.bash delete mode 100644 elements/swift/install.d/swift-package-install/package-installs-swift delete mode 100755 elements/swift/install.d/swift-source-install/75-swift delete mode 100755 elements/swift/install.d/swift-source-install/76-swift-cffi delete mode 100644 elements/swift/install.d/swift-source-install/package-installs-swift delete mode 100644 elements/swift/os-apply-config/etc/swift/swift.conf delete mode 100755 elements/swift/os-refresh-config/configure.d/20-swift-selinux delete mode 100755 elements/swift/os-refresh-config/configure.d/73-swift delete mode 100644 elements/swift/source-repository-swift delete mode 100644 elements/sysctl/README.md delete mode 100755 elements/sysctl/bin/sysctl-append-value delete mode 100755 elements/sysctl/bin/sysctl-set-value delete mode 100755 elements/sysctl/bin/sysctl-write-value delete mode 100644 elements/sysctl/element-deps delete mode 100755 elements/sysctl/install.d/10-sysctl-install delete mode 100755 elements/sysctl/os-refresh-config/configure.d/10-sysctl-apply-config delete mode 100644 elements/tempest/README.md delete mode 100755 elements/tempest/bin/run-tempest delete mode 100755 elements/tempest/cleanup.d/50-remove-source-tempest delete mode 100644 elements/tempest/element-deps delete mode 100644 elements/tempest/environment.d/10-tempest-venv-dir.bash delete mode 100755 elements/tempest/install.d/51-tempest delete mode 100644 elements/tempest/install.d/package-installs-tempest delete mode 100644 elements/tempest/os-apply-config/etc/tempestrunrc delete mode 100644 elements/tempest/os-apply-config/opt/stack/tempest/etc/tempest.conf delete mode 100644 elements/tempest/pkg-map delete mode 100644 elements/tempest/source-repository-tempest delete mode 100755 elements/tempest/tests2skip.py delete mode 100644 elements/tempest/tests2skip.txt delete mode 100644 elements/tripleo-cd/README.md delete mode 100755 elements/tripleo-cd/bin/deploy-testenv delete mode 100755 elements/tripleo-cd/bin/prepare-ci-overcloud delete mode 100755 elements/tripleo-cd/bin/tripleo-cd.sh delete mode 100644 elements/tripleo-cd/configs/hp1_ci_env.json delete mode 100644 elements/tripleo-cd/configs/hp1_networks.json delete mode 100644 elements/tripleo-cd/configs/hp1_oc_env.json delete mode 100644 elements/tripleo-cd/configs/hp1_uc_env.json delete mode 100644 elements/tripleo-cd/configs/hp2_ci_env.json delete mode 100644 elements/tripleo-cd/configs/hp2_networks.json delete mode 100644 elements/tripleo-cd/configs/hp2_oc_env.json delete mode 100644 elements/tripleo-cd/configs/hp2_uc_env.json delete mode 100755 elements/tripleo-cd/configs/te_commonrc delete mode 100755 elements/tripleo-cd/configs/te_hp1rc delete mode 100644 elements/tripleo-cd/configs/te_hp2rc delete mode 100755 elements/tripleo-cd/configs/te_localrc delete mode 100755 elements/tripleo-cd/configs/te_rh1rc delete mode 100755 elements/tripleo-cd/deploy-ci-overcloud delete mode 100644 elements/tripleo-cd/element-deps delete mode 100755 elements/tripleo-cd/install.d/10-tripleo-cd delete mode 100644 elements/tripleo-cd/source-repository-tripleo-incubator delete mode 100644 elements/tripleo-heat-templates/README.md delete mode 100644 elements/tripleo-heat-templates/element-deps delete mode 100755 elements/tripleo-heat-templates/install.d/tripleo-heat-templates-package-install/10-tripleo-heat-templates delete mode 100644 elements/tripleo-heat-templates/pkg-map delete mode 100644 elements/tripleo-heat-templates/source-repository-tripleo-heat-templates delete mode 100644 elements/tripleo-staging/README.md delete mode 100755 elements/tripleo-staging/pre-install.d/01-bleeding-edge delete mode 100644 elements/trove-api/README.md delete mode 100644 elements/trove-api/element-deps delete mode 100755 elements/trove-api/install.d/trove-source-install/80-trove-api delete mode 100644 elements/trove-api/os-apply-config/etc/trove/api-paste.ini delete mode 100644 elements/trove-api/os-apply-config/etc/trove/guestagent_image delete mode 100644 elements/trove-api/os-apply-config/etc/trove/trove.conf delete mode 100755 elements/trove-api/os-refresh-config/post-configure.d/82-trove-api delete mode 100755 elements/trove-api/os-refresh-config/post-configure.d/83-trove-update-image delete mode 100755 elements/trove-api/os-refresh-config/pre-configure.d/99-trove-api-fedora-iptables delete mode 100644 elements/trove/README.md delete mode 100644 elements/trove/element-deps delete mode 100644 elements/trove/environment.d/10-trove-venv-dir.bash delete mode 100755 elements/trove/install.d/trove-source-install/77-trove delete mode 100755 elements/trove/os-refresh-config/configure.d/16-trove-state delete mode 100644 elements/trove/source-repository-trove delete mode 100644 elements/use-ephemeral/README.md delete mode 100755 elements/use-ephemeral/bin/register-state-path delete mode 100644 elements/use-ephemeral/element-deps delete mode 100755 elements/use-ephemeral/finalise.d/00-cleanup-stateful-paths delete mode 100755 elements/use-ephemeral/os-refresh-config/pre-configure.d/00-fix-ephemeral-mount delete mode 100755 elements/use-ephemeral/os-refresh-config/pre-configure.d/01-setup-stateful-paths diff --git a/elements/ansible/README.md b/elements/ansible/README.md deleted file mode 100644 index 36e28da01..000000000 --- a/elements/ansible/README.md +++ /dev/null @@ -1,12 +0,0 @@ -Install Ansible. - -Configuration -------------- - -At Present there is no configuration for this element. - -Ansible Version ---------------- - -By default this installs ansible 1.8.1, but the environment variable -ANSIBLE_VERSION can be set to override the installed version of Ansible. diff --git a/elements/ansible/cleanup.d/50-remove-source-ansible b/elements/ansible/cleanup.d/50-remove-source-ansible deleted file mode 100755 index 5a8d8b4cd..000000000 --- a/elements/ansible/cleanup.d/50-remove-source-ansible +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eu - -sudo rm -fr "${TMP_MOUNT_PATH}/opt/stack/tripleo-ansible" diff --git a/elements/ansible/element-deps b/elements/ansible/element-deps deleted file mode 100644 index 7c8922a0b..000000000 --- a/elements/ansible/element-deps +++ /dev/null @@ -1 +0,0 @@ -pip-and-virtualenv diff --git a/elements/ansible/environment.d/10-ansible-venv-dir.bash b/elements/ansible/environment.d/10-ansible-venv-dir.bash deleted file mode 100755 index 3eb9403a6..000000000 --- a/elements/ansible/environment.d/10-ansible-venv-dir.bash +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -ue - -export ANSIBLE_VENV_DIR=${ANSIBLE_VENV_DIR:-"/opt/stack/venvs/ansible"} diff --git a/elements/ansible/install.d/ansible-package-install/30-ansible-package b/elements/ansible/install.d/ansible-package-install/30-ansible-package deleted file mode 100644 index 99caabc73..000000000 --- a/elements/ansible/install.d/ansible-package-install/30-ansible-package +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -eux - -install-packages ansible diff --git a/elements/ansible/install.d/ansible-source-install/30-ansible-source b/elements/ansible/install.d/ansible-source-install/30-ansible-source deleted file mode 100755 index 679f54053..000000000 --- a/elements/ansible/install.d/ansible-source-install/30-ansible-source +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -# -# Copyright 2014 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# - -set -eux -set -o pipefail - -ANSIBLE_VERSION=${ANSIBLE_VERSION:-1.8.1} - -install-packages build-essential libssl-dev libyaml-dev python-dev libxml2-dev libxslt-dev libffi-dev - -virtualenv $ANSIBLE_VENV_DIR - -set +u -source $ANSIBLE_VENV_DIR/bin/activate -set -u - -$ANSIBLE_VENV_DIR/bin/pip install paramiko PyYAML jinja2 httplib2 - -$ANSIBLE_VENV_DIR/bin/pip install ansible==${ANSIBLE_VERSION} - -ln -s $ANSIBLE_VENV_DIR/bin/ansible /usr/local/bin/ansible -ln -s $ANSIBLE_VENV_DIR/bin/ansible-playbook /usr/local/bin/ansible-playbook diff --git a/elements/apache2/README.md b/elements/apache2/README.md deleted file mode 100644 index 262f85957..000000000 --- a/elements/apache2/README.md +++ /dev/null @@ -1,13 +0,0 @@ -Installs Apache2 from packages. - -Will generate Snakeoil self signed ssl certs if the provided PEM file is -unable to pass basic validity check. - -The Snakeoil SSL cert can be configured via Heat Metadata. For example: - - apache2: - snakeoil_pem: ----- BEGIN PlaceHolder... - snakeoil_key: ----- BEGIN PlaceHolder... - -Sample usage shown in nagios3 template at: - https://git.openstack.org/cgit/openstack/tripleo-heat-templates diff --git a/elements/apache2/element-deps b/elements/apache2/element-deps deleted file mode 100644 index 269283a41..000000000 --- a/elements/apache2/element-deps +++ /dev/null @@ -1,4 +0,0 @@ -os-apply-config -os-refresh-config -os-svc-install -package-installs diff --git a/elements/apache2/install.d/15-apache2 b/elements/apache2/install.d/15-apache2 deleted file mode 100755 index a539f45f8..000000000 --- a/elements/apache2/install.d/15-apache2 +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -# install apache2 - -set -eux - -if [ -f /etc/debian_version ]; then - install-packages ssl-cert -fi diff --git a/elements/apache2/install.d/package-installs-apache2 b/elements/apache2/install.d/package-installs-apache2 deleted file mode 100644 index 5bd8e213a..000000000 --- a/elements/apache2/install.d/package-installs-apache2 +++ /dev/null @@ -1 +0,0 @@ -apache2 diff --git a/elements/apache2/os-apply-config/etc/ssl/certs/ssl-cert-snakeoil.pem b/elements/apache2/os-apply-config/etc/ssl/certs/ssl-cert-snakeoil.pem deleted file mode 100644 index 6c39ed43c..000000000 --- a/elements/apache2/os-apply-config/etc/ssl/certs/ssl-cert-snakeoil.pem +++ /dev/null @@ -1 +0,0 @@ -{{apache2.snakeoil_pem}} \ No newline at end of file diff --git a/elements/apache2/os-apply-config/etc/ssl/private/ssl-cert-snakeoil.key b/elements/apache2/os-apply-config/etc/ssl/private/ssl-cert-snakeoil.key deleted file mode 100644 index acf8e051c..000000000 --- a/elements/apache2/os-apply-config/etc/ssl/private/ssl-cert-snakeoil.key +++ /dev/null @@ -1 +0,0 @@ -{{apache2.snakeoil_key}} \ No newline at end of file diff --git a/elements/apache2/os-refresh-config/post-configure.d/13-apache2 b/elements/apache2/os-refresh-config/post-configure.d/13-apache2 deleted file mode 100755 index 1460cbf79..000000000 --- a/elements/apache2/os-refresh-config/post-configure.d/13-apache2 +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -set -eux - -if [ -f /etc/debian_version ]; then - openssl_cmd="openssl" - cert_create_cmd="make-ssl-cert generate-default-snakeoil --force-overwrite" - snakeoil_pem_file='/etc/ssl/certs/ssl-cert-snakeoil.pem' - if [ -f $snakeoil_pem_file ]; then - # check if snakeoil pem file is valid - cert_chk_cmd="$openssl_cmd x509 -noout -in $snakeoil_pem_file" - exit_error=0 - cmd_run=$($cert_chk_cmd) || exit_error=1 - if [ $exit_error -ne 0 ]; then - # Snakeoil cert is there but not valid. - exit_error=0 - cmd_run=$($cert_create_cmd) || exit_error=1 - fi - if [ $exit_error -eq 0 ]; then - # we should have valid certs. Now enable ssl in apache2 - cmd="a2enmod ssl" - cmd_run=$($cmd) || exit_error=2 - if [ $exit_error -eq 0 ]; then - # Activate apache default ssl - cmd="a2ensite default-ssl" - cmd_run=$($cmd) || exit_error=3 - fi - fi - if [ $exit_error -ne 0 ]; then - # error setting up ssl - echo "Error encountered setting up SSL (exit_error=$exit_error)" - fi - fi -fi - -# Pick up on any config changes other elements may have done -# if service is not running reload isnt sufficient, so restart -if [ -f /etc/debian_version ]; then - service apache2 reload || service apache2 restart -elif [ -f /etc/yum.conf ]; then - service httpd reload || service httpd restart -fi diff --git a/elements/apache2/post-install.d/15-apache2 b/elements/apache2/post-install.d/15-apache2 deleted file mode 100755 index da5c6a019..000000000 --- a/elements/apache2/post-install.d/15-apache2 +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -eux - -os-svc-enable -an apache2 diff --git a/elements/apache2/svc-map b/elements/apache2/svc-map deleted file mode 100644 index 67b46c3b5..000000000 --- a/elements/apache2/svc-map +++ /dev/null @@ -1,3 +0,0 @@ -apache2: - default: apache2 - redhat: httpd diff --git a/elements/bandersnatch/README.md b/elements/bandersnatch/README.md deleted file mode 100644 index 1b343332b..000000000 --- a/elements/bandersnatch/README.md +++ /dev/null @@ -1,8 +0,0 @@ -Element to install bandersnatch - -Installs a bandersnatch pypi mirror in the image, when booted a cronjob will -populate the mirror and keep it up to date. - -Note: Booting an image including this element will result in a full mirror -of https://pypi.python.org (over 100G of data being downloaded), do not -do this unless that is your intention. diff --git a/elements/bandersnatch/element-deps b/elements/bandersnatch/element-deps deleted file mode 100644 index 7064e8754..000000000 --- a/elements/bandersnatch/element-deps +++ /dev/null @@ -1,5 +0,0 @@ -apache2 -os-svc-install -pip-and-virtualenv -source-repositories -use-ephemeral diff --git a/elements/bandersnatch/install.d/76-bandersnatch b/elements/bandersnatch/install.d/76-bandersnatch deleted file mode 100755 index 78e4b16f2..000000000 --- a/elements/bandersnatch/install.d/76-bandersnatch +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -set -eu - -mkdir -p /opt/stack /srv/pypi/web - -virtualenv /opt/stack/bandersnatch -/opt/stack/bandersnatch/bin/pip install bandersnatch -ln -s /opt/stack/bandersnatch/bin/bandersnatch /usr/local/bin/bandersnatch -register-state-path --leave-symlink /srv/pypi/web - -# Run bandersnatch once to create a config file -/usr/local/bin/bandersnatch mirror || true - -# Run bandersnatch every hour -echo "0 * * * * root flock -n /var/run/bandersnatch -c \"/usr/local/bin/bandersnatch mirror >> /var/log/bandersnatch 2>&1\"" > /etc/cron.d/bandersnatch -chmod 755 /etc/cron.d/bandersnatch - -HTTPDCONFFILE=/etc/httpd/conf.d/bandersnatch.conf -if [ -d /etc/apache2/sites-enabled ]; then - HTTPDCONFFILE=/etc/apache2/sites-enabled/bandersnatch.conf -fi - -cat > $HTTPDCONFFILE<<'EOF' -Alias /pypi /srv/pypi/web - - Options Indexes - AllowOverride None - Require all granted - -EOF diff --git a/elements/bandersnatch/os-refresh-config/post-configure.d/50-bandersnatch b/elements/bandersnatch/os-refresh-config/post-configure.d/50-bandersnatch deleted file mode 100755 index 3e3c273b6..000000000 --- a/elements/bandersnatch/os-refresh-config/post-configure.d/50-bandersnatch +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -# Start building mirror in the background, this can take hours and downloads over 100G of data -flock -n /var/run/bandersnatch -c \ - "/usr/local/bin/bandersnatch mirror >> /var/log/bandersnatch 2>&1" & diff --git a/elements/bm-dnsmasq/README.md b/elements/bm-dnsmasq/README.md deleted file mode 100644 index ae2a3f936..000000000 --- a/elements/bm-dnsmasq/README.md +++ /dev/null @@ -1,12 +0,0 @@ -Non-PXE Neutron DHCP workaround -------------------------------- - -Separate pool based dnsmasq to workaround old Neutron not supporting PXE -booting, which is restarted during os-refresh-config. - -Installs a filter-bootps cronjob. filter-bootps adds an iptables filter to the -br-ctlplane bridge interface, ensuring that only bootps requests from nodes -registered with nova baremetal are received by services running in the image. -This prevents the seed node from trying to PXE boot overcloud nodes (rather -than the undercloud node doing so). - diff --git a/elements/bm-dnsmasq/bin/filter-bootps b/elements/bm-dnsmasq/bin/filter-bootps deleted file mode 100755 index 0e90390c6..000000000 --- a/elements/bm-dnsmasq/bin/filter-bootps +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -# -# Idempotently build an IPTables chain which will filter to only permitted MAC -# addresses, on incoming BOOTP requests on the control plane interface. - -set -eux - -INTERFACE=br-ctlplane -. /root/stackrc -MACS=$(for node in $(nova baremetal-node-list | grep -v '+\|ID' | awk ' { print $2 } '); do nova baremetal-interface-list $node | awk '/:/ { print $8}' ; done) - -# In case this script crashed earlier, flush, unlink and delete the temp chain. -iptables -F FILTERBOOTPSNEW || true -iptables -D INPUT -i $INTERFACE -p udp --dport 67 -j FILTERBOOTPSNEW || true -iptables -X FILTERBOOTPSNEW || true -iptables -N FILTERBOOTPSNEW -# Build the chain we want. -for MAC in $MACS; do - iptables -A FILTERBOOTPSNEW -m mac --mac-source $MAC -j ACCEPT -done -# Drop rather than reject as this is a broadcast protocol: we'd just be -# creating noise on the network. -iptables -A FILTERBOOTPSNEW -j DROP -# Link it in. -iptables -I INPUT -i $INTERFACE -p udp --dport 67 -j FILTERBOOTPSNEW -# Delete the old chain if present. -iptables -F FILTERBOOTPS || true -iptables -D INPUT -i $INTERFACE -p udp --dport 67 -j FILTERBOOTPS || true -iptables -X FILTERBOOTPS || true -# Rename the new chain into permanence. -iptables -E FILTERBOOTPSNEW FILTERBOOTPS diff --git a/elements/bm-dnsmasq/element-deps b/elements/bm-dnsmasq/element-deps deleted file mode 100644 index 72968011b..000000000 --- a/elements/bm-dnsmasq/element-deps +++ /dev/null @@ -1,4 +0,0 @@ -nova-compute -os-refresh-config -os-svc-install -package-installs diff --git a/elements/bm-dnsmasq/install.d/75-filter-bootps-cronjob b/elements/bm-dnsmasq/install.d/75-filter-bootps-cronjob deleted file mode 100755 index 60e8fdbfc..000000000 --- a/elements/bm-dnsmasq/install.d/75-filter-bootps-cronjob +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -ue - -install -m 0755 -o root -g root $(dirname $0)/../bin/filter-bootps /usr/local/bin/filter-bootps -cat > /etc/cron.d/filter-bootps < /etc/init/nova-bm-dnsmasq.conf << eof -start on runlevel [2345] -stop on runlevel [016] -pre-start script - mkdir -p /tftpboot - chown -R nova:nova /tftpboot - killall -9 dnsmasq || echo 'no dnsmasq running' -end script - -respawn -respawn limit 2 5 - -script - exec dnsmasq --conf-file= \\ - --keep-in-foreground \\ - --port=0 \\ - --dhcp-boot=pxelinux.0 \\ - --bind-interfaces \\ - --pid-file=/var/run/dnsmasq.pid \\ - --interface=br-ctlplane \\ - --dhcp-range=192.0.2.65,192.0.2.69,29 -end script -post-start exec sleep 1 -eof -} - -function install_dnsmasq_systemd() { - cat > /lib/systemd/system/nova-bm-dnsmasq.service << eof -[Unit] -Description=Nova dnsmasq service -After=openvswitch.service - -[Service] -Type=forking -ExecStartPre=-/bin/killall -9 dnsmasq -ExecStart=/sbin/dnsmasq --conf-file= \\ - --port=0 \\ - --enable-tftp \\ - --tftp-root=/tftpboot \\ - --dhcp-boot=pxelinux.0 \\ - --bind-interfaces \\ - --pid-file=/var/run/dnsmasq.pid \\ - --interface=br-ctlplane \\ - --dhcp-range=192.0.2.65,192.0.2.69,29 - -[Install] -WantedBy=multi-user.target -Alias=nova-bm-dnsmasq.service -eof - -} - -if [ "$DIB_INIT_SYSTEM" = "upstart" ]; then - install_dnsmasq_upstart -elif [ "$DIB_INIT_SYSTEM" = "systemd" ]; then - install_dnsmasq_systemd -fi -os-svc-enable -n nova-bm-dnsmasq diff --git a/elements/bm-dnsmasq/install.d/package-installs-bm-dnsmasq b/elements/bm-dnsmasq/install.d/package-installs-bm-dnsmasq deleted file mode 100644 index d5e02a666..000000000 --- a/elements/bm-dnsmasq/install.d/package-installs-bm-dnsmasq +++ /dev/null @@ -1,2 +0,0 @@ -dnsmasq -dnsmasq-utils diff --git a/elements/bm-dnsmasq/os-refresh-config/post-configure.d/80-bm-dnsmasq b/elements/bm-dnsmasq/os-refresh-config/post-configure.d/80-bm-dnsmasq deleted file mode 100755 index 360edc80c..000000000 --- a/elements/bm-dnsmasq/os-refresh-config/post-configure.d/80-bm-dnsmasq +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -eux - -service nova-bm-dnsmasq restart diff --git a/elements/boot-stack/README.md b/elements/boot-stack/README.md deleted file mode 100644 index 40ca27d4b..000000000 --- a/elements/boot-stack/README.md +++ /dev/null @@ -1,59 +0,0 @@ -A self-contained one-node openstack. - -Description ------------ - -This element contains nova, glance, and keystone services. - -When building an image containing boot-stack be sure to add either nova-kvm or -nova-baremetal to enabled the appropriate hypervisor. - -The seed-stack-config element can be used to configure boot-stack in the -absence of Heat. - - -Basic Usage ------------ - -See this doc for basic usage instructions: - http://docs.openstack.org/developer/tripleo-incubator/devtest.html - - -Credentials ------------ - -OpenStack credentials are installed to /root/stackrc in the boot-stack machine, -for automation needing them w/in the instance. Credentials are set from -metadata, so consult config.json or your heat parameters. - - -Utilities ---------- - -The following utilities are available in the running boot-stack machine: - -`reset-db` - Clear all openstack databases. - -`boot-stack-logs` - Start a screen session which tails important logs. - - -Configuration -------------- - -For setting up keystone, `controller-address` can be set to an explicit -address that will be used to control the endpoints for the initial -cloud. If it is not set, the default is to try and determine the address -from the default network interface configuration. - -Here is an example of its usage in Heat Metadata: - - controller-address: - Fn::GetAtt: [ ControllerResource, PublicIp ] - -Note that if you are feeding this Metadata to ControllerResource it -will not be fed into the process until the Heat Metadata is refreshed, -since the initial Metadata copy will have '0.0.0.0' (as we don't know -the address until after we create a server record). - -Some configuration is tied into the neutron-openvswitch-agent - see the -README.md there as well. diff --git a/elements/boot-stack/bin/boot-stack-logs b/elements/boot-stack/bin/boot-stack-logs deleted file mode 100755 index b11605496..000000000 --- a/elements/boot-stack/bin/boot-stack-logs +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -set -eu - -if [[ $EUID -ne 0 ]]; then - echo "ERROR: you must be root to run this" 1>&2 - exit 1 -fi - -scr_name=os-logs -scr_file=$(mktemp) -this_dir=$(cd `dirname "${BASH_SOURCE[0]}"` && pwd) - -cat > $scr_file <> $scr_file - fi -done - -# XXX: Note that this is obsolete if the Neutron DHCP agent is in use. -echo "screen -t dnsmasq sh -c \"tail -f /var/log/syslog | grep dnsmasq\"" >> $scr_file - -exec screen -c $scr_file diff --git a/elements/boot-stack/bin/reset-db b/elements/boot-stack/bin/reset-db deleted file mode 100755 index 47032c226..000000000 --- a/elements/boot-stack/bin/reset-db +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -set -eux - -db_pass=$(os-apply-config --key db-password) - -PATH=/usr/local/bin:$PATH - -# create the database for the specifed service.db config key -# optionally use a second default dsn parameter if key no found -function create_db_from_config() { - dsn=$(os-apply-config --key $1 --type dsn --key-default '') - if [ -z "$dsn" -a -n "${2:-}" ]; then - echo "No configuration found for $1, using default of $2" - dsn=$2 - fi - if [ -n "$dsn" ]; then - part=${dsn##*://} - part=${part%%\?*} - database=${part##*/} - dsn_creds=${part%%@*} - dsn_user=${dsn_creds%%:*} - dsn_pass=${dsn_creds##*:} - os-db-create $database $dsn_user $dsn_pass - else - echo "No configuration found for $1, skipping db create" - fi -} - -create_db_from_config "keystone.db" "mysql://keystone:${db_pass}@localhost/keystone" - -if which cinder-manage 1>/dev/null 2>&1; then - create_db_from_config "cinder.db" "mysql://cinder:${db_pass}@localhost/cinder" -fi - -if which ironic-dbsync 1>/dev/null 2>&1; then - create_db_from_config "ironic.db" "mysql://ironic:${db_pass}@localhost/ironic" -fi - -if which tuskar-dbsync 1>/dev/null 2>&1; then - create_db_from_config "tuskar.db" "mysql://tuskar:${db_pass}@localhost/tuskar" -fi - -if which ceilometer-dbsync 1>/dev/null 2>&1; then - create_db_from_config "ceilometer.db" "mysql://ceilometer:${db_pass}@localhost/ceilometer" -fi - -create_db_from_config "nova.db" "mysql://nova:${db_pass}@localhost/nova" - -if which nova-baremetal-manage 1>/dev/null 2>&1; then - create_db_from_config "nova.baremetal.db" "mysql://nova_bm:${db_pass}@localhost/nova_bm" -fi - -create_db_from_config "glance.db" "mysql://glance:${db_pass}@localhost/glance" - -create_db_from_config "heat.db" "mysql://heat:${db_pass}@localhost/heat" - -create_db_from_config "neutron.ovs_db" "mysql://neutron:${db_pass}@localhost/ovs_neutron" diff --git a/elements/boot-stack/element-deps b/elements/boot-stack/element-deps deleted file mode 100644 index 56e78ca38..000000000 --- a/elements/boot-stack/element-deps +++ /dev/null @@ -1,15 +0,0 @@ -glance -heat-api -heat-engine -iptables -keystone -mysql -neutron-openvswitch-agent -neutron-server -nova-api -openstack-clients -os-apply-config -os-refresh-config -os-svc-install -package-installs -sysctl diff --git a/elements/boot-stack/install.d/01-boot-stack b/elements/boot-stack/install.d/01-boot-stack deleted file mode 100755 index 2624ee89c..000000000 --- a/elements/boot-stack/install.d/01-boot-stack +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -set -eux - -install -m 0755 -o root -g root -d /opt/stack/boot-stack - -# tools -for f in `ls $(dirname $0)/../bin`; do - install -m 0755 -o root -g root $(dirname $0)/../bin/$f /usr/local/bin/$f -done - -# db -install-packages python-mysqldb - -function deps() { - if hash apt-get &> /dev/null; then - apt-get update - fi - install-packages screen ccze - install-packages git ipmitool python-dev python-greenlet libxml2-dev libxslt-dev - install-packages openvswitch-common openvswitch-switch open-iscsi - install-packages python-numpy python-lxml -} - -deps -sysctl-set-value "net.ipv4.ip_forward" "1" "Bootstack IPv4 forwarding." diff --git a/elements/boot-stack/install.d/package-installs-boot-stack b/elements/boot-stack/install.d/package-installs-boot-stack deleted file mode 100644 index 81e4f96a4..000000000 --- a/elements/boot-stack/install.d/package-installs-boot-stack +++ /dev/null @@ -1,4 +0,0 @@ -build-essential -git -libssl-dev -python-dev diff --git a/elements/boot-stack/os-apply-config/root/stackrc b/elements/boot-stack/os-apply-config/root/stackrc deleted file mode 100644 index 0e54464c7..000000000 --- a/elements/boot-stack/os-apply-config/root/stackrc +++ /dev/null @@ -1,7 +0,0 @@ -export NOVA_VERSION=1.1 -export OS_PASSWORD={{admin-password}} -export OS_AUTH_URL=http://{{keystone.host}}:5000/v2.0 -export OS_USERNAME=admin -export OS_TENANT_NAME=admin -export COMPUTE_API_VERSION=1.1 -export OS_NO_CACHE=True diff --git a/elements/boot-stack/os-apply-config/root/stackrc.oac b/elements/boot-stack/os-apply-config/root/stackrc.oac deleted file mode 100644 index f2c9e8a5c..000000000 --- a/elements/boot-stack/os-apply-config/root/stackrc.oac +++ /dev/null @@ -1 +0,0 @@ -mode: 0600 diff --git a/elements/boot-stack/os-refresh-config/configure.d/53-init-openstack b/elements/boot-stack/os-refresh-config/configure.d/53-init-openstack deleted file mode 100755 index cb3fc9d93..000000000 --- a/elements/boot-stack/os-refresh-config/configure.d/53-init-openstack +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -set -eu - -OK=/mnt/state/var/lib/boot-stack/init-openstack.ok - -if ! os-is-bootstrap-host || [ -e $OK ] ; then - exit 0 -fi - -PATH=/usr/local/bin:$PATH - -reset-db - -mkdir -p $(dirname $OK) -touch $OK diff --git a/elements/boot-stack/os-refresh-config/pre-configure.d/97-fedora-iptables b/elements/boot-stack/os-refresh-config/pre-configure.d/97-fedora-iptables deleted file mode 100755 index d8be6bace..000000000 --- a/elements/boot-stack/os-refresh-config/pre-configure.d/97-fedora-iptables +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -eu - -# Forward packets to the private ctlplane network -add-rule FORWARD -d 192.0.2.0/24 -j ACCEPT -# Forward packets to the hosts libvirt network -add-rule FORWARD -d 192.168.122.0/24 -j ACCEPT diff --git a/elements/ceilometer-agent-central/README.md b/elements/ceilometer-agent-central/README.md deleted file mode 100644 index 7d8defc29..000000000 --- a/elements/ceilometer-agent-central/README.md +++ /dev/null @@ -1 +0,0 @@ -Enable the Ceilometer Agent Central service diff --git a/elements/ceilometer-agent-central/element-deps b/elements/ceilometer-agent-central/element-deps deleted file mode 100644 index 44696d504..000000000 --- a/elements/ceilometer-agent-central/element-deps +++ /dev/null @@ -1,7 +0,0 @@ -ceilometer -os-is-bootstrap-host -os-refresh-config -os-svc-install -pacemaker -package-installs -pkg-map diff --git a/elements/ceilometer-agent-central/install.d/ceilometer-package-install/package-installs-ceilometer-agent-central b/elements/ceilometer-agent-central/install.d/ceilometer-package-install/package-installs-ceilometer-agent-central deleted file mode 100644 index 28c3defd8..000000000 --- a/elements/ceilometer-agent-central/install.d/ceilometer-package-install/package-installs-ceilometer-agent-central +++ /dev/null @@ -1 +0,0 @@ -ceilometer_agent_central_package diff --git a/elements/ceilometer-agent-central/install.d/ceilometer-source-install/69-ceilometer-agent-central b/elements/ceilometer-agent-central/install.d/ceilometer-source-install/69-ceilometer-agent-central deleted file mode 100755 index ba28e9ac3..000000000 --- a/elements/ceilometer-agent-central/install.d/ceilometer-source-install/69-ceilometer-agent-central +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -eux - -os-svc-daemon -i "$CEILOMETER_VENV_DIR" ceilometer-agent-central ceilometer ceilometer-agent-central --config-dir /etc/ceilometer diff --git a/elements/ceilometer-agent-central/os-refresh-config/post-configure.d/69-ceilometer-agent-central b/elements/ceilometer-agent-central/os-refresh-config/post-configure.d/69-ceilometer-agent-central deleted file mode 100755 index 8f90f3439..000000000 --- a/elements/ceilometer-agent-central/os-refresh-config/post-configure.d/69-ceilometer-agent-central +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -os-svc-enable -an ceilometer-agent-central -pcmk-service-create -n ceilometer-agent-central diff --git a/elements/ceilometer-agent-central/pkg-map b/elements/ceilometer-agent-central/pkg-map deleted file mode 100644 index 01fc302eb..000000000 --- a/elements/ceilometer-agent-central/pkg-map +++ /dev/null @@ -1,5 +0,0 @@ -{ - "default": { - "ceilometer_agent_central_package": "openstack-ceilometer-central" - } -} diff --git a/elements/ceilometer-agent-central/svc-map b/elements/ceilometer-agent-central/svc-map deleted file mode 100644 index 9f96d8904..000000000 --- a/elements/ceilometer-agent-central/svc-map +++ /dev/null @@ -1,3 +0,0 @@ -ceilometer-agent-central: - default: ceilometer-agent-central - redhat: openstack-ceilometer-central diff --git a/elements/ceilometer-agent-compute/README.md b/elements/ceilometer-agent-compute/README.md deleted file mode 100644 index 9bc860497..000000000 --- a/elements/ceilometer-agent-compute/README.md +++ /dev/null @@ -1,8 +0,0 @@ -Enable the Ceilometer Agent Compute service - -This should live alongside nova-compute. - -Heat options: - -`ceilometer.compute_agent` whether to setup nova-compute to publish metrics for -Ceilometer to consume. Set to `Present` to do so, _empty string_ otherwise. diff --git a/elements/ceilometer-agent-compute/element-deps b/elements/ceilometer-agent-compute/element-deps deleted file mode 100644 index 0ca3672d0..000000000 --- a/elements/ceilometer-agent-compute/element-deps +++ /dev/null @@ -1,5 +0,0 @@ -ceilometer -os-refresh-config -os-svc-install -package-installs -pkg-map diff --git a/elements/ceilometer-agent-compute/install.d/ceilometer-package-install/package-installs-ceilometer-agent-compute b/elements/ceilometer-agent-compute/install.d/ceilometer-package-install/package-installs-ceilometer-agent-compute deleted file mode 100644 index cb35fb4eb..000000000 --- a/elements/ceilometer-agent-compute/install.d/ceilometer-package-install/package-installs-ceilometer-agent-compute +++ /dev/null @@ -1 +0,0 @@ -ceilometer_agent_compute_package diff --git a/elements/ceilometer-agent-compute/install.d/ceilometer-source-install/69-ceilometer-agent-compute b/elements/ceilometer-agent-compute/install.d/ceilometer-source-install/69-ceilometer-agent-compute deleted file mode 100755 index 7e7a38f04..000000000 --- a/elements/ceilometer-agent-compute/install.d/ceilometer-source-install/69-ceilometer-agent-compute +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eux - -$CEILOMETER_VENV_DIR/bin/pip install libvirt-python - -os-svc-daemon -i "$CEILOMETER_VENV_DIR" ceilometer-agent-compute ceilometer ceilometer-agent-compute --config-dir /etc/ceilometer diff --git a/elements/ceilometer-agent-compute/install.d/package-installs-ceilometer-agent-compute b/elements/ceilometer-agent-compute/install.d/package-installs-ceilometer-agent-compute deleted file mode 100644 index 92c7bd22f..000000000 --- a/elements/ceilometer-agent-compute/install.d/package-installs-ceilometer-agent-compute +++ /dev/null @@ -1 +0,0 @@ -libvirt-dev diff --git a/elements/ceilometer-agent-compute/os-refresh-config/post-configure.d/69-ceilometer-agent-compute b/elements/ceilometer-agent-compute/os-refresh-config/post-configure.d/69-ceilometer-agent-compute deleted file mode 100755 index a324af30e..000000000 --- a/elements/ceilometer-agent-compute/os-refresh-config/post-configure.d/69-ceilometer-agent-compute +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -os-svc-enable -an ceilometer-agent-compute - -os-svc-restart -an ceilometer-agent-compute diff --git a/elements/ceilometer-agent-compute/pkg-map b/elements/ceilometer-agent-compute/pkg-map deleted file mode 100644 index b92e8368c..000000000 --- a/elements/ceilometer-agent-compute/pkg-map +++ /dev/null @@ -1,5 +0,0 @@ -{ - "default": { - "ceilometer_agent_compute_package": "openstack-ceilometer-compute" - } -} diff --git a/elements/ceilometer-agent-compute/svc-map b/elements/ceilometer-agent-compute/svc-map deleted file mode 100644 index 3fc62a958..000000000 --- a/elements/ceilometer-agent-compute/svc-map +++ /dev/null @@ -1,3 +0,0 @@ -ceilometer-agent-compute: - default: ceilometer-agent-compute - redhat: openstack-ceilometer-compute diff --git a/elements/ceilometer-agent-notification/README.md b/elements/ceilometer-agent-notification/README.md deleted file mode 100644 index 7b53dca7d..000000000 --- a/elements/ceilometer-agent-notification/README.md +++ /dev/null @@ -1 +0,0 @@ -Enable the Ceilometer Agent Notification service diff --git a/elements/ceilometer-agent-notification/element-deps b/elements/ceilometer-agent-notification/element-deps deleted file mode 100644 index 0ca3672d0..000000000 --- a/elements/ceilometer-agent-notification/element-deps +++ /dev/null @@ -1,5 +0,0 @@ -ceilometer -os-refresh-config -os-svc-install -package-installs -pkg-map diff --git a/elements/ceilometer-agent-notification/install.d/ceilometer-package-install/package-installs-ceilometer-agent-notification b/elements/ceilometer-agent-notification/install.d/ceilometer-package-install/package-installs-ceilometer-agent-notification deleted file mode 100644 index 049199a2c..000000000 --- a/elements/ceilometer-agent-notification/install.d/ceilometer-package-install/package-installs-ceilometer-agent-notification +++ /dev/null @@ -1 +0,0 @@ -ceilometer_agent_notification_package diff --git a/elements/ceilometer-agent-notification/install.d/ceilometer-source-install/69-ceilometer-agent-notification b/elements/ceilometer-agent-notification/install.d/ceilometer-source-install/69-ceilometer-agent-notification deleted file mode 100755 index 0f0ad8fd5..000000000 --- a/elements/ceilometer-agent-notification/install.d/ceilometer-source-install/69-ceilometer-agent-notification +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -eux - -os-svc-daemon -i "$CEILOMETER_VENV_DIR" ceilometer-agent-notification ceilometer ceilometer-agent-notification --config-dir /etc/ceilometer diff --git a/elements/ceilometer-agent-notification/os-refresh-config/post-configure.d/69-ceilometer-agent-notification b/elements/ceilometer-agent-notification/os-refresh-config/post-configure.d/69-ceilometer-agent-notification deleted file mode 100755 index ae621372a..000000000 --- a/elements/ceilometer-agent-notification/os-refresh-config/post-configure.d/69-ceilometer-agent-notification +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -os-svc-enable -an ceilometer-agent-notification -os-svc-restart -an ceilometer-agent-notification diff --git a/elements/ceilometer-agent-notification/pkg-map b/elements/ceilometer-agent-notification/pkg-map deleted file mode 100644 index a917f09e4..000000000 --- a/elements/ceilometer-agent-notification/pkg-map +++ /dev/null @@ -1,5 +0,0 @@ -{ - "default": { - "ceilometer_agent_notification_package": "openstack-ceilometer-notification" - } -} diff --git a/elements/ceilometer-agent-notification/svc-map b/elements/ceilometer-agent-notification/svc-map deleted file mode 100644 index 9473dbba8..000000000 --- a/elements/ceilometer-agent-notification/svc-map +++ /dev/null @@ -1,3 +0,0 @@ -ceilometer-agent-notification: - default: ceilometer-agent-notification - redhat: openstack-ceilometer-notification diff --git a/elements/ceilometer-alarm-evaluator/README.md b/elements/ceilometer-alarm-evaluator/README.md deleted file mode 100644 index 7a92f44e2..000000000 --- a/elements/ceilometer-alarm-evaluator/README.md +++ /dev/null @@ -1 +0,0 @@ -Enable the Ceilometer Alarm Evaluator service diff --git a/elements/ceilometer-alarm-evaluator/element-deps b/elements/ceilometer-alarm-evaluator/element-deps deleted file mode 100644 index 0ca3672d0..000000000 --- a/elements/ceilometer-alarm-evaluator/element-deps +++ /dev/null @@ -1,5 +0,0 @@ -ceilometer -os-refresh-config -os-svc-install -package-installs -pkg-map diff --git a/elements/ceilometer-alarm-evaluator/install.d/ceilometer-package-install/package-installs-ceilometer-alarm-evaluator b/elements/ceilometer-alarm-evaluator/install.d/ceilometer-package-install/package-installs-ceilometer-alarm-evaluator deleted file mode 100644 index c6aa5c982..000000000 --- a/elements/ceilometer-alarm-evaluator/install.d/ceilometer-package-install/package-installs-ceilometer-alarm-evaluator +++ /dev/null @@ -1 +0,0 @@ -ceilometer_alarm_package diff --git a/elements/ceilometer-alarm-evaluator/install.d/ceilometer-source-install/69-ceilometer-alarm-evaluator b/elements/ceilometer-alarm-evaluator/install.d/ceilometer-source-install/69-ceilometer-alarm-evaluator deleted file mode 100755 index 38449c547..000000000 --- a/elements/ceilometer-alarm-evaluator/install.d/ceilometer-source-install/69-ceilometer-alarm-evaluator +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -eux - -os-svc-daemon -i "$CEILOMETER_VENV_DIR" ceilometer-alarm-evaluator ceilometer ceilometer-alarm-evaluator --config-dir /etc/ceilometer diff --git a/elements/ceilometer-alarm-evaluator/os-refresh-config/post-configure.d/69-ceilometer-alarm-evaluator b/elements/ceilometer-alarm-evaluator/os-refresh-config/post-configure.d/69-ceilometer-alarm-evaluator deleted file mode 100755 index 2551e7f33..000000000 --- a/elements/ceilometer-alarm-evaluator/os-refresh-config/post-configure.d/69-ceilometer-alarm-evaluator +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eux - -os-svc-enable -an ceilometer-alarm-evaluator - -os-svc-restart -an ceilometer-alarm-evaluator diff --git a/elements/ceilometer-alarm-evaluator/pkg-map b/elements/ceilometer-alarm-evaluator/pkg-map deleted file mode 100644 index 2fc9f37bd..000000000 --- a/elements/ceilometer-alarm-evaluator/pkg-map +++ /dev/null @@ -1,5 +0,0 @@ -{ - "default": { - "ceilometer_alarm_package": "openstack-ceilometer-alarm" - } -} diff --git a/elements/ceilometer-alarm-evaluator/svc-map b/elements/ceilometer-alarm-evaluator/svc-map deleted file mode 100644 index 7260a7bcf..000000000 --- a/elements/ceilometer-alarm-evaluator/svc-map +++ /dev/null @@ -1,3 +0,0 @@ -ceilometer-alarm-evaluator: - default: ceilometer-alarm-evaluator - redhat: openstack-ceilometer-alarm-evaluator diff --git a/elements/ceilometer-alarm-notifier/README.md b/elements/ceilometer-alarm-notifier/README.md deleted file mode 100644 index 0c458001e..000000000 --- a/elements/ceilometer-alarm-notifier/README.md +++ /dev/null @@ -1 +0,0 @@ -Enable the Ceilometer Alarm Notification service diff --git a/elements/ceilometer-alarm-notifier/element-deps b/elements/ceilometer-alarm-notifier/element-deps deleted file mode 100644 index 414af8a3d..000000000 --- a/elements/ceilometer-alarm-notifier/element-deps +++ /dev/null @@ -1,6 +0,0 @@ -ceilometer -ceilometer-alarm-evaluator -os-refresh-config -os-svc-install -package-installs -pkg-map diff --git a/elements/ceilometer-alarm-notifier/install.d/ceilometer-package-install/package-installs-ceilometer-alarm-notifier b/elements/ceilometer-alarm-notifier/install.d/ceilometer-package-install/package-installs-ceilometer-alarm-notifier deleted file mode 100644 index c6aa5c982..000000000 --- a/elements/ceilometer-alarm-notifier/install.d/ceilometer-package-install/package-installs-ceilometer-alarm-notifier +++ /dev/null @@ -1 +0,0 @@ -ceilometer_alarm_package diff --git a/elements/ceilometer-alarm-notifier/install.d/ceilometer-source-install/69-ceilometer-alarm-notifier b/elements/ceilometer-alarm-notifier/install.d/ceilometer-source-install/69-ceilometer-alarm-notifier deleted file mode 100755 index bf27f91af..000000000 --- a/elements/ceilometer-alarm-notifier/install.d/ceilometer-source-install/69-ceilometer-alarm-notifier +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -eux - -os-svc-daemon -i "$CEILOMETER_VENV_DIR" ceilometer-alarm-notifier ceilometer ceilometer-alarm-notifier --config-dir /etc/ceilometer diff --git a/elements/ceilometer-alarm-notifier/os-refresh-config/post-configure.d/69-ceilometer-alarm-notifier b/elements/ceilometer-alarm-notifier/os-refresh-config/post-configure.d/69-ceilometer-alarm-notifier deleted file mode 100755 index 938340c83..000000000 --- a/elements/ceilometer-alarm-notifier/os-refresh-config/post-configure.d/69-ceilometer-alarm-notifier +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eux - -os-svc-enable -an ceilometer-alarm-notifier - -os-svc-restart -an ceilometer-alarm-evaluator diff --git a/elements/ceilometer-alarm-notifier/pkg-map b/elements/ceilometer-alarm-notifier/pkg-map deleted file mode 100644 index 2fc9f37bd..000000000 --- a/elements/ceilometer-alarm-notifier/pkg-map +++ /dev/null @@ -1,5 +0,0 @@ -{ - "default": { - "ceilometer_alarm_package": "openstack-ceilometer-alarm" - } -} diff --git a/elements/ceilometer-alarm-notifier/svc-map b/elements/ceilometer-alarm-notifier/svc-map deleted file mode 100644 index c2631a8b2..000000000 --- a/elements/ceilometer-alarm-notifier/svc-map +++ /dev/null @@ -1,3 +0,0 @@ -ceilometer-alarm-notifier: - default: ceilometer-alarm-notifier - redhat: openstack-ceilometer-alarm-notifier diff --git a/elements/ceilometer-api/README.md b/elements/ceilometer-api/README.md deleted file mode 100644 index bb73f1976..000000000 --- a/elements/ceilometer-api/README.md +++ /dev/null @@ -1 +0,0 @@ -Enable the Ceilometer API service diff --git a/elements/ceilometer-api/element-deps b/elements/ceilometer-api/element-deps deleted file mode 100644 index ac1213373..000000000 --- a/elements/ceilometer-api/element-deps +++ /dev/null @@ -1,7 +0,0 @@ -ceilometer -iptables -os-is-bootstrap-host -os-refresh-config -os-svc-install -package-installs -pkg-map diff --git a/elements/ceilometer-api/install.d/ceilometer-package-install/package-installs-ceilometer-api b/elements/ceilometer-api/install.d/ceilometer-package-install/package-installs-ceilometer-api deleted file mode 100644 index f4113fda5..000000000 --- a/elements/ceilometer-api/install.d/ceilometer-package-install/package-installs-ceilometer-api +++ /dev/null @@ -1 +0,0 @@ -ceilometer_api_package diff --git a/elements/ceilometer-api/install.d/ceilometer-source-install/69-ceilometer-api b/elements/ceilometer-api/install.d/ceilometer-source-install/69-ceilometer-api deleted file mode 100755 index c70ab62d4..000000000 --- a/elements/ceilometer-api/install.d/ceilometer-source-install/69-ceilometer-api +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -eux - -os-svc-daemon -i "$CEILOMETER_VENV_DIR" ceilometer-api ceilometer ceilometer-api --config-dir /etc/ceilometer diff --git a/elements/ceilometer-api/os-refresh-config/configure.d/90-ceilometer-db-sync b/elements/ceilometer-api/os-refresh-config/configure.d/90-ceilometer-db-sync deleted file mode 100755 index 3dec6cc3c..000000000 --- a/elements/ceilometer-api/os-refresh-config/configure.d/90-ceilometer-db-sync +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eux - -if os-is-bootstrap-host ; then - su -s /bin/bash -c 'ceilometer-dbsync --config-file /etc/ceilometer/ceilometer.conf' ceilometer -fi diff --git a/elements/ceilometer-api/os-refresh-config/post-configure.d/69-ceilometer-api b/elements/ceilometer-api/os-refresh-config/post-configure.d/69-ceilometer-api deleted file mode 100755 index 1bb551cd0..000000000 --- a/elements/ceilometer-api/os-refresh-config/post-configure.d/69-ceilometer-api +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -os-svc-enable -an ceilometer-api - -[ -d /mnt/state/var/lib/ceilometer ] || install -d -D -m 0770 -o ceilometer -g ceilometer /mnt/state/var/lib/ceilometer -[ -d /mnt/state/var/lib/ceilometer/keystone-signing ] || install -d -D -m 0770 -o ceilometer -g ceilometer /mnt/state/var/lib/ceilometer/keystone-signing - -os-svc-restart -an ceilometer-api diff --git a/elements/ceilometer-api/os-refresh-config/pre-configure.d/97-fedora-ceilometer-api-iptables b/elements/ceilometer-api/os-refresh-config/pre-configure.d/97-fedora-ceilometer-api-iptables deleted file mode 100755 index dee5400fb..000000000 --- a/elements/ceilometer-api/os-refresh-config/pre-configure.d/97-fedora-ceilometer-api-iptables +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -eu - -add-rule INPUT -p tcp --dport 8777 -j ACCEPT - diff --git a/elements/ceilometer-api/pkg-map b/elements/ceilometer-api/pkg-map deleted file mode 100644 index 407ff6978..000000000 --- a/elements/ceilometer-api/pkg-map +++ /dev/null @@ -1,5 +0,0 @@ -{ - "default": { - "ceilometer_api_package": "openstack-ceilometer-api" - } -} diff --git a/elements/ceilometer-api/svc-map b/elements/ceilometer-api/svc-map deleted file mode 100644 index debc15af5..000000000 --- a/elements/ceilometer-api/svc-map +++ /dev/null @@ -1,3 +0,0 @@ -ceilometer-api: - default: ceilometer-api - redhat: openstack-ceilometer-api diff --git a/elements/ceilometer-collector/README.md b/elements/ceilometer-collector/README.md deleted file mode 100644 index a56200300..000000000 --- a/elements/ceilometer-collector/README.md +++ /dev/null @@ -1 +0,0 @@ -Enable the Ceilometer Collector service diff --git a/elements/ceilometer-collector/element-deps b/elements/ceilometer-collector/element-deps deleted file mode 100644 index 0ca3672d0..000000000 --- a/elements/ceilometer-collector/element-deps +++ /dev/null @@ -1,5 +0,0 @@ -ceilometer -os-refresh-config -os-svc-install -package-installs -pkg-map diff --git a/elements/ceilometer-collector/install.d/ceilometer-package-install/package-installs-ceilometer-collector b/elements/ceilometer-collector/install.d/ceilometer-package-install/package-installs-ceilometer-collector deleted file mode 100644 index 5cb4e5ade..000000000 --- a/elements/ceilometer-collector/install.d/ceilometer-package-install/package-installs-ceilometer-collector +++ /dev/null @@ -1 +0,0 @@ -ceilometer_collector_package diff --git a/elements/ceilometer-collector/install.d/ceilometer-source-install/69-ceilometer-collector b/elements/ceilometer-collector/install.d/ceilometer-source-install/69-ceilometer-collector deleted file mode 100755 index 433d2e14e..000000000 --- a/elements/ceilometer-collector/install.d/ceilometer-source-install/69-ceilometer-collector +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -eux - -os-svc-daemon -i "$CEILOMETER_VENV_DIR" ceilometer-collector ceilometer ceilometer-collector --config-dir /etc/ceilometer diff --git a/elements/ceilometer-collector/os-refresh-config/post-configure.d/69-ceilometer-collector b/elements/ceilometer-collector/os-refresh-config/post-configure.d/69-ceilometer-collector deleted file mode 100755 index 7c282fbd4..000000000 --- a/elements/ceilometer-collector/os-refresh-config/post-configure.d/69-ceilometer-collector +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -os-svc-enable -an ceilometer-collector -os-svc-restart -an ceilometer-collector diff --git a/elements/ceilometer-collector/pkg-map b/elements/ceilometer-collector/pkg-map deleted file mode 100644 index fcab9ca42..000000000 --- a/elements/ceilometer-collector/pkg-map +++ /dev/null @@ -1,5 +0,0 @@ -{ - "default": { - "ceilometer_collector_package": "openstack-ceilometer-collector" - } -} diff --git a/elements/ceilometer-collector/svc-map b/elements/ceilometer-collector/svc-map deleted file mode 100644 index 56be1407f..000000000 --- a/elements/ceilometer-collector/svc-map +++ /dev/null @@ -1,3 +0,0 @@ -ceilometer-collector: - default: ceilometer-collector - redhat: openstack-ceilometer-collector diff --git a/elements/ceilometer-overcloud-config/README.md b/elements/ceilometer-overcloud-config/README.md deleted file mode 100644 index 5773ccbd1..000000000 --- a/elements/ceilometer-overcloud-config/README.md +++ /dev/null @@ -1,2 +0,0 @@ -Will overwrite the pipeline.yaml taken from the Ceilometer repository -defined in ceilometer element install.d. diff --git a/elements/ceilometer-overcloud-config/element-deps b/elements/ceilometer-overcloud-config/element-deps deleted file mode 100644 index 1cc3fcf99..000000000 --- a/elements/ceilometer-overcloud-config/element-deps +++ /dev/null @@ -1,2 +0,0 @@ -os-apply-config -ceilometer diff --git a/elements/ceilometer-overcloud-config/os-apply-config/etc/ceilometer/pipeline.yaml b/elements/ceilometer-overcloud-config/os-apply-config/etc/ceilometer/pipeline.yaml deleted file mode 100644 index dcd9feab6..000000000 --- a/elements/ceilometer-overcloud-config/os-apply-config/etc/ceilometer/pipeline.yaml +++ /dev/null @@ -1,78 +0,0 @@ ---- -sources: - - name: meter_source - interval: 600 - meters: - - "*" - sinks: - - meter_sink - - name: cpu_source - interval: 600 - meters: - - "cpu" - sinks: - - cpu_sink - - name: disk_source - interval: 600 - meters: - - "disk.read.bytes" - - "disk.read.requests" - - "disk.write.bytes" - - "disk.write.requests" - sinks: - - disk_sink - - name: network_source - interval: 600 - meters: - - "network.incoming.bytes" - - "network.incoming.packets" - - "network.outgoing.bytes" - - "network.outgoing.packets" - sinks: - - network_sink -sinks: - - name: meter_sink - transformers: - publishers: - - rpc:// - - name: cpu_sink - transformers: - - name: "rate_of_change" - parameters: - target: - name: "cpu_util" - unit: "%" - type: "gauge" - scale: "100.0 / (10**9 * (resource_metadata.cpu_number or 1))" - publishers: - - rpc:// - - name: disk_sink - transformers: - - name: "rate_of_change" - parameters: - source: - map_from: - name: "disk\\.(read|write)\\.(bytes|requests)" - unit: "(B|request)" - target: - map_to: - name: "disk.\\1.\\2.rate" - unit: "\\1/s" - type: "gauge" - publishers: - - rpc:// - - name: network_sink - transformers: - - name: "rate_of_change" - parameters: - source: - map_from: - name: "network\\.(incoming|outgoing)\\.(bytes|packets)" - unit: "(B|packet)" - target: - map_to: - name: "network.\\1.\\2.rate" - unit: "\\1/s" - type: "gauge" - publishers: - - rpc:// diff --git a/elements/ceilometer-undercloud-config/README.md b/elements/ceilometer-undercloud-config/README.md deleted file mode 100644 index 5773ccbd1..000000000 --- a/elements/ceilometer-undercloud-config/README.md +++ /dev/null @@ -1,2 +0,0 @@ -Will overwrite the pipeline.yaml taken from the Ceilometer repository -defined in ceilometer element install.d. diff --git a/elements/ceilometer-undercloud-config/element-deps b/elements/ceilometer-undercloud-config/element-deps deleted file mode 100644 index 1cc3fcf99..000000000 --- a/elements/ceilometer-undercloud-config/element-deps +++ /dev/null @@ -1,2 +0,0 @@ -os-apply-config -ceilometer diff --git a/elements/ceilometer-undercloud-config/os-apply-config/etc/ceilometer/pipeline.yaml b/elements/ceilometer-undercloud-config/os-apply-config/etc/ceilometer/pipeline.yaml deleted file mode 100644 index 6c838dadd..000000000 --- a/elements/ceilometer-undercloud-config/os-apply-config/etc/ceilometer/pipeline.yaml +++ /dev/null @@ -1,38 +0,0 @@ -sources: - - name: host_source - interval: 600 - meters: - - "hardware.*" - sinks: - - "meter_sink" - - "cpu_sink" - - "swap_sink" - discovery: - - "tripleo_overcloud_nodes" -sinks: - - name: meter_sink - transformers: - publishers: - - rpc:// - - name: cpu_sink - transformers: - - name: "arithmetic" - parameters: - target: - name: "hardware.system_stats.cpu.util" - unit: "%" - type: "gauge" - expr: "100 - $(hardware.system_stats.cpu.idle)" - publishers: - - rpc:// - - name: swap_sink - transformers: - - name: "arithmetic" - parameters: - target: - name: "hardware.memory.swap.util" - unit: "%" - type: "gauge" - expr: "100 - (100 * $(hardware.memory.swap.avail) / $(hardware.memory.swap.total))" - publishers: - - rpc:// diff --git a/elements/ceilometer/README.md b/elements/ceilometer/README.md deleted file mode 100644 index f140d7ec0..000000000 --- a/elements/ceilometer/README.md +++ /dev/null @@ -1,10 +0,0 @@ -Install and configure Ceilometer. - -Configuration -------------- - - ceilometer: - metering_secret: "unset" - - secret value for signing metering messages - service-password: "unset" - - password for the metering service in Keystone diff --git a/elements/ceilometer/cleanup.d/50-remove-source-ceilometer b/elements/ceilometer/cleanup.d/50-remove-source-ceilometer deleted file mode 100755 index 819b7b9e9..000000000 --- a/elements/ceilometer/cleanup.d/50-remove-source-ceilometer +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eu - -sudo rm -fr "${TMP_MOUNT_PATH}/opt/stack/ceilometer" diff --git a/elements/ceilometer/element-deps b/elements/ceilometer/element-deps deleted file mode 100644 index 3bddb4074..000000000 --- a/elements/ceilometer/element-deps +++ /dev/null @@ -1,6 +0,0 @@ -os-apply-config -os-svc-install -package-installs -pkg-map -selinux -source-repositories diff --git a/elements/ceilometer/environment.d/10-ceilometer-venv-dir.bash b/elements/ceilometer/environment.d/10-ceilometer-venv-dir.bash deleted file mode 100644 index e9e9a5340..000000000 --- a/elements/ceilometer/environment.d/10-ceilometer-venv-dir.bash +++ /dev/null @@ -1,6 +0,0 @@ -if [ -z "${CEILOMETER_VENV_DIR:-}" ]; then - export CEILOMETER_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/ceilometer"} -fi -if [ -z "${CEILOMETER_EXTRA_INSTALL_OPTS:-}" ]; then - export CEILOMETER_EXTRA_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-""} -fi diff --git a/elements/ceilometer/install.d/ceilometer-package-install/package-installs-ceilometer b/elements/ceilometer/install.d/ceilometer-package-install/package-installs-ceilometer deleted file mode 100644 index ffd275695..000000000 --- a/elements/ceilometer/install.d/ceilometer-package-install/package-installs-ceilometer +++ /dev/null @@ -1 +0,0 @@ -ceilometer_package diff --git a/elements/ceilometer/install.d/ceilometer-source-install/68-ceilometer b/elements/ceilometer/install.d/ceilometer-source-install/68-ceilometer deleted file mode 100755 index bc654004b..000000000 --- a/elements/ceilometer/install.d/ceilometer-source-install/68-ceilometer +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -set -eux - -os-svc-install $CEILOMETER_EXTRA_INSTALL_OPTS -i "$CEILOMETER_VENV_DIR" -u ceilometer -r /opt/stack/ceilometer - - -install -m 640 -o ceilometer -g ceilometer /opt/stack/ceilometer/etc/ceilometer/pipeline.yaml /etc/ceilometer -install -m 640 -o ceilometer -g ceilometer /opt/stack/ceilometer/etc/ceilometer/api_paste.ini /etc/ceilometer -install -m 640 -o ceilometer -g ceilometer /opt/stack/ceilometer/etc/ceilometer/policy.json /etc/ceilometer - -# NOTE(gfidente): the following is needed by v1 api only, removed after icehouse release -# with ceilometer commit: 6a7d6ec198451687ad4389787338988012e6a1fe -if [ -f /opt/stack/ceilometer/etc/ceilometer/sources.json ]; then - install -m 640 -o ceilometer -g ceilometer /opt/stack/ceilometer/etc/ceilometer/sources.json /etc/ceilometer -fi - -ln -s $CEILOMETER_VENV_DIR/bin/ceilometer-dbsync /usr/local/bin/ceilometer-dbsync - -add-selinux-path-substitution /usr/bin $CEILOMETER_VENV_DIR/bin diff --git a/elements/ceilometer/install.d/package-installs-ceilometer b/elements/ceilometer/install.d/package-installs-ceilometer deleted file mode 100644 index 4d0ca236a..000000000 --- a/elements/ceilometer/install.d/package-installs-ceilometer +++ /dev/null @@ -1,2 +0,0 @@ -libffi-dev -libssl-dev diff --git a/elements/ceilometer/os-apply-config/etc/ceilometer/ceilometer.conf b/elements/ceilometer/os-apply-config/etc/ceilometer/ceilometer.conf deleted file mode 100644 index d047116e6..000000000 --- a/elements/ceilometer/os-apply-config/etc/ceilometer/ceilometer.conf +++ /dev/null @@ -1,111 +0,0 @@ -[DEFAULT] - -api_paste_config=/etc/ceilometer/api_paste.ini - - -{{#rabbit}} -rabbit_password={{password}} -rpc_backend=ceilometer.openstack.common.rpc.impl_kombu -{{#rabbit_port}} -rabbit_port={{.}} -{{/rabbit_port}} -{{^rabbit_port}} -rabbit_port=5672 -{{/rabbit_port}} -{{#rabbit.rabbit_client_use_ssl}} -rabbit_use_ssl={{.}} -{{/rabbit.rabbit_client_use_ssl}} -{{#rabbit.host}} -rabbit_host={{.}} -{{/rabbit.host}} -{{^rabbit.host}} -rabbit_hosts={{rabbit.nodes}} -rabbit_ha_queues=true -{{/rabbit.host}} -{{/rabbit}} - - -{{#qpid}} -qpid_hostname={{host}} -qpid_username={{username}} -qpid_password={{password}} -rpc_backend=ceilometer.openstack.common.rpc.impl_qpid -{{/qpid}} - - -{{#ceilometer.snmpd_readonly_user_name}} -[hardware] -url_scheme=snmp:// -# Credentials for readonly SNMPd user of all Overcloud nodes -readonly_user_name={{ceilometer.snmpd_readonly_user_name}} -readonly_user_password={{ceilometer.snmpd_readonly_user_password}} -{{/ceilometer.snmpd_readonly_user_name}} - - -[alarm] -evaluation_service=ceilometer.alarm.service.SingletonAlarmService -rest_notifier_ssl_verify=false -notifier_rpc_topic=alarm_notifier -partition_rpc_topic=alarm_partition_coordination -evaluation_interval=60 -record_history=true - - -[api] -{{#haproxy}} -{{#stunnel.connect_host}} -host = {{stunnel.connect_host}} -{{/stunnel.connect_host}} -{{^stunnel.connect_host}} -host = {{local-ipv4}} -{{/stunnel.connect_host}} -{{/haproxy}} - - -[publisher_rpc] - -# Secret value for signing metering messages (string value) -metering_secret={{ceilometer.metering_secret}} - - -[service_credentials] -os_username=ceilometer - -# Password to use for openstack service access (string value) -os_password={{ceilometer.service-password}} - -os_auth_url=http://{{keystone.host}}:5000/v2.0 - - -[keystone_authtoken] -admin_user=ceilometer -admin_password={{ceilometer.service-password}} -admin_tenant_name=service -identity_uri=http://{{keystone.host}}:35357 -signing_dir=/mnt/state/var/lib/ceilometer/keystone-signing - -[database] - -# The backend to use for db (string value) -backend=sqlalchemy - -# The SQLAlchemy connection string used to connect to the -# database (string value) -{{#ceilometer.db}} -connection={{ceilometer.db}} -{{/ceilometer.db}} - -{{#ceilometer}} -{{#config}} -[{{{section}}}] -{{#values}} -{{#comment}} -# {{{.}}} -{{/comment}} -{{#option}} -{{{option}}} = {{{value}}} -{{/option}} -{{/values}} - -{{/config}} -{{/ceilometer}} diff --git a/elements/ceilometer/pkg-map b/elements/ceilometer/pkg-map deleted file mode 100644 index 3dd4a68a0..000000000 --- a/elements/ceilometer/pkg-map +++ /dev/null @@ -1,5 +0,0 @@ -{ - "default": { - "ceilometer_package": "python-ceilometer" - } -} diff --git a/elements/ceilometer/source-repository-ceilometer b/elements/ceilometer/source-repository-ceilometer deleted file mode 100644 index 8264c9497..000000000 --- a/elements/ceilometer/source-repository-ceilometer +++ /dev/null @@ -1 +0,0 @@ -ceilometer git /opt/stack/ceilometer https://git.openstack.org/openstack/ceilometer diff --git a/elements/check_mk-agent/README.md b/elements/check_mk-agent/README.md deleted file mode 100644 index 8166f79e5..000000000 --- a/elements/check_mk-agent/README.md +++ /dev/null @@ -1,52 +0,0 @@ -# Install the check\_mk monitoring client from the distribution's repositories - -[check_mk](http://mathias-kettner.com/check_mk.html) - -This element installs the client, distributes any checks found in other elements -and configures IPTables to allow traffic to it. - -If you wish to configure the server, please include the `check_mk-server` element on your -icinga server. - -## Adding custom checks - -If you wish to add a custom check to `check_mk`, simply carry out the following steps: - -1. Add a dependency on this element to your "element-deps" file -2. Write a script that conforms to the output required (see example below for details) -3. Place that script into the "`check_mk_checks`" directory within your element -4. Deploy the element - -The check will be picked up and deployed during the image build. - -### Example Check - -The output from a `check_mk` check is very simple: - - - -For example, if we wanted to check that a webserver was returning a response and how -long that response took, we would look for the following output for a "good" check: - - 0 website_is_up response_time=0.007 Website is up (response code was 200) - -or alternatively the following for a bad check: - - 2 website_is_up response_time=0.002 Website is down (response code was 500) - -A small bash script to achieve this is set out below. - - #!/bin/bash - curlout=$(curl --write-out "%{http_code} %{time_total}" --silent --output /dev/null http://www.example.com/) - response=$(echo $curlout|cut -d " " -f 1) - timing=$(echo $curlout|cut -d " " -f 2) - if [ "$response" -eq "200" ]; then - retstring="0 nova_api reponse_time=$timing nova_api is up (response code was $response)" - else - retstring="2 nova_api response_time=$timing nova_api is down (response code was $response)" - fi - echo $retstringo - -If you do not have any perfdata to display, just write a dash in the correct field as follows: - - `0 website_is_up - Website is up (response code was 200)` diff --git a/elements/check_mk-agent/element-deps b/elements/check_mk-agent/element-deps deleted file mode 100644 index dd833d170..000000000 --- a/elements/check_mk-agent/element-deps +++ /dev/null @@ -1,4 +0,0 @@ -iptables -os-refresh-config -os-svc-install -package-installs diff --git a/elements/check_mk-agent/install.d/05-check_mk-agent b/elements/check_mk-agent/install.d/05-check_mk-agent deleted file mode 100755 index 299e2418c..000000000 --- a/elements/check_mk-agent/install.d/05-check_mk-agent +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -# install check-mk-agent and the logwatch plugin - -set -eux -set -o pipefail - -# check_mk is disabled by default so we need to enable it here -sed -i "s/\tdisable = yes/\tdisable = no/g" /etc/xinetd.d/check_mk - -os-svc-enable -an xinetd diff --git a/elements/check_mk-agent/install.d/99-check_mk_local_checks b/elements/check_mk-agent/install.d/99-check_mk_local_checks deleted file mode 100755 index 6d74cb6fb..000000000 --- a/elements/check_mk-agent/install.d/99-check_mk_local_checks +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -# This script will copy the check_mk service checks to the appropriate -# location. Note that the implementation relies on the detail that all -# elements share one dir inside the chroot. -set -eux -set -o pipefail - - -if [[ "rhel rhel7 centos7 fedora" =~ "$DISTRO_NAME" ]]; then - # we're running a RHEL-based distro, so we need to install to - # /usr/share/check-mk-agent/local - LOCAL_CHECK_ROOT=/usr/share/check-mk-agent/local -else - # We're running a debian-based distro so we need to install - # to /usr/lib/check_mk_agent/local/ - LOCAL_CHECK_ROOT=/usr/lib/check_mk_agent/local -fi -mkdir -p $LOCAL_CHECK_ROOT - -LOCAL_CHECK_SOURCE=$(dirname $0)/../check_mk_checks -if [[ -d "${LOCAL_CHECK_SOURCE}" ]]; then - install -m 0755 -o root -g root $LOCAL_CHECK_SOURCE/* $LOCAL_CHECK_ROOT/ -fi diff --git a/elements/check_mk-agent/install.d/package-installs-check_mk-agent b/elements/check_mk-agent/install.d/package-installs-check_mk-agent deleted file mode 100644 index 535a33bce..000000000 --- a/elements/check_mk-agent/install.d/package-installs-check_mk-agent +++ /dev/null @@ -1,3 +0,0 @@ -check-mk-agent -check-mk-agent-logwatch -xinetd diff --git a/elements/check_mk-agent/os-refresh-config/pre-configure.d/97-check-mk-agent-iptables b/elements/check_mk-agent/os-refresh-config/pre-configure.d/97-check-mk-agent-iptables deleted file mode 100755 index bf88ee048..000000000 --- a/elements/check_mk-agent/os-refresh-config/pre-configure.d/97-check-mk-agent-iptables +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -# configure the IPTables rules required for check_mk - -set -eux -set -o pipefail - -add-rule INPUT -p tcp --dport 6556 -j ACCEPT diff --git a/elements/check_mk-agent/svc-map b/elements/check_mk-agent/svc-map deleted file mode 100644 index 276d13aa1..000000000 --- a/elements/check_mk-agent/svc-map +++ /dev/null @@ -1,2 +0,0 @@ -xinetd: - default: xinetd diff --git a/elements/cinder-api/README.md b/elements/cinder-api/README.md deleted file mode 100644 index 918f1c8d4..000000000 --- a/elements/cinder-api/README.md +++ /dev/null @@ -1 +0,0 @@ -Installs cinder api and scheduler services. diff --git a/elements/cinder-api/element-deps b/elements/cinder-api/element-deps deleted file mode 100644 index 5ad044d38..000000000 --- a/elements/cinder-api/element-deps +++ /dev/null @@ -1,6 +0,0 @@ -cinder -os-is-bootstrap-host -os-refresh-config -os-svc-install -source-repositories -use-ephemeral diff --git a/elements/cinder-api/install.d/cinder-source-install/73-cinder-api b/elements/cinder-api/install.d/cinder-source-install/73-cinder-api deleted file mode 100755 index b67806aab..000000000 --- a/elements/cinder-api/install.d/cinder-source-install/73-cinder-api +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -eux - -ln -s $CINDER_VENV_DIR/bin/cinder-manage /usr/local/bin/cinder-manage - -os-svc-daemon -a -i "$CINDER_VENV_DIR" cinder-api cinder cinder-api "--config-dir /etc/cinder" -os-svc-daemon -a -i "$CINDER_VENV_DIR" cinder-scheduler cinder cinder-scheduler "--config-dir /etc/cinder" diff --git a/elements/cinder-api/os-refresh-config/configure.d/90-cinder-db-sync b/elements/cinder-api/os-refresh-config/configure.d/90-cinder-db-sync deleted file mode 100755 index bbaf71342..000000000 --- a/elements/cinder-api/os-refresh-config/configure.d/90-cinder-db-sync +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eux - -if os-is-bootstrap-host ; then - su -s /bin/bash -c 'cinder-manage db sync' cinder -fi diff --git a/elements/cinder-api/os-refresh-config/post-configure.d/73-cinder-api b/elements/cinder-api/os-refresh-config/post-configure.d/73-cinder-api deleted file mode 100755 index 1fb54836e..000000000 --- a/elements/cinder-api/os-refresh-config/post-configure.d/73-cinder-api +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -eu - -os-svc-enable -an cinder-api -os-svc-enable -an cinder-scheduler -os-svc-restart -an cinder-api -os-svc-restart -an cinder-scheduler diff --git a/elements/cinder-api/os-refresh-config/pre-configure.d/97-cinder-api-iptables b/elements/cinder-api/os-refresh-config/pre-configure.d/97-cinder-api-iptables deleted file mode 100755 index d03418c63..000000000 --- a/elements/cinder-api/os-refresh-config/pre-configure.d/97-cinder-api-iptables +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -eu - -add-rule INPUT -p tcp --dport 8776 -j ACCEPT # cinder-api \ No newline at end of file diff --git a/elements/cinder-api/svc-map b/elements/cinder-api/svc-map deleted file mode 100644 index c60897cf7..000000000 --- a/elements/cinder-api/svc-map +++ /dev/null @@ -1,6 +0,0 @@ -cinder-api: - default: openstack-cinder-api - debian: cinder-api -cinder-scheduler: - default: openstack-cinder-scheduler - debian: cinder-scheduler diff --git a/elements/cinder-lio/README.md b/elements/cinder-lio/README.md deleted file mode 100644 index 706f8a518..000000000 --- a/elements/cinder-lio/README.md +++ /dev/null @@ -1,4 +0,0 @@ -Use lio as the cinder iscsi helper. - -The cinder.iscsi-target configuration option must be set to "lioadm". See the cinder -element readme for details. \ No newline at end of file diff --git a/elements/cinder-lio/element-deps b/elements/cinder-lio/element-deps deleted file mode 100644 index 66fa8dae2..000000000 --- a/elements/cinder-lio/element-deps +++ /dev/null @@ -1,2 +0,0 @@ -cinder-volume -package-installs diff --git a/elements/cinder-lio/install.d/cinder-source-install/73-cinder-rtstool b/elements/cinder-lio/install.d/cinder-source-install/73-cinder-rtstool deleted file mode 100755 index d93ec0d8f..000000000 --- a/elements/cinder-lio/install.d/cinder-source-install/73-cinder-rtstool +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eu - -ln -sf $CINDER_VENV_DIR/bin/cinder-rtstool /usr/local/bin/cinder-rtstool diff --git a/elements/cinder-lio/install.d/package-installs-cinder-lio b/elements/cinder-lio/install.d/package-installs-cinder-lio deleted file mode 100644 index 4a837e0be..000000000 --- a/elements/cinder-lio/install.d/package-installs-cinder-lio +++ /dev/null @@ -1 +0,0 @@ -python-rtslib diff --git a/elements/cinder-tgt/README.md b/elements/cinder-tgt/README.md deleted file mode 100644 index 472469256..000000000 --- a/elements/cinder-tgt/README.md +++ /dev/null @@ -1,4 +0,0 @@ -Use tgtd as the iscsi helper for cinder. - -The cinder.iscsi-target configuration option must be set to "tgtadm". See the cinder -element readme for details. \ No newline at end of file diff --git a/elements/cinder-tgt/element-deps b/elements/cinder-tgt/element-deps deleted file mode 100644 index 66fa8dae2..000000000 --- a/elements/cinder-tgt/element-deps +++ /dev/null @@ -1,2 +0,0 @@ -cinder-volume -package-installs diff --git a/elements/cinder-tgt/install.d/72-cinder-tgt b/elements/cinder-tgt/install.d/72-cinder-tgt deleted file mode 100755 index 532e9c879..000000000 --- a/elements/cinder-tgt/install.d/72-cinder-tgt +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -eux - -mkdir -p /etc/tgt/conf.d -echo 'include /mnt/state/var/lib/cinder/volumes/*' > /etc/tgt/conf.d/cinder.conf diff --git a/elements/cinder-tgt/install.d/package-installs-cinder-tgt b/elements/cinder-tgt/install.d/package-installs-cinder-tgt deleted file mode 100644 index 786509cab..000000000 --- a/elements/cinder-tgt/install.d/package-installs-cinder-tgt +++ /dev/null @@ -1 +0,0 @@ -tgt diff --git a/elements/cinder-tgt/os-refresh-config/post-configure.d/74-cinder-tgt b/elements/cinder-tgt/os-refresh-config/post-configure.d/74-cinder-tgt deleted file mode 100755 index 6d691aef2..000000000 --- a/elements/cinder-tgt/os-refresh-config/post-configure.d/74-cinder-tgt +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eu - -os-svc-restart -an tgt diff --git a/elements/cinder-tgt/svc-map b/elements/cinder-tgt/svc-map deleted file mode 100644 index 78760c993..000000000 --- a/elements/cinder-tgt/svc-map +++ /dev/null @@ -1,4 +0,0 @@ -tgt: - default: tgt - redhat: tgtd - diff --git a/elements/cinder-volume-nfs/README.md b/elements/cinder-volume-nfs/README.md deleted file mode 100644 index c9d0c414c..000000000 --- a/elements/cinder-volume-nfs/README.md +++ /dev/null @@ -1,14 +0,0 @@ -Use NFS as cinder-volume backend driver. - -Configuration -------------- - - cinder: - include_nfs_backend: False - # set to true to use the nfs backend - nfs_shares: None - # a list of nfs shares, each item in the list should be an nfs - # share address. (e.g 192.0.2.5:/mnt/state/var/lib/nfs_share) - -**NOTE:** if backing Cinder with NFS remember to use the 'nfs-client' -element on the compute nodes as they will have to mount the NFS share too. \ No newline at end of file diff --git a/elements/cinder-volume-nfs/element-deps b/elements/cinder-volume-nfs/element-deps deleted file mode 100644 index 0d9298a4a..000000000 --- a/elements/cinder-volume-nfs/element-deps +++ /dev/null @@ -1,3 +0,0 @@ -cinder-volume -nfs-client -pacemaker diff --git a/elements/cinder-volume-nfs/os-apply-config/etc/cinder/nfs_shares.txt b/elements/cinder-volume-nfs/os-apply-config/etc/cinder/nfs_shares.txt deleted file mode 100644 index 53737dc7f..000000000 --- a/elements/cinder-volume-nfs/os-apply-config/etc/cinder/nfs_shares.txt +++ /dev/null @@ -1,3 +0,0 @@ -{{#cinder.nfs_shares}} -{{.}} -{{/cinder.nfs_shares}} \ No newline at end of file diff --git a/elements/cinder-volume-nfs/os-refresh-config/post-configure.d/70-cinder-nfs-dir b/elements/cinder-volume-nfs/os-refresh-config/post-configure.d/70-cinder-nfs-dir deleted file mode 100755 index 127e21326..000000000 --- a/elements/cinder-volume-nfs/os-refresh-config/post-configure.d/70-cinder-nfs-dir +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -[ -d /mnt/state/var/lib/cinder/nfs ] || install -D -m 0775 -o cinder -g cinder -d /mnt/state/var/lib/cinder/nfs diff --git a/elements/cinder-volume/README.md b/elements/cinder-volume/README.md deleted file mode 100644 index ca20e3858..000000000 --- a/elements/cinder-volume/README.md +++ /dev/null @@ -1 +0,0 @@ -Installs cinder volume service. diff --git a/elements/cinder-volume/element-deps b/elements/cinder-volume/element-deps deleted file mode 100644 index 0e661a687..000000000 --- a/elements/cinder-volume/element-deps +++ /dev/null @@ -1,5 +0,0 @@ -cinder -os-refresh-config -os-svc-install -use-ephemeral -pkg-map diff --git a/elements/cinder-volume/install.d/cinder-source-install/74-cinder-volume b/elements/cinder-volume/install.d/cinder-source-install/74-cinder-volume deleted file mode 100755 index 35ca53b4e..000000000 --- a/elements/cinder-volume/install.d/cinder-source-install/74-cinder-volume +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -set -eux - -# qemu-img is required when creating volumes from Glance images -install-packages -m cinder-volume qemu_img_package - -os-svc-daemon -i "$CINDER_VENV_DIR" cinder-volume cinder cinder-volume "--config-dir /etc/cinder" - -# Ensure the loop block device is available -if [[ "ubuntu debian" =~ "$DISTRO_NAME" ]]; then - if ! grep -Fxq loop /etc/modules; then - echo "loop" >> /etc/modules - fi -fi diff --git a/elements/cinder-volume/os-refresh-config/post-configure.d/70-cinder-conversion-dir b/elements/cinder-volume/os-refresh-config/post-configure.d/70-cinder-conversion-dir deleted file mode 100755 index 9a6e6ff08..000000000 --- a/elements/cinder-volume/os-refresh-config/post-configure.d/70-cinder-conversion-dir +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eu - -image_conversion_dir=$(os-apply-config --key cinder.image_conversion_dir --key-default "/mnt/state/var/lib/cinder/conversion" --type raw) -mkdir -p $image_conversion_dir -chown cinder:cinder $image_conversion_dir diff --git a/elements/cinder-volume/os-refresh-config/post-configure.d/72-cinder-resize-volume-groups b/elements/cinder-volume/os-refresh-config/post-configure.d/72-cinder-resize-volume-groups deleted file mode 100755 index 59d256972..000000000 --- a/elements/cinder-volume/os-refresh-config/post-configure.d/72-cinder-resize-volume-groups +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -set -eu - -# This file is currently used to setup the loopback file. This file would likely never be used in production. -# In a production installation, there may be multiple backends. -# See http://docs.openstack.org/admin-guide-cloud/blockstorage_multi_backend.html - -# TODO: resize volume group in response to config changes. -# TODO: is there a safe way to shrink a volume group? -vol_group=cinder-volumes -vol_file=/mnt/state/var/lib/cinder/${vol_group}-backing-file -size=$(os-apply-config --key cinder.volume_size_mb --type int)M - -if ! vgs $vol_group; then - if ! [ -f $vol_file ] ; then - truncate -s $size $vol_file - fi - dev=$(losetup -j $vol_file) - # RACE: will be unstable if other things are running. o-r-c has a - # lock though so only manual runners of this script should make it unstable - if [ -z "$dev" ] ; then - dev=$(sudo losetup -f --show $vol_file) - fi - # This file is fairly complex and platform dependent. However, we need to - # accept only this device or volumes created within cinder could be - # added to this volume group erroneously. - # Note that this will likely break any other element trying to use LVM. - sed --in-place=.bak -e \ - "s|^\(\s*\)filter = \[.*|\1filter = [ \"a\|^${dev}\|\", \"r/.*/\" ]|" \ - /etc/lvm/lvm.conf - if ! vgs $vol_group; then vgcreate $vol_group $dev; fi -fi diff --git a/elements/cinder-volume/os-refresh-config/post-configure.d/74-cinder-volume b/elements/cinder-volume/os-refresh-config/post-configure.d/74-cinder-volume deleted file mode 100755 index 1d362a0b1..000000000 --- a/elements/cinder-volume/os-refresh-config/post-configure.d/74-cinder-volume +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -set -eu - -IS_NFS=$(os-apply-config --key cinder.include_nfs_backend --type raw --key-default 'false') - -os-svc-enable -an cinder-volume - -if [ "$IS_NFS" != "false" ] ; then - # If *shared* NFS backend is used then running multiple instances - # of cinder-volume may cause data inconsistency as - # described here: https://bugs.launchpad.net/cinder/+bug/1322190. - # As a workaround we run cinder-volume in a/p mode using pacemaker. - pcmk-service-create -n cinder-volume -else - os-svc-restart -an cinder-volume -fi diff --git a/elements/cinder-volume/os-refresh-config/pre-configure.d/97-cinder-volume-iptables b/elements/cinder-volume/os-refresh-config/pre-configure.d/97-cinder-volume-iptables deleted file mode 100755 index 19edee754..000000000 --- a/elements/cinder-volume/os-refresh-config/pre-configure.d/97-cinder-volume-iptables +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -eu - -add-rule INPUT -p tcp --dport 3260 -j ACCEPT #iscsi \ No newline at end of file diff --git a/elements/cinder-volume/pkg-map b/elements/cinder-volume/pkg-map deleted file mode 100644 index 0be855c0e..000000000 --- a/elements/cinder-volume/pkg-map +++ /dev/null @@ -1,16 +0,0 @@ -{ - "family": { - "redhat": { - "qemu_img_package": "qemu-img" - }, - "debian": { - "qemu_img_package": "qemu-utils" - }, - "suse": { - "qemu_img_package": "qemu-tools" - } - }, - "default": { - "qemu_img_package": "qemu-img" - } -} diff --git a/elements/cinder-volume/svc-map b/elements/cinder-volume/svc-map deleted file mode 100644 index 2f2682078..000000000 --- a/elements/cinder-volume/svc-map +++ /dev/null @@ -1,3 +0,0 @@ -cinder-volume: - default: openstack-cinder-volume - debian: cinder-volume diff --git a/elements/cinder/README.md b/elements/cinder/README.md deleted file mode 100644 index d33899788..000000000 --- a/elements/cinder/README.md +++ /dev/null @@ -1,15 +0,0 @@ -Install and configure Cinder. - -An appropriate target element (such as cinder-tgt or cinder-lio) must be included -in images that use cinder. - -Configuration -------------- - - cinder: - verbose: False - - Print more verbose output (set logging level to INFO instead of default WARNING level). - debug: False - - Print debugging output (set logging level to DEBUG instead of default WARNING level). - iscsi-helper: tgtadm - - Specifies the iSCSI helper to use. Must match the target element included in the image. diff --git a/elements/cinder/cleanup.d/50-remove-source-cinder b/elements/cinder/cleanup.d/50-remove-source-cinder deleted file mode 100755 index a13642270..000000000 --- a/elements/cinder/cleanup.d/50-remove-source-cinder +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eu - -sudo rm -fr "${TMP_MOUNT_PATH}/opt/stack/cinder" diff --git a/elements/cinder/element-deps b/elements/cinder/element-deps deleted file mode 100644 index 334d8005f..000000000 --- a/elements/cinder/element-deps +++ /dev/null @@ -1,7 +0,0 @@ -iptables -os-apply-config -os-refresh-config -os-svc-install -selinux -source-repositories -use-ephemeral diff --git a/elements/cinder/environment.d/10-cinder-venv-dir.bash b/elements/cinder/environment.d/10-cinder-venv-dir.bash deleted file mode 100644 index e43c558cd..000000000 --- a/elements/cinder/environment.d/10-cinder-venv-dir.bash +++ /dev/null @@ -1,6 +0,0 @@ -if [ -z "${CINDER_VENV_DIR:-}" ]; then - export CINDER_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/cinder"} -fi -if [ -z "${CINDER_EXTRA_INSTALL_OPTS:-}" ]; then - export CINDER_EXTRA_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-""} -fi diff --git a/elements/cinder/install.d/73-cinder b/elements/cinder/install.d/73-cinder deleted file mode 100755 index d5d49c6d3..000000000 --- a/elements/cinder/install.d/73-cinder +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -install -d -o root -g cinder -m 0770 /var/lib/cinder -install -d -o root -g cinder -m 0770 /var/lib/cinder/volumes -register-state-path --leave-symlink /var/lib/cinder diff --git a/elements/cinder/install.d/cinder-package-install/72-cinder b/elements/cinder/install.d/cinder-package-install/72-cinder deleted file mode 100755 index 97406f294..000000000 --- a/elements/cinder/install.d/cinder-package-install/72-cinder +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -set -eux - -# lvm2 is needed by the 72-cinder-resize-volume-groups os-refresh-config script -install-packages openstack-cinder lvm2 - -rm -rf /etc/cinder/volumes -ln -s /var/lib/cinder/volumes /etc/cinder/volumes diff --git a/elements/cinder/install.d/cinder-source-install/72-cinder b/elements/cinder/install.d/cinder-source-install/72-cinder deleted file mode 100755 index 28ac7aa49..000000000 --- a/elements/cinder/install.d/cinder-source-install/72-cinder +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -set -eux - -install-packages lvm2 libssl-dev libffi-dev -echo "qpid-python" | tee -a /opt/stack/cinder/requirements.txt -os-svc-install $CINDER_EXTRA_INSTALL_OPTS -i "$CINDER_VENV_DIR" -u cinder -r /opt/stack/cinder - -cp -a /opt/stack/cinder/etc/cinder/rootwrap* /etc/cinder -cp /opt/stack/cinder/etc/cinder/api-paste.ini /etc/cinder/api-paste.ini -cp /opt/stack/cinder/etc/cinder/policy.json /etc/cinder/policy.json - -ln -sf $CINDER_VENV_DIR/bin/cinder-rootwrap /usr/local/bin/cinder-rootwrap - -echo "cinder ALL=(root) NOPASSWD: /usr/local/bin/cinder-rootwrap" > /etc/sudoers.d/cinder -chmod 0440 /etc/sudoers.d/cinder -visudo -c - -add-selinux-path-substitution /usr/bin $CINDER_VENV_DIR/bin diff --git a/elements/cinder/os-apply-config/etc/cinder/cinder.conf b/elements/cinder/os-apply-config/etc/cinder/cinder.conf deleted file mode 100644 index 80d64a096..000000000 --- a/elements/cinder/os-apply-config/etc/cinder/cinder.conf +++ /dev/null @@ -1,104 +0,0 @@ -[DEFAULT] - -# allow metadata to override verbose and debug configuration -{{#cinder.verbose}} -# Print more verbose output (set logging level to INFO instead -# of default WARNING level). (boolean value) -verbose={{cinder.verbose}} -{{/cinder.verbose}} -{{#cinder.debug}} -# Print debugging output (set logging level to DEBUG instead -# of default WARNING level). (boolean value) -debug={{cinder.debug}} -{{/cinder.debug}} - -{{#haproxy}} -{{#stunnel.connect_host}} -osapi_volume_listen = {{stunnel.connect_host}} -{{/stunnel.connect_host}} -{{^stunnel.connect_host}} -osapi_volume_listen = {{local-ipv4}} -{{/stunnel.connect_host}} -{{/haproxy}} - -state_path = /mnt/state/var/lib/cinder -api_paste_config = /etc/cinder/api-paste.ini - -{{#cinder.include_nfs_backend}} -# If shared NFS backend is used, we need to set same host for -# all cinder-volume instances as a workaround for bug -# https://bugs.launchpad.net/cinder/+bug/1322190. -host = hostgroup -nfs_shares_config=/etc/cinder/nfs_shares.txt -nfs_mount_point_base=/mnt/state/var/lib/cinder/nfs -volume_driver=cinder.volume.drivers.nfs.NfsDriver -{{/cinder.include_nfs_backend}} - -auth_strategy = keystone - -sql_connection={{cinder.db}} - -{{#cinder.image_conversion_dir}} -image_conversion_dir={{cinder.image_conversion_dir}} -{{/cinder.image_conversion_dir}} - -{{#cinder.iscsi-helper}} -iscsi_helper={{.}} -{{/cinder.iscsi-helper}} - -glance_host = {{glance.host}} -glance_port = {{glance.port}} - -{{#rabbit}} -rpc_backend=cinder.openstack.common.rpc.impl_kombu -rabbit_password = {{password}} -{{#rabbit.host}} -rabbit_host={{.}} -{{/rabbit.host}} -{{^rabbit.host}} -rabbit_hosts={{rabbit.nodes}} -rabbit_ha_queues=true -{{/rabbit.host}} -{{/rabbit}} - -{{#qpid}} -rpc_backend=cinder.openstack.common.rpc.impl_qpid -qpid_hostname = {{host}} -qpid_port = 5672 -qpid_username = {{username}} -qpid_password = {{password}} -{{/qpid}} - -{{#cinder.keymgr}} -[keymgr] -fixed_key = {{fixed_key}} -{{/cinder.keymgr}} - -[keystone_authtoken] -service_protocol = http -service_host = {{keystone.host}} -service_port = 5000 -admin_tenant_name = service -admin_user = cinder -admin_password = {{cinder.service-password}} -auth_uri = http://{{keystone.host}}:5000/v2.0 -identity_uri=http://{{keystone.host}}:35357 - -[oslo_concurrency] -lock_path = /mnt/state/var/lib/cinder - -# Passthrough configuration support -{{#cinder}} -{{#config}} -[{{{section}}}] -{{#values}} -{{#comment}} -# {{{.}}} -{{/comment}} -{{#option}} -{{{option}}} = {{{value}}} -{{/option}} -{{/values}} - -{{/config}} -{{/cinder}} diff --git a/elements/cinder/os-apply-config/etc/cinder/rootwrap.conf b/elements/cinder/os-apply-config/etc/cinder/rootwrap.conf deleted file mode 100644 index f768c8dbf..000000000 --- a/elements/cinder/os-apply-config/etc/cinder/rootwrap.conf +++ /dev/null @@ -1,30 +0,0 @@ -# Configuration for cinder-rootwrap -# This file should be owned by (and only-writable by) the root user - -[DEFAULT] -# List of directories to load filter definitions from (separated by ','). -# These directories MUST all be only writable by root ! -filters_path=/etc/cinder/rootwrap.d,/usr/share/cinder/rootwrap - -# List of directories to search executables in, in case filters do not -# explicitely specify a full path (separated by ',') -# If not specified, defaults to system PATH environment variable. -# These directories MUST all be only writable by root ! -# -# NOTE: TripleO source installs require /usr/local/bin -# to be here for cinder-rtstool access (LIO) -exec_dirs=/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin - -# Enable logging to syslog -# Default value is False -use_syslog=False - -# Which syslog facility to use. -# Valid values include auth, authpriv, syslog, local0, local1... -# Default value is 'syslog' -syslog_log_facility=syslog - -# Which messages to log. -# INFO means log all usage -# ERROR means only log unsuccessful attempts -syslog_log_level=ERROR diff --git a/elements/cinder/pre-install.d/00-cinder-disable-requiretty b/elements/cinder/pre-install.d/00-cinder-disable-requiretty deleted file mode 100755 index fafa19a54..000000000 --- a/elements/cinder/pre-install.d/00-cinder-disable-requiretty +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -eu - -if [ -d /etc/sudoers.d ]; then - echo "Defaults:cinder !requiretty" > /etc/sudoers.d/cinder-notty - chmod 0440 /etc/sudoers.d/cinder-notty - visudo -c -fi diff --git a/elements/cinder/source-repository-cinder b/elements/cinder/source-repository-cinder deleted file mode 100644 index 8a90e44a5..000000000 --- a/elements/cinder/source-repository-cinder +++ /dev/null @@ -1 +0,0 @@ -cinder git /opt/stack/cinder https://git.openstack.org/openstack/cinder.git diff --git a/elements/collectl/README.md b/elements/collectl/README.md deleted file mode 100644 index e5bc501a1..000000000 --- a/elements/collectl/README.md +++ /dev/null @@ -1,5 +0,0 @@ -Installs the collectl package for gathering performance data when needed. - -The default configuration file /etc/collectl.conf has been changed to examine -cpu, disk, memory, network and process stats only and record eth and bond -stats for the networks. Both raw and plottable files will be produced. diff --git a/elements/collectl/element-deps b/elements/collectl/element-deps deleted file mode 100644 index 8154303e6..000000000 --- a/elements/collectl/element-deps +++ /dev/null @@ -1,2 +0,0 @@ -os-apply-config -os-svc-install diff --git a/elements/collectl/install.d/85-collectl b/elements/collectl/install.d/85-collectl deleted file mode 100755 index 363c95685..000000000 --- a/elements/collectl/install.d/85-collectl +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -install-packages collectl - -os-svc-enable -an collectl - -# The default configuration has been changed to examine cpu, disk, memory, -# network and process stats only and only record eth and bond stats for the -# networks. Both raw and plottable files will be produced. - -sudo sed -i "/^DaemonCommands/c\DaemonCommands = -f /var/log/collectl -r00:00,7 -m -F60 -scdmnZ --rawnetfilt eth|bond -P --rawtoo" /etc/collectl.conf - -# Save all collectl logs to /mnt/state -register-state-path --leave-symlink /var/log/collectl diff --git a/elements/collectl/svc-map b/elements/collectl/svc-map deleted file mode 100644 index 7ed3bea3e..000000000 --- a/elements/collectl/svc-map +++ /dev/null @@ -1,2 +0,0 @@ -collectl: - default: collectl diff --git a/elements/common-venv/README.md b/elements/common-venv/README.md deleted file mode 100644 index 90fa0e628..000000000 --- a/elements/common-venv/README.md +++ /dev/null @@ -1 +0,0 @@ -Install everything in a common virtualenv. diff --git a/elements/common-venv/environment.d/01-common-venv-dir.bash b/elements/common-venv/environment.d/01-common-venv-dir.bash deleted file mode 100644 index cf1e61756..000000000 --- a/elements/common-venv/environment.d/01-common-venv-dir.bash +++ /dev/null @@ -1,6 +0,0 @@ -export OPENSTACK_VENV_DIR="/opt/stack/venvs/openstack" - -# Install Nova in its own venv since it uses -# --system-site-packages and it is probably best -# to keep that isolated for now -export NOVA_VENV_DIR="/opt/stack/venvs/nova" diff --git a/elements/contrail-repo/README.md b/elements/contrail-repo/README.md deleted file mode 100644 index e4a0ff3d3..000000000 --- a/elements/contrail-repo/README.md +++ /dev/null @@ -1,6 +0,0 @@ -Enables the Contrail repository. - -This element requires the $CONTRAIL_URL variable set to specify a path to a -contrail-install-packages package to be installed. - -This elements currently only works on a RHEL based system. diff --git a/elements/contrail-repo/element-deps b/elements/contrail-repo/element-deps deleted file mode 100644 index d2c42c4bf..000000000 --- a/elements/contrail-repo/element-deps +++ /dev/null @@ -1,2 +0,0 @@ -pip-manifest -delorean-repo diff --git a/elements/contrail-repo/post-install.d/10-contrail-setup b/elements/contrail-repo/post-install.d/10-contrail-setup deleted file mode 100755 index 0cb3b56ed..000000000 --- a/elements/contrail-repo/post-install.d/10-contrail-setup +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eux - -/opt/contrail/contrail_packages/setup.sh diff --git a/elements/contrail-repo/pre-install.d/10-contrail-repo b/elements/contrail-repo/pre-install.d/10-contrail-repo deleted file mode 100755 index 8fdf3c3f1..000000000 --- a/elements/contrail-repo/pre-install.d/10-contrail-repo +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -set -eux - -export CONTRAIL_URL=${CONTRAIL_URL:-""} - -if [ -z "$CONTRAIL_URL" ]; then - echo "One should specify an HTTP URL to the contrail-install-packages for this element to work" - exit 1 -fi - -yum -y install $CONTRAIL_URL diff --git a/elements/corosync/README.md b/elements/corosync/README.md deleted file mode 100644 index cabd732c1..000000000 --- a/elements/corosync/README.md +++ /dev/null @@ -1,15 +0,0 @@ -Installs and configures corosync element. -This will be used in pair with pacemaker for cluster resources management. - -Configuration --------------- - corosync: - bindnetaddr: 192.0.2.10 - mcastport: 5577 - nodes: - - - ip : 192.0.2.10 - - - ip : 192.0.2.14 - - - ip : 192.0.2.18 diff --git a/elements/corosync/element-deps b/elements/corosync/element-deps deleted file mode 100644 index 269283a41..000000000 --- a/elements/corosync/element-deps +++ /dev/null @@ -1,4 +0,0 @@ -os-apply-config -os-refresh-config -os-svc-install -package-installs diff --git a/elements/corosync/install.d/package-installs-corosync b/elements/corosync/install.d/package-installs-corosync deleted file mode 100644 index d746f1833..000000000 --- a/elements/corosync/install.d/package-installs-corosync +++ /dev/null @@ -1 +0,0 @@ -corosync diff --git a/elements/corosync/os-apply-config/etc/corosync/corosync.conf b/elements/corosync/os-apply-config/etc/corosync/corosync.conf deleted file mode 100644 index 5f06dc897..000000000 --- a/elements/corosync/os-apply-config/etc/corosync/corosync.conf +++ /dev/null @@ -1,45 +0,0 @@ -totem { - version: 2 - crypto_cipher: none - crypto_hash: none - transport: udpu - interface { - ringnumber: 0 - bindnetaddr: {{corosync.bindnetaddr}} - mcastport: {{corosync.mcastport}} - ttl: 1 - } -} - -nodelist { - {{#corosync.nodes}} - node { - ring0_addr: {{ip}} - } - {{/corosync.nodes}} -} - -logging { - fileline: off - to_stderr: no - to_syslog: yes - debug: off - timestamp: on - logger_subsys { - subsys: QUORUM - debug: off - } -} - -amf { - mode: disabled -} - -aisexec { - user: root - group: root -} - -quorum { - provider: corosync_votequorum -} diff --git a/elements/corosync/os-apply-config/etc/default/corosync b/elements/corosync/os-apply-config/etc/default/corosync deleted file mode 100644 index 09eaef3e5..000000000 --- a/elements/corosync/os-apply-config/etc/default/corosync +++ /dev/null @@ -1 +0,0 @@ -START=yes diff --git a/elements/corosync/os-refresh-config/post-configure.d/14-corosync b/elements/corosync/os-refresh-config/post-configure.d/14-corosync deleted file mode 100755 index df6142eaf..000000000 --- a/elements/corosync/os-refresh-config/post-configure.d/14-corosync +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eux - -os-svc-enable -an corosync - -os-svc-restart -an corosync diff --git a/elements/corosync/svc-map b/elements/corosync/svc-map deleted file mode 100644 index b7fff6a40..000000000 --- a/elements/corosync/svc-map +++ /dev/null @@ -1,2 +0,0 @@ -corosync: - default: corosync diff --git a/elements/debian-mirror/README.md b/elements/debian-mirror/README.md deleted file mode 100644 index 71d8ee75a..000000000 --- a/elements/debian-mirror/README.md +++ /dev/null @@ -1,20 +0,0 @@ -Installs apt-mirror from packages. - -Please note that Debian or Ubuntu mirrors are very large -- a single -architecture of a single series is roughly 50GiB, and a full Ubuntu archive -is on the order of 600GiB -- so please keep in mind when you attach storage. - -Configuration -------------- - - debian-mirror: - mirror: "http://archive.ubuntu.com/ubuntu" - # The mirror you wish to mirror from. - suites: ["saucy", "saucy-updates", "saucy-security"] - # An array of suites you wish to mirror, such as `saucy' or `wheezy'. - architectures: [{"arch": "amd64"}] - # An array of dictionaries containing the architectures you wish to - # mirror. - components: ["main", "restricted", "universe", "multiverse"] - # An array of components you wish to mirror, such as `main' or - # `non-free'. diff --git a/elements/debian-mirror/element-deps b/elements/debian-mirror/element-deps deleted file mode 100644 index b0a0c5d7d..000000000 --- a/elements/debian-mirror/element-deps +++ /dev/null @@ -1 +0,0 @@ -os-apply-config diff --git a/elements/debian-mirror/install.d/82-debmirror b/elements/debian-mirror/install.d/82-debmirror deleted file mode 100755 index cde2fed01..000000000 --- a/elements/debian-mirror/install.d/82-debmirror +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -set -eu - -install-packages apt-mirror - -sed -i -e 's/^#0/0/' -e 's&/var/spool/apt-mirror&/mnt/state/srv/apt-mirror&' /etc/cron.d/apt-mirror diff --git a/elements/debian-mirror/os-apply-config/etc/apt/mirror.list b/elements/debian-mirror/os-apply-config/etc/apt/mirror.list deleted file mode 100644 index 54d99c342..000000000 --- a/elements/debian-mirror/os-apply-config/etc/apt/mirror.list +++ /dev/null @@ -1,17 +0,0 @@ -set base_path /mnt/state/srv/apt-mirror -set mirror_path $base_path/mirror -set skel_path $base_path/skel -set var_path $base_path/var - -set nthreads 1 -set _autoclean 1 - -{{#debian-mirror}} -{{#architectures}} -{{#suites}} -deb-{{arch}} {{mirror}} {{.}} {{#components}}{{.}} {{/components}} -{{/suites}} -{{/architectures}} - -clean {{mirror}} -{{/debian-mirror}} diff --git a/elements/delorean-repo/README.md b/elements/delorean-repo/README.md deleted file mode 100644 index fa3c6f881..000000000 --- a/elements/delorean-repo/README.md +++ /dev/null @@ -1,18 +0,0 @@ -Configure the image to pull packages from a Delorean repo - -This element configures the image such that it downloads -packages from the specified Delorean repository. To use set -DELOREAN\_REPO\_URL to the Delorean repo you'd like to use. -This can be 'current' or any revision in the past that you'd -like to use. Example: - - export DELOREAN\_REPO\_URL=http://localhost/~user/repos/current - -Delorean is a tool that can be used to automate building upstream -packages: - - https://github.com/openstack-packages/delorean - -The Delorean tool currently supports Fedora packages and Yum -repositories. Support for other distributions may be added in -the future. diff --git a/elements/delorean-repo/element-deps b/elements/delorean-repo/element-deps deleted file mode 100644 index ef25eec63..000000000 --- a/elements/delorean-repo/element-deps +++ /dev/null @@ -1 +0,0 @@ -pkg-map diff --git a/elements/delorean-repo/pkg-map b/elements/delorean-repo/pkg-map deleted file mode 100644 index 0339fd475..000000000 --- a/elements/delorean-repo/pkg-map +++ /dev/null @@ -1,5 +0,0 @@ -{ - "default": { - "yum_plugin_priorities_package": "yum-plugin-priorities" - } -} diff --git a/elements/delorean-repo/pre-install.d/01-delorean-clean-metadata b/elements/delorean-repo/pre-install.d/01-delorean-clean-metadata deleted file mode 100755 index a4d955098..000000000 --- a/elements/delorean-repo/pre-install.d/01-delorean-clean-metadata +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -e -set -o xtrace - -yum clean metadata diff --git a/elements/delorean-repo/pre-install.d/01-delorean-repo b/elements/delorean-repo/pre-install.d/01-delorean-repo deleted file mode 100755 index 600c2dc0f..000000000 --- a/elements/delorean-repo/pre-install.d/01-delorean-repo +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -set -e -set -o xtrace - -export DELOREAN_REPO_FILE=${DELOREAN_REPO_FILE:-"delorean.repo"} - -# delorean requires delorean-deps -if [[ "rhel7 centos7" =~ "$DISTRO_NAME" ]]; then - - if [ -z "$STABLE_RELEASE" ]; then - curl -L http://trunk.rdoproject.org/centos7/delorean-deps.repo -o /etc/yum.repos.d/delorean-deps.repo - else - curl -L http://trunk.rdoproject.org/centos7-$STABLE_RELEASE/delorean-deps.repo -o /etc/yum.repos.d/delorean-deps.repo - fi - -elif [[ "fedora" =~ "$DISTRO_NAME" ]]; then - curl -L http://trunk.rdoproject.org/f$DIB_RELEASE/delorean-deps.repo -o /etc/yum.repos.d/delorean-deps.repo -fi - -if [ -n "$DELOREAN_REPO_URL" ]; then - curl -L $DELOREAN_REPO_URL/$DELOREAN_REPO_FILE -o /etc/yum.repos.d/$DELOREAN_REPO_FILE -else - echo "Please configure a DELOREAN_REPO_URL." - exit 1 -fi diff --git a/elements/delorean-repo/pre-install.d/03-install-yum-priorities b/elements/delorean-repo/pre-install.d/03-install-yum-priorities deleted file mode 100755 index 846e07480..000000000 --- a/elements/delorean-repo/pre-install.d/03-install-yum-priorities +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -e -set -o xtrace - -install-packages -m delorean-repo yum_plugin_priorities_package diff --git a/elements/devstack/README.md b/elements/devstack/README.md deleted file mode 100644 index 8249e703d..000000000 --- a/elements/devstack/README.md +++ /dev/null @@ -1,5 +0,0 @@ -Creates an image prepped to make a devstack baremetal cloud. See -incubator/scripts/demo within the built image. - -Forces a 16GB image to allow room for Swift, Cinder and instance -disk images. diff --git a/elements/devstack/block-device-size.d/10-size b/elements/devstack/block-device-size.d/10-size deleted file mode 100755 index e2fce0a12..000000000 --- a/elements/devstack/block-device-size.d/10-size +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -# Enforce a maximum size on the image size - -set -eu - -if (( '16' '>' $DIB_IMAGE_SIZE )); then - echo DIB_IMAGE_SIZE=16 -fi diff --git a/elements/devstack/element-deps b/elements/devstack/element-deps deleted file mode 100644 index 49d7b40d6..000000000 --- a/elements/devstack/element-deps +++ /dev/null @@ -1,2 +0,0 @@ -source-repositories -stackuser diff --git a/elements/devstack/install.d/52-image-toolchain b/elements/devstack/install.d/52-image-toolchain deleted file mode 100755 index f5542110c..000000000 --- a/elements/devstack/install.d/52-image-toolchain +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -# Install the image creation toolchain so folk can create their own images -# (also includes the bootstrap-from-devstack facilities needed until we have -# full image mastering of openstack). - -set -eu -set -o xtrace - -install-packages git -if [ -n "$http_proxy" ]; then - sudo -Hiu stack git config --global http.proxy $http_proxy -fi - -chown -R stack ~stack/incubator diff --git a/elements/devstack/install.d/53-devstack b/elements/devstack/install.d/53-devstack deleted file mode 100755 index 2e48c5dc3..000000000 --- a/elements/devstack/install.d/53-devstack +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# Initialize devstack in the bootstrap image - -set -eu -set -o xtrace - -install-packages git -if [ -n "$http_proxy" ]; then - sudo -Hiu stack git config --global http.proxy $http_proxy -fi - -chown -R stack ~stack/devstack diff --git a/elements/devstack/install.d/97-haveged b/elements/devstack/install.d/97-haveged deleted file mode 100755 index de9246355..000000000 --- a/elements/devstack/install.d/97-haveged +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -# Install the haveged daemon so ssh config on startup isn't glacial. - -set -eu -set -o xtrace - -install-packages haveged diff --git a/elements/devstack/install.d/98-baremetal-network b/elements/devstack/install.d/98-baremetal-network deleted file mode 100755 index 318f3114a..000000000 --- a/elements/devstack/install.d/98-baremetal-network +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -# Configure eth1, the baremetal network. - -set -eu -set -o xtrace - -cat << EOF >> /etc/network/interfaces - -auto eth1 -iface eth1 inet static - # This matches the localrc we have configured for demo environments. - # It is unroutable and not suitable for production: it is a test network. - address 192.0.2.1 - netmask 255.255.255.0 - # Expose the metadata service needed by the nodes as they boot. - up iptables -t nat -A PREROUTING -d 169.254.169.254 -p tcp -m tcp --dport 80 -j REDIRECT --to-port 8775 - # Grant access to the rest of the world by routing via the bootstrap node - # (libvirt rejects traffic from unknown ip addresses, meaning that using - # the default libvirt nat environment requires the MASQUERADE for the bare - # metal nodes unless you reconfigure libvirt as well). Alternatively you - # can create a second bridge on your machine and attached eth0 to that - # (with an appropriate static config (or dhcp on the bridge). - up iptables -t nat -A POSTROUTING -s 192.0.2.0/24 -o eth0 -j MASQUERADE - # This matches the client range defined in localrc. - up ip addr add 192.0.2.33/29 dev eth1 -EOF diff --git a/elements/devstack/install.d/99-ssh b/elements/devstack/install.d/99-ssh deleted file mode 100755 index 15fa78471..000000000 --- a/elements/devstack/install.d/99-ssh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -# Regenerate host keys now. XXX: Really should be a cloud-init task, should get -# that working. - -set -eu -set -o xtrace - -dpkg-reconfigure openssh-server diff --git a/elements/devstack/source-repository-devstack b/elements/devstack/source-repository-devstack deleted file mode 100644 index aa2f49eee..000000000 --- a/elements/devstack/source-repository-devstack +++ /dev/null @@ -1 +0,0 @@ -devstack git /home/stack/devstack https://git.openstack.org/openstack-dev/devstack.git diff --git a/elements/devstack/source-repository-incubator b/elements/devstack/source-repository-incubator deleted file mode 100644 index 5c8842939..000000000 --- a/elements/devstack/source-repository-incubator +++ /dev/null @@ -1 +0,0 @@ -incubator git /home/stack/incubator https://github.com/tripleo/incubator-bootstrap.git diff --git a/elements/disable-os-collect-config/README.md b/elements/disable-os-collect-config/README.md deleted file mode 100644 index 1ff0d15a0..000000000 --- a/elements/disable-os-collect-config/README.md +++ /dev/null @@ -1,7 +0,0 @@ -Stop, disable, and exit os-collect-config - -When using a non-standard updating tool (such as ansible) we want to avoid -blocking on a long running os-refresh-config process when we attempt to -perform an update. By setting /mnt/state/disable-os-collect-config and -installing this element a tool can cause os-collect-config to disable itself -early on during an initial run. diff --git a/elements/disable-os-collect-config/os-refresh-config/pre-configure.d/15-disable-os-collect-config b/elements/disable-os-collect-config/os-refresh-config/pre-configure.d/15-disable-os-collect-config deleted file mode 100755 index bba53ee90..000000000 --- a/elements/disable-os-collect-config/os-refresh-config/pre-configure.d/15-disable-os-collect-config +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -set -eu -set -o pipefail - -if [ -f /mnt/state/disable-os-collect-config ]; then - service os-collect-config stop - os-svc-enable-upstart os-collect-config disable - echo "Found os-collect-config disable file, disabling and exiting!" - exit 1 -fi diff --git a/elements/diskimage-builder/README.md b/elements/diskimage-builder/README.md deleted file mode 100644 index 8fa0dd47b..000000000 --- a/elements/diskimage-builder/README.md +++ /dev/null @@ -1,5 +0,0 @@ -Install diskimage-builder from git. - -diskimage-builder has the core functionality for building disk images, file -system images and ramdisk images for use with OpenStack (both virtual and bare -metal). diff --git a/elements/diskimage-builder/element-deps b/elements/diskimage-builder/element-deps deleted file mode 100644 index 7ecaecb25..000000000 --- a/elements/diskimage-builder/element-deps +++ /dev/null @@ -1,2 +0,0 @@ -pip-and-virtualenv -source-repositories diff --git a/elements/diskimage-builder/install.d/55-diskimage-builder b/elements/diskimage-builder/install.d/55-diskimage-builder deleted file mode 100755 index b7d2027f5..000000000 --- a/elements/diskimage-builder/install.d/55-diskimage-builder +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -set -eux - -pushd /opt/stack/diskimage-builder -pip install . -popd diff --git a/elements/diskimage-builder/source-repository-diskimage-builder b/elements/diskimage-builder/source-repository-diskimage-builder deleted file mode 100644 index 2a20ef8fd..000000000 --- a/elements/diskimage-builder/source-repository-diskimage-builder +++ /dev/null @@ -1 +0,0 @@ -diskimage-builder git /opt/stack/diskimage-builder https://git.openstack.org/openstack/diskimage-builder diff --git a/elements/geard/README.md b/elements/geard/README.md deleted file mode 100644 index 97189ce1d..000000000 --- a/elements/geard/README.md +++ /dev/null @@ -1,4 +0,0 @@ -Element to install gear and run geard - -geard is a python implementation of the gearman protocol server -https://pypi.python.org/pypi/gear diff --git a/elements/geard/element-deps b/elements/geard/element-deps deleted file mode 100644 index d785d4e17..000000000 --- a/elements/geard/element-deps +++ /dev/null @@ -1,2 +0,0 @@ -os-refresh-config -os-svc-install diff --git a/elements/geard/install.d/44-geard b/elements/geard/install.d/44-geard deleted file mode 100755 index e9d8453e5..000000000 --- a/elements/geard/install.d/44-geard +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -set -eux - -mkdir -p /opt/stack/venvs -virtualenv /opt/stack/venvs/gear - -/opt/stack/venvs/gear/bin/pip install gear - -useradd gear -os-svc-daemon -an geard -u gear -c geard -- -d -os-svc-enable -an geard diff --git a/elements/geard/os-refresh-config/pre-configure.d/97-gearman-iptables b/elements/geard/os-refresh-config/pre-configure.d/97-gearman-iptables deleted file mode 100755 index 5e4ea5fde..000000000 --- a/elements/geard/os-refresh-config/pre-configure.d/97-gearman-iptables +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -set -eu - -OK=/opt/stack/gearman-iptables.ok - -if [ -e $OK ] ; then - exit 0 -fi - -DISTRO=`lsb_release -si` || true - -if [[ "Fedora" = "$DISTRO" ]]; then - - # Check if the iptables service is active - if systemctl is-active iptables.service ; then - IPT_FILE=/etc/sysconfig/iptables - if [ -f $IPT_FILE ]; then - iptables-restore < $IPT_FILE - fi - - # Gearman server - iptables -I INPUT -p tcp --dport 4730 -j ACCEPT - - iptables-save > $IPT_FILE - - fi - -fi - -touch $OK diff --git a/elements/geard/svc-map b/elements/geard/svc-map deleted file mode 100644 index 9f2baab83..000000000 --- a/elements/geard/svc-map +++ /dev/null @@ -1,3 +0,0 @@ -geard: - default: geard - diff --git a/elements/glance/README.md b/elements/glance/README.md deleted file mode 100644 index ec045f53c..000000000 --- a/elements/glance/README.md +++ /dev/null @@ -1,39 +0,0 @@ -Install and configure Glance. - -Configuration -------------- - - glance: - db: mysql://glance:unset@localhost/glance - - SQLAlchemy database connection string - service-password: password - - The service password for the glance user - api: - verbose: False - - Show more verbose log output (sets INFO log level output) - debug: False - - Show debugging output in logs (sets DEBUG log level output) - backend: swift - - The backend store to use - swift-store-user: service:glance - swift-store-key: userpassword - - The credentials to use against swift if using the swift backend. - workers: 1 - - The number of Glance API server processes to start. - notifier-strategy: noop - - Strategy to use for notification queue. - log-file: '' - - The path of the file to use for logging messages from Glance’s API server. - - The default is unset, which implies stdout. - default-log-levels: - - Logging: fine tune default log levels - registry: - verbose: False - - Show more verbose log output (sets INFO log level output) - debug: False - - Show debugging output in logs (sets DEBUG log level output) - log-file: '' - - The path of the file to use for logging messages from Glance’s Registry server. - - The default is unset, which implies stdout. - default-log-levels: - - Logging: fine tune default log levels diff --git a/elements/glance/cleanup.d/50-remove-source-glance b/elements/glance/cleanup.d/50-remove-source-glance deleted file mode 100755 index a3fa0f1ca..000000000 --- a/elements/glance/cleanup.d/50-remove-source-glance +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eu - -sudo rm -fr "${TMP_MOUNT_PATH}/opt/stack/glance" diff --git a/elements/glance/element-deps b/elements/glance/element-deps deleted file mode 100644 index 03eabbd71..000000000 --- a/elements/glance/element-deps +++ /dev/null @@ -1,7 +0,0 @@ -iptables -os-apply-config -os-is-bootstrap-host -os-refresh-config -os-svc-install -selinux -source-repositories diff --git a/elements/glance/environment.d/10-glance-venv-dir.bash b/elements/glance/environment.d/10-glance-venv-dir.bash deleted file mode 100644 index a3847c47d..000000000 --- a/elements/glance/environment.d/10-glance-venv-dir.bash +++ /dev/null @@ -1,6 +0,0 @@ -if [ -z "${GLANCE_VENV_DIR:-}" ]; then - export GLANCE_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/glance"} -fi -if [ -z "${GLANCE_EXTRA_INSTALL_OPTS:-}" ]; then - export GLANCE_EXTRA_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-""} -fi diff --git a/elements/glance/install.d/glance-package-install/75-glance b/elements/glance/install.d/glance-package-install/75-glance deleted file mode 100755 index 199194617..000000000 --- a/elements/glance/install.d/glance-package-install/75-glance +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages openstack-glance - -# When glance-manage is run as root during os-refresh-config it will create the -# initial glance registry log file root owned, and then the glance service will -# fail to start. Create the initial glance owned log file here instead. -touch /var/log/glance/registry.log -chown glance.glance /var/log/glance/registry.log diff --git a/elements/glance/install.d/glance-source-install/75-glance b/elements/glance/install.d/glance-source-install/75-glance deleted file mode 100755 index 1e3caba9b..000000000 --- a/elements/glance/install.d/glance-source-install/75-glance +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -set -eux - -install-packages python-mysqldb libssl-dev libffi-dev - -os-svc-install $GLANCE_EXTRA_INSTALL_OPTS -i "$GLANCE_VENV_DIR" -u glance -r /opt/stack/glance - -ln -s $GLANCE_VENV_DIR/bin/glance-manage /usr/local/bin/glance-manage - -cp /opt/stack/glance/etc/policy.json /etc/glance/policy.json -cp /opt/stack/glance/etc/schema-image.json /etc/glance/schema-image.json -cp /opt/stack/glance/etc/glance-api-paste.ini /etc/glance/glance-api-paste.ini -cp /opt/stack/glance/etc/glance-registry-paste.ini /etc/glance/glance-registry-paste.ini - -os-svc-daemon -a -i "$GLANCE_VENV_DIR" glance-api glance glance-api -os-svc-daemon -a -i "$GLANCE_VENV_DIR" glance-reg glance glance-registry - -add-selinux-path-substitution /usr/bin $GLANCE_VENV_DIR/bin diff --git a/elements/glance/os-apply-config/etc/glance/glance-api.conf b/elements/glance/os-apply-config/etc/glance/glance-api.conf deleted file mode 100644 index 8e51b15ba..000000000 --- a/elements/glance/os-apply-config/etc/glance/glance-api.conf +++ /dev/null @@ -1,177 +0,0 @@ -## NB: Unpolished config file -## This config file was taken directly from the upstream repo, and tweaked just enough to work. -## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting. -## Please submit patches for any setting that should be deleted or Heat-configurable. -## https://git.openstack.org/cgit/openstack/tripleo-image-elements - -[DEFAULT] -{{#glance.api.verbose}} -# Show more verbose log output (sets INFO log level output) -verbose = {{glance.api.verbose}} -{{/glance.api.verbose}} -{{#glance.api.debug}} -# Show debugging output in logs (sets DEBUG log level output) -debug = {{glance.api.debug}} -{{/glance.api.debug}} - -# New style hierarchic (glance.api) params -{{#glance.api.backend}} -default_store = {{glance.api.backend}} -{{/glance.api.backend}} -# Old style non-hierarchic (glance.) params -# TODO: Remove once .json and .yaml files have -# been updated to use the new style. -{{#glance.backend}} -default_store = {{glance.backend}} -{{/glance.backend}} - -known_stores = glance.store.filesystem.Store, - glance.store.swift.Store - -# Strategy to use for Glance notification queue -# New style hierarchic (glance.api) params -{{#glance.api.notifier-strategy}} -notifier_strategy = {{glance.api.notifier-strategy}} -{{/glance.api.notifier-strategy}} -# Old style non-hierarchic (glance.) params -# TODO: Remove once .json and .yaml files have -# been updated to use the new style. -{{#glance.notifier-strategy}} -notifier_strategy = {{glance.notifier-strategy}} -{{/glance.notifier-strategy}} - -{{#glance.api.default-log-levels}} -default_log_levels = {{glance.api.default-log-levels}} -{{/glance.api.default-log-levels}} - -# New style hierarchic (glance.api) params -{{#glance.api.log-file}} -log_file = {{glance.api.log-file}} -{{/glance.api.log-file}} -# Old style non-hierarchic (glance.) params -# TODO: Remove once .json and .yaml files have -# been updated to use the new style. -{{#glance.log-file}} -log_file = {{glance.log-file}} -{{/glance.log-file}} - -{{#haproxy}} -{{#stunnel.connect_host}} -bind_host = {{stunnel.connect_host}} -registry_host = {{stunnel.connect_host}} -{{/stunnel.connect_host}} -{{^stunnel.connect_host}} -bind_host = {{local-ipv4}} -registry_host = {{local-ipv4}} -{{/stunnel.connect_host}} -{{/haproxy}} -bind_port = 9292 - -sql_connection = {{glance.db}} - -{{#glance.api.workers}} -# Number of API processes to start. Default is '1'. -workers = {{glance.api.workers}} -{{/glance.api.workers}} - - -registry_port = 9191 - -{{#rabbit}} -rabbit_use_ssl = false -rabbit_userid = guest -rabbit_password = {{password}} -rabbit_virtual_host = / -rabbit_notification_exchange = glance -rabbit_notification_topic = notifications -{{#rabbit.host}} -rabbit_host={{.}} -{{/rabbit.host}} -{{^rabbit.host}} -rabbit_hosts={{rabbit.nodes}} -rabbit_ha_queues=true -{{/rabbit.host}} -{{/rabbit}} - -{{#qpid}} -# Configuration options if sending notifications via Qpid (these are -# the defaults) -qpid_notification_exchange = glance -qpid_notification_topic = notifications -qpid_host = {{host}} -qpid_port = 5672 -qpid_username = {{username}} -qpid_password = {{password}} -qpid_sasl_mechanisms = -qpid_reconnect_timeout = 0 -qpid_reconnect_limit = 0 -qpid_reconnect_interval_min = 0 -qpid_reconnect_interval_max = 0 -qpid_reconnect_interval = 0 -qpid_heartbeat = 5 -# Set to 'ssl' to enable SSL -qpid_protocol = tcp -qpid_tcp_nodelay = True -{{/qpid}} - -filesystem_store_datadir = /mnt/state/var/lib/glance/images/ - -swift_store_auth_version = 2 -swift_store_auth_address = http://{{keystone.host}}:5000/v2.0/ -swift_store_endpoint_type = internalURL - -# New style hierarchic (glance.api) params -{{#glance.api.swift-store-user}} -swift_store_user = {{glance.api.swift-store-user}} -{{/glance.api.swift-store-user}} -{{#glance.api.swift-store-key}} -swift_store_key = {{glance.api.swift-store-key}} -{{/glance.api.swift-store-key}} - -# Old style non-hierarchic (glance.) params -# TODO: Remove once .json and .yaml files have -# been updated to use the new style. -{{#glance.swift-store-user}} -swift_store_user = {{glance.swift-store-user}} -{{/glance.swift-store-user}} -{{#glance.swift-store-key}} -swift_store_key = {{glance.swift-store-key}} -{{/glance.swift-store-key}} - -swift_store_container = glance -swift_store_create_container_on_put = True -swift_store_large_object_size = 5120 -swift_store_large_object_chunk_size = 200 -swift_enable_snet = False - -delayed_delete = False -scrub_time = 43200 -scrubber_datadir = /mnt/state/var/lib/glance/scrubber - -image_cache_dir = /mnt/state/var/lib/glance/image-cache/ - -[keystone_authtoken] -admin_tenant_name = service -admin_user = glance -admin_password = {{glance.service-password}} -auth_uri = http://{{keystone.host}}:5000/v2.0 -identity_uri=http://{{keystone.host}}:35357 - -[paste_deploy] -flavor = keystone - -# Passthrough configuration support -{{#glance-api}} -{{#config}} -[{{{section}}}] -{{#values}} -{{#comment}} -# {{{.}}} -{{/comment}} -{{#option}} -{{{option}}} = {{{value}}} -{{/option}} -{{/values}} - -{{/config}} -{{/glance-api}} diff --git a/elements/glance/os-apply-config/etc/glance/glance-cache.conf b/elements/glance/os-apply-config/etc/glance/glance-cache.conf deleted file mode 100644 index 7f695be15..000000000 --- a/elements/glance/os-apply-config/etc/glance/glance-cache.conf +++ /dev/null @@ -1,58 +0,0 @@ -## NB: Unpolished config file -## This config file was taken directly from the upstream repo, and tweaked just enough to work. -## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting. -## Please submit patches for any setting that should be deleted or Heat-configurable. -## https://git.openstack.org/cgit/openstack/tripleo-image-elements - -[DEFAULT] -{{#glance.verbose}} -# Show more verbose log output (sets INFO log level output) -verbose = {{glance.verbose}} -{{/glance.verbose}} -{{#glance.debug}} -# Show debugging output in logs (sets DEBUG log level output) -debug = {{glance.debug}} -{{/glance.debug}} - -log_file = /mnt/state/var/log/glance/image-cache.log -image_cache_dir = /mnt/state/var/lib/glance/image-cache/ -image_cache_stall_time = 86400 -image_cache_invalid_entry_grace_period = 3600 -image_cache_max_size = 10737418240 - -registry_host = 0.0.0.0 -registry_port = 9191 - -filesystem_store_datadir = /mnt/state/var/lib/glance/images/ -swift_store_auth_version = 2 -swift_store_auth_address = http://{{keystone.host}}:5000/v2.0/ -swift_store_endpoint_type = internalURL -swift_store_user = {{glance.swift-store-user}} -swift_store_key = {{glance.swift-store-key}} -swift_store_container = glance -swift_store_create_container_on_put = True -swift_store_large_object_size = 5120 -swift_store_large_object_chunk_size = 200 -swift_enable_snet = False - -s3_store_host = 127.0.0.1:8080/v1.0/ -s3_store_access_key = <20-char AWS access key> -s3_store_secret_key = <40-char AWS secret key> -s3_store_bucket = glance -s3_store_create_bucket_on_put = False - -# Passthrough configuration support -{{#glance-cache}} -{{#config}} -[{{{section}}}] -{{#values}} -{{#comment}} -# {{{.}}} -{{/comment}} -{{#option}} -{{{option}}} = {{{value}}} -{{/option}} -{{/values}} - -{{/config}} -{{/glance-cache}} diff --git a/elements/glance/os-apply-config/etc/glance/glance-registry.conf b/elements/glance/os-apply-config/etc/glance/glance-registry.conf deleted file mode 100644 index 8570d36c2..000000000 --- a/elements/glance/os-apply-config/etc/glance/glance-registry.conf +++ /dev/null @@ -1,74 +0,0 @@ -## NB: Unpolished config file -## This config file was taken directly from the upstream repo, and tweaked just enough to work. -## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting. -## Please submit patches for any setting that should be deleted or Heat-configurable. -## https://git.openstack.org/cgit/openstack/tripleo-image-elements - -[DEFAULT] -{{#glance.registry.verbose}} -# Show more verbose log output (sets INFO log level output) -verbose = {{glance.registry.verbose}} -{{/glance.registry.verbose}} -{{#glance.registry.debug}} -# Show debugging output in logs (sets DEBUG log level output) -debug = {{glance.registry.debug}} -{{/glance.registry.debug}} - -# New style hierarchic (glance.registry) params -{{#glance.registry.log-file}} -log_file = {{glance.registry.log-file}} -{{/glance.registry.log-file}} -# Old style non-hierarchic (glance.) params -# TODO: Remove once .json and .yaml files have -# been updated to use the new style. -{{#glance.log-file}} -log_file = {{glance.log-file}} -{{/glance.log-file}} - -{{#glance.registry.default-log-levels}} -default_log_levels = {{glance.registry.default-log-levels}} -{{/glance.registry.default-log-levels}} - -{{#haproxy}} -{{#stunnel.connect_host}} -bind_host = {{stunnel.connect_host}} -{{/stunnel.connect_host}} -{{^stunnel.connect_host}} -bind_host = {{local-ipv4}} -{{/stunnel.connect_host}} -{{/haproxy}} -bind_port = 9191 - -backlog = 4096 - -sql_connection = {{glance.db}} -sql_idle_timeout = 3600 - -api_limit_max = 1000 -limit_param_default = 25 - -[keystone_authtoken] -admin_tenant_name = service -admin_user = glance -admin_password = {{glance.service-password}} -auth_uri = http://{{keystone.host}}:5000/v2.0 -identity_uri=http://{{keystone.host}}:35357 - -[paste_deploy] -flavor = keystone - -# Passthrough configuration support -{{#glance-registry}} -{{#config}} -[{{{section}}}] -{{#values}} -{{#comment}} -# {{{.}}} -{{/comment}} -{{#option}} -{{{option}}} = {{{value}}} -{{/option}} -{{/values}} - -{{/config}} -{{/glance-registry}} diff --git a/elements/glance/os-apply-config/etc/glance/glance-scrubber.conf b/elements/glance/os-apply-config/etc/glance/glance-scrubber.conf deleted file mode 100644 index 8d25f670e..000000000 --- a/elements/glance/os-apply-config/etc/glance/glance-scrubber.conf +++ /dev/null @@ -1,60 +0,0 @@ -## NB: Unpolished config file -## This config file was taken directly from the upstream repo, and tweaked just enough to work. -## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting. -## Please submit patches for any setting that should be deleted or Heat-configurable. -## https://git.openstack.org/cgit/openstack/tripleo-image-elements - -[DEFAULT] -{{#glance.verbose}} -# Show more verbose log output (sets INFO log level output) -verbose = {{glance.verbose}} -{{/glance.verbose}} -{{#glance.debug}} -# Show debugging output in logs (sets DEBUG log level output) -debug = {{glance.debug}} -{{/glance.debug}} - -# Log to this file. Make sure you do not set the same log -# file for both the API and registry servers! -log_file = /mnt/state/var/log/glance/scrubber.log - -# Send logs to syslog (/dev/log) instead of to file specified by `log_file` -#use_syslog = False - -# Should we run our own loop or rely on cron/scheduler to run us -daemon = False - -# Loop time between checking for new items to schedule for delete -wakeup_time = 300 - -# Directory that the scrubber will use to remind itself of what to delete -# Make sure this is also set in glance-api.conf -scrubber_datadir = /mnt/state/var/lib/glance/scrubber - -# Only one server in your deployment should be designated the cleanup host -cleanup_scrubber = False - -# pending_delete items older than this time are candidates for cleanup -cleanup_scrubber_time = 86400 - -# Address to find the registry server for cleanups -registry_host = 0.0.0.0 - -# Port the registry server is listening on -registry_port = 9191 - -# Passthrough configuration support -{{#glance-scrubber}} -{{#config}} -[{{{section}}}] -{{#values}} -{{#comment}} -# {{{.}}} -{{/comment}} -{{#option}} -{{{option}}} = {{{value}}} -{{/option}} -{{/values}} - -{{/config}} -{{/glance-scrubber}} diff --git a/elements/glance/os-refresh-config/configure.d/10-glance-state b/elements/glance/os-refresh-config/configure.d/10-glance-state deleted file mode 100755 index cc5eef2b0..000000000 --- a/elements/glance/os-refresh-config/configure.d/10-glance-state +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -ue - -[ -d /mnt/state/var/lib/glance ] || install -d -D -m 0770 -o glance -g glance /mnt/state/var/lib/glance -[ -d /mnt/state/var/lib/glance/images ] || install -d -D -m 0770 -o glance -g glance /mnt/state/var/lib/glance/images -[ -d /mnt/state/var/log/glance ] || install -d -D -m 0755 -o glance -g glance /mnt/state/var/log/glance diff --git a/elements/glance/os-refresh-config/configure.d/20-glance-selinux b/elements/glance/os-refresh-config/configure.d/20-glance-selinux deleted file mode 100755 index d09354963..000000000 --- a/elements/glance/os-refresh-config/configure.d/20-glance-selinux +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -set -eu - -[ -x /usr/sbin/semanage ] || exit 0 - -semanage fcontext -a -t glance_var_lib_t "/mnt/state/var/lib/glance(/.*)?" -restorecon -Rv /mnt/state/var/lib/glance - -semanage fcontext -a -t glance_log_t "/mnt/state/var/log/glance(/.*)?" -restorecon -Rv /mnt/state/var/log/glance diff --git a/elements/glance/os-refresh-config/configure.d/90-glance-db-sync b/elements/glance/os-refresh-config/configure.d/90-glance-db-sync deleted file mode 100755 index 7fba1142e..000000000 --- a/elements/glance/os-refresh-config/configure.d/90-glance-db-sync +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eux - -if os-is-bootstrap-host ; then - su -s /bin/bash -c 'glance-manage db sync' glance -fi diff --git a/elements/glance/os-refresh-config/post-configure.d/75-glance b/elements/glance/os-refresh-config/post-configure.d/75-glance deleted file mode 100755 index 81fcb6cc4..000000000 --- a/elements/glance/os-refresh-config/post-configure.d/75-glance +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -eu - -os-svc-enable -an glance-api -os-svc-enable -an glance-reg - -os-svc-restart -an glance-api -os-svc-restart -an glance-reg diff --git a/elements/glance/os-refresh-config/pre-configure.d/97-glance-fedora-iptables b/elements/glance/os-refresh-config/pre-configure.d/97-glance-fedora-iptables deleted file mode 100755 index 083d5c6d4..000000000 --- a/elements/glance/os-refresh-config/pre-configure.d/97-glance-fedora-iptables +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -eu - -add-rule INPUT -p tcp --dport 9292 -j ACCEPT -add-rule INPUT -p tcp --dport 9191 -j ACCEPT diff --git a/elements/glance/source-repository-glance b/elements/glance/source-repository-glance deleted file mode 100644 index 73f754df3..000000000 --- a/elements/glance/source-repository-glance +++ /dev/null @@ -1 +0,0 @@ -glance git /opt/stack/glance https://git.openstack.org/openstack/glance.git diff --git a/elements/glance/svc-map b/elements/glance/svc-map deleted file mode 100644 index a5baccd1a..000000000 --- a/elements/glance/svc-map +++ /dev/null @@ -1,7 +0,0 @@ -glance-api: - default: openstack-glance-api - debian: glance-api -glance-reg: - default: openstack-glance-registry - debian: glance-reg - diff --git a/elements/haproxy/README.md b/elements/haproxy/README.md deleted file mode 100644 index 96e1b7ed1..000000000 --- a/elements/haproxy/README.md +++ /dev/null @@ -1,132 +0,0 @@ -Element to install haproxy. This element proxies services listed in -haproxy.services and additionally enables ports in firewall. - -Configuration -------------- - -The following properties are supported for configuring haproxy - -* haproxy.services: A list of listen blocks. Also supports proxy_ip and - proxy_port sub-properties. -* haproxy.nodes: A list of server : lines. These are added to - any haproxy.services which do not define this sub-property. -* haproxy.stats.disabled: Set to true to disable the stats service -* haproxy.stats.port: Port for the stats service. Defaults to 1993. -* haproxy.stats.uri: URI for the stats service. Defaults to /. -* haproxy.global_maxconn: A limit on the total number of concurrent connections - that will be handled by a haproxy instance. haproxy will stop accepting - connections above this limit. -* haproxy.service_maxconn: A limit on the number of the number of concurrent - connections that are allowed to each proxied service. This is a default value - that can be overridden in an individual haproxy.service section. -* haproxy.timeout.http-request: Set the maximum default allowed time to wait - for a complete HTTP request. -* haproxy.timeout.queue: Set the maximum default time to wait in the queue for - a connection slot to be free. -* haproxy.timeout.connect: Set the maximum default time to wait for a - connection attempt to a server to succeed. -* haproxy.timeout.client: Set the maximum default inactivity time on the client - side. -* haproxy.timeout.server: Set the maximum default inactivity time on the server - side. -* haproxy.timeout.check: Set additional check timeout, but only after a - connection has been already established. - -Each haproxy.services can define the following sub-properties - -* name: A name for the service. -* haproxy.nodes: Same as above. This overrides the global haproxy.nodes list if - it is set. -* net_binds: A list of ip addresses and ports to bind to. Each element in the - list must define a port and can define an IP. If no IP is defined then the - service binds to all IP's. -* balance: *DEPRECATED* A balancing strategy for the service. Defaults to source. -* port: Port to connect to for each of the haproxy.nodes. -* options: A list of arbitrary params (eg. timeout server 1h) to be configured - for the listener -* extra_server_params: A list of parameters that will be appended to each - backend server line that is generated. -* proxy_ip: *DEPRECATED* IP address for a service to bind to. Defaults to all - IP's (0.0.0.0). -* proxy_port: *DEPRECATED* Port for a service to bind to. -* service_maxconn: A limit on the number of concurrent connections allowed to - this service. -* check_interval: The interval between two consecutive health checks in milliseconds. - -Each haproxy.nodes can define the following sub-properties - -* name: A name for the node. -* ip: IP address to connect to for the node. -* port: Port to connect to for the node. This overrides any port value defined - in haproxy.services. - -If haproxy is configured to bind to a virtual IP with keepalived -sysctl must be configured to use "net.ipv4.ip_nonlocal_bind = 1" -This setting allows allows a program like HA-Proxy to create listening sockets -on network interfaces that do not actually exist on the server. -* This can be set in heat meatadata for node properties. -EX: in overcloud-source.yaml for controllerConfig under properties: - sysctl: - net.ipv4.ip_nonlocal_bind: 1 - - -Example Configurations ----------------------- - - haproxy: - nodes: - - name: notcompute - ip: 192.0.2.5 - - name: notcomputeSlave0 - ip: 192.0.2.6 - services: - - name: dashboard_cluster - net_binds: - - ip: 192.0.2.3 - port: 443 - - ip: 192.0.2.3 - port: 444 - balance: roundrobin - - name: glance_api_cluster - proxy_ip: 192.0.2.3 - proxy_port: 9293 - port:9292 - balance: source - - name: mysql - port: 3306 - extra_server_params: - - backup - -You can override set of nodes for a service by setting its own set of -haproxy.nodes inside a service definition: - - services: - - name: dashboard_cluster - net_binds: - - ip: 192.0.2.3 - port: 444 - - port: 443 - balance: source - haproxy: - nodes: - - name: foo0 - ip: 10.0.0.1 - -You can provide net_binds only once, for example: - - haproxy: - nodes: - - name: foo0 - ip: 10.0.0.1 - net_binds: - - ip: 192.0.2.3 - services: - - name: keystone - port: 5000 - - name: dashboard_cluster - port: 80 - net_binds: - - ip: 192.0.2.10 - -If there is no haproxy.services.net_binds.port defined - haproxy.services.port -will be used. diff --git a/elements/haproxy/element-deps b/elements/haproxy/element-deps deleted file mode 100644 index 80570ab87..000000000 --- a/elements/haproxy/element-deps +++ /dev/null @@ -1,3 +0,0 @@ -os-svc-install -package-installs -sysctl diff --git a/elements/haproxy/install.d/76-haproxy b/elements/haproxy/install.d/76-haproxy deleted file mode 100755 index 428a98e70..000000000 --- a/elements/haproxy/install.d/76-haproxy +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -set -eux -set -o pipefail - -[ -d /var/lib/haproxy ] || install -d -D -m 0755 -o root -g root /var/lib/haproxy - -# haproxy service has to be explicitly enabled in /etc/default/haproxy on ubuntu/debian systems -if [ -f /etc/default/haproxy ]; then - sed -i -e 's/ENABLED=0/ENABLED=1/' /etc/default/haproxy -fi diff --git a/elements/haproxy/install.d/package-installs-haproxy b/elements/haproxy/install.d/package-installs-haproxy deleted file mode 100644 index 6968bada4..000000000 --- a/elements/haproxy/install.d/package-installs-haproxy +++ /dev/null @@ -1 +0,0 @@ -haproxy diff --git a/elements/haproxy/os-apply-config/etc/haproxy/haproxy.cfg b/elements/haproxy/os-apply-config/etc/haproxy/haproxy.cfg deleted file mode 100644 index 229769e2e..000000000 --- a/elements/haproxy/os-apply-config/etc/haproxy/haproxy.cfg +++ /dev/null @@ -1,84 +0,0 @@ -global - chroot /var/lib/haproxy - daemon - group haproxy - maxconn {{#haproxy.global_maxconn}}{{.}}{{/haproxy.global_maxconn}}{{^haproxy.global_maxconn}}4000{{/haproxy.global_maxconn}} - pidfile /var/run/haproxy.pid - user haproxy - -defaults - log global - maxconn {{#haproxy.service_maxconn}}{{.}}{{/haproxy.service_maxconn}}{{^haproxy.service_maxconn}}150{{/haproxy.service_maxconn}} - retries 3 -{{#haproxy.timeout.http-request}} - timeout http-request {{{.}}} -{{/haproxy.timeout.http-request}} -{{^haproxy.timeout.http-request}} - timeout http-request 10s -{{/haproxy.timeout.http-request}} -{{#haproxy.timeout.queue}} - timeout queue {{{.}}} -{{/haproxy.timeout.queue}} -{{^haproxy.timeout.queue}} - timeout queue 1m -{{/haproxy.timeout.queue}} -{{#haproxy.timeout.connect}} - timeout connect {{{.}}} -{{/haproxy.timeout.connect}} -{{^haproxy.timeout.connect}} - timeout connect 10s -{{/haproxy.timeout.connect}} -{{#haproxy.timeout.client}} - timeout client {{{.}}} -{{/haproxy.timeout.client}} -{{^haproxy.timeout.client}} - timeout client 1m -{{/haproxy.timeout.client}} -{{#haproxy.timeout.server}} - timeout server {{{.}}} -{{/haproxy.timeout.server}} -{{^haproxy.timeout.server}} - timeout server 1m -{{/haproxy.timeout.server}} -{{#haproxy.timeout.check}} - timeout check {{{.}}} -{{/haproxy.timeout.check}} -{{^haproxy.timeout.check}} - timeout check 10s -{{/haproxy.timeout.check}} - mode tcp - option tcpka - option tcplog - balance source - -{{#haproxy}} -{{#services}} -listen {{name}} - {{#proxy_port}} - bind {{proxy_ip}}:{{proxy_port}} - {{/proxy_port}} - {{#net_binds}} - bind {{ip}}:{{port}} - {{/net_binds}} - {{#balance}} - balance {{.}} - {{/balance}} - {{#options}} - {{.}} - {{/options}} - {{#service_maxconn}} - maxconn {{.}} - {{/service_maxconn}} - {{#nodes}} - server {{name}} {{ip}}:{{port}} check inter {{#check_interval}}{{{.}}}{{/check_interval}}{{^check_interval}}2000{{/check_interval}} rise 2 fall 5 {{#extra_server_params}} {{.}}{{/extra_server_params}} - {{/nodes}} -{{/services}} - -{{/haproxy}} - -{{^haproxy.stats.disabled}} -listen haproxy.stats :{{#stats.port}}{{stats.port}}{{/stats.port}}{{^stats.port}}1993{{/stats.port}} - mode http - stats enable - stats uri {{#stats.uri}}{{stats.uri}}{{/stats.uri}}{{^stats.uri}}/{{/stats.uri}} -{{/haproxy.stats.disabled}} diff --git a/elements/haproxy/os-refresh-config/configure.d/20-haproxy-nonlocal-bind b/elements/haproxy/os-refresh-config/configure.d/20-haproxy-nonlocal-bind deleted file mode 100755 index 296bf60dc..000000000 --- a/elements/haproxy/os-refresh-config/configure.d/20-haproxy-nonlocal-bind +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -eu -set -o pipefail - -sysctl-set-value net.ipv4.ip_nonlocal_bind 1 diff --git a/elements/haproxy/os-refresh-config/configure.d/20-haproxy-selinux b/elements/haproxy/os-refresh-config/configure.d/20-haproxy-selinux deleted file mode 100755 index f5d7acfd9..000000000 --- a/elements/haproxy/os-refresh-config/configure.d/20-haproxy-selinux +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -# Allow haproxy to proxy any port if SELinux is in enforcing mode -# https://bugs.launchpad.net/tripleo/+bug/1339938 -if [[ -x /usr/sbin/semanage ]]; then - setsebool -P haproxy_connect_any 1 -fi diff --git a/elements/haproxy/os-refresh-config/configure.d/21-haproxy b/elements/haproxy/os-refresh-config/configure.d/21-haproxy deleted file mode 100755 index 9f8b33e76..000000000 --- a/elements/haproxy/os-refresh-config/configure.d/21-haproxy +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -os-svc-enable -an haproxy - -if service haproxy status; then - service haproxy reload -else - service haproxy restart -fi diff --git a/elements/haproxy/os-refresh-config/pre-configure.d/98-haproxy-iptables b/elements/haproxy/os-refresh-config/pre-configure.d/98-haproxy-iptables deleted file mode 100755 index 065045d88..000000000 --- a/elements/haproxy/os-refresh-config/pre-configure.d/98-haproxy-iptables +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -set -eu -set -o pipefail - -DISTRO=`lsb_release -si` || true - -if [[ "RedHatEnterpriseServer CentOS Fedora" =~ "$DISTRO" ]]; then - - # Check if the iptables service is active - if systemctl is-active iptables.service ; then - IPT_FILE=/etc/sysconfig/iptables - if [ -f $IPT_FILE ]; then - iptables-restore < $IPT_FILE - fi - - CONF=`os-apply-config --key haproxy.services --type raw | sed "s/u'/'/g"|sed "s/'/\"/g"` - [ -z "$CONF" ] && exit 0 - - # parses metadata hash and returns lines in "port-proxy_port" format: - LINES=`echo "$CONF" | python -c 'import json,sys;obj=json.load(sys.stdin);print "\n".join(["%d-%d" % (x["port"], x["proxy_port"]) for x in obj])'` - [ -z "$LINES" ] && exit 0 - - for LINE in $LINES; do - PORT=${LINE%-*} - PROXY_PORT=${LINE#*-} - # keystone is the only exception where ports are twisted - real - # service listens on non-standard port if haproxy is used so - # PORT instead of PROXY_PORT should be enabled - if [ $PROXY_PORT = "5000" -o $PROXY_PORT = "35357" ];then - FW_PORT=$PORT - else - FW_PORT=$PROXY_PORT - fi - RULE="INPUT -p tcp --dport $FW_PORT -j ACCEPT" - iptables -C $RULE 2>/dev/null || iptables -I $RULE - done - - iptables-save > $IPT_FILE - fi - -fi diff --git a/elements/haproxy/svc-map b/elements/haproxy/svc-map deleted file mode 100644 index bbca347e2..000000000 --- a/elements/haproxy/svc-map +++ /dev/null @@ -1,2 +0,0 @@ -haproxy: - default: haproxy diff --git a/elements/heat-api/README.md b/elements/heat-api/README.md deleted file mode 100644 index f3160e954..000000000 --- a/elements/heat-api/README.md +++ /dev/null @@ -1,25 +0,0 @@ -Run the stateless HTTP Heat API services. - -Configuration -------------- - -We use os-apply-config for writing heat's configuration. - -Example Heat Metadata: - - OpenStack::Config: - heat: - rpc_backend: heat.openstack.common.rpc.impl_kombu - service_host: keystone.host.foo - service_port: 5000 - keystone: - auth_host: keystone.host.foo - auth_port: 35357 - auth_protocol: http - auth_uri: http://keystone.host.foo:35357/v2.0 - admin_tenant_name: mytenant - admin_user: user1 - admin_password: abcdefg - rabbit: - host: rabbitmq.host.foo - password: xyz123 diff --git a/elements/heat-api/element-deps b/elements/heat-api/element-deps deleted file mode 100644 index b6d510c5f..000000000 --- a/elements/heat-api/element-deps +++ /dev/null @@ -1,3 +0,0 @@ -heat -iptables -os-svc-install diff --git a/elements/heat-api/install.d/heat-package-install/10-heat-api b/elements/heat-api/install.d/heat-package-install/10-heat-api deleted file mode 100755 index b9657c4ef..000000000 --- a/elements/heat-api/install.d/heat-package-install/10-heat-api +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -set -eux -set -o pipefail - -install-packages \ - openstack-heat-api \ - openstack-heat-api-cfn \ - openstack-heat-api-cloudwatch diff --git a/elements/heat-api/install.d/heat-source-install/10-heat-api b/elements/heat-api/install.d/heat-source-install/10-heat-api deleted file mode 100755 index c7435c7e4..000000000 --- a/elements/heat-api/install.d/heat-source-install/10-heat-api +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -set -eu -set -o pipefail - -os-svc-daemon -a -i "$HEAT_VENV_DIR" heat-api heat heat-api -os-svc-daemon -a -i "$HEAT_VENV_DIR" heat-api-cfn heat heat-api-cfn -os-svc-daemon -a -i "$HEAT_VENV_DIR" heat-api-cloudwatch heat heat-api-cloudwatch - -cp /opt/stack/heat/etc/heat/api-paste.ini /etc/heat/api-paste.ini diff --git a/elements/heat-api/os-refresh-config/post-configure.d/79-heat-api b/elements/heat-api/os-refresh-config/post-configure.d/79-heat-api deleted file mode 100755 index 4a762e9ac..000000000 --- a/elements/heat-api/os-refresh-config/post-configure.d/79-heat-api +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -set -ue -set -o pipefail - -os-svc-enable -an heat-api -os-svc-enable -an heat-api-cfn -os-svc-enable -an heat-api-cloudwatch - -os-svc-restart -an heat-api -os-svc-restart -an heat-api-cfn -os-svc-restart -an heat-api-cloudwatch diff --git a/elements/heat-api/os-refresh-config/pre-configure.d/97-heat-api-fedora-iptables b/elements/heat-api/os-refresh-config/pre-configure.d/97-heat-api-fedora-iptables deleted file mode 100755 index f7d86008a..000000000 --- a/elements/heat-api/os-refresh-config/pre-configure.d/97-heat-api-fedora-iptables +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eu -set -o pipefail - -# heat-api-cfn, heat-api-cloudwatch, heat-api -add-rule INPUT -p tcp -m multiport --dports 8000,8003,8004 -j ACCEPT diff --git a/elements/heat-api/svc-map b/elements/heat-api/svc-map deleted file mode 100644 index 94c267e7c..000000000 --- a/elements/heat-api/svc-map +++ /dev/null @@ -1,9 +0,0 @@ -heat-api: - default: openstack-heat-api - debian: heat-api -heat-api-cfn: - default: openstack-heat-api-cfn - debian: heat-api-cfn -heat-api-cloudwatch: - default: openstack-heat-api-cloudwatch - debian: heat-api-cloudwatch diff --git a/elements/heat-cfntools/README.md b/elements/heat-cfntools/README.md deleted file mode 100644 index b9ebdd9e6..000000000 --- a/elements/heat-cfntools/README.md +++ /dev/null @@ -1,3 +0,0 @@ -Install the Heat cfntools (for CloudFormation) to enable HEAT -templates to make use of advanced features of HEAT such as watches and -AWS::CloudFormation::Init diff --git a/elements/heat-cfntools/element-deps b/elements/heat-cfntools/element-deps deleted file mode 100644 index d397eed2a..000000000 --- a/elements/heat-cfntools/element-deps +++ /dev/null @@ -1,2 +0,0 @@ -package-installs -pip-and-virtualenv diff --git a/elements/heat-cfntools/install.d/05-heat-cfntools b/elements/heat-cfntools/install.d/05-heat-cfntools deleted file mode 100755 index 4a07de19d..000000000 --- a/elements/heat-cfntools/install.d/05-heat-cfntools +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -set -uex - -if [[ "fedora" = "$DISTRO_NAME" ]]; then - # Remove the pre-installed package version of heat-cfntools - yum remove -y heat-cfntools -fi - -VENV=/opt/stack/venvs/heat-cfntools -virtualenv --setuptools $VENV - -set +u -source $VENV/bin/activate -set -u - -# Ensure latest pip rather than the one bundled with virtualenv -$VENV/bin/pip install -U pip - -# Need setuptools>=1.0 to manage connections when -# downloading from pypi using http_proxy and https_proxy -$VENV/bin/pip install -U 'setuptools>=1.0' -# bug #1293812 : Avoid easy_install triggering on pbr. -$VENV/bin/pip install -U 'pbr>=0.11,<2.0' -$VENV/bin/pip install -U heat-cfntools - -# symlink to /opt/aws/bin -$VENV/bin/cfn-create-aws-symlinks --source $VENV/bin - -# also symlink to /usr/local/bin -$VENV/bin/cfn-create-aws-symlinks --source $VENV/bin --target /usr/local/bin diff --git a/elements/heat-cfntools/install.d/10-ec2-user b/elements/heat-cfntools/install.d/10-ec2-user deleted file mode 100755 index d88c67908..000000000 --- a/elements/heat-cfntools/install.d/10-ec2-user +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -# Until http://pad.lv/1101347 is fixed, we need this user to be able to -# Log on to heat booted machines using the given SSH keypair - -set -uex - -# This is a specific workaround for Ubuntu 12.10 "quantal" -distro=$(lsb_release -is || :) -if [ "$distro" != "Ubuntu" ] ; then - exit 0 -fi -codename=$(lsb_release -cs || :) -if [ "$codename" != "quantal" ] ; then - exit 0 -fi - -# Setup ec2-user as expected by HEAT -if ! getent passwd ec2-user ; then - useradd -m -G admin ec2-user -s /bin/bash -fi -if ! [ -e /etc/sudoers.d/ec2-user ] ; then - echo "ec2-user ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/ec2-user - chmod 0440 /etc/sudoers.d/ec2-user - visudo -c -fi - -# We must pin to this fixed cloud-init from the demo ppa to ensure keys -# are installed. This can be removed if http://pad.lv/1100920 is ever -# fixed in the distro - -add-apt-repository -y ppa:tripleo/demo -apt-get update - -cat > /etc/apt/preferences.d/cloud-init-from-ppa < /etc/cron.d/heat -PATH=/usr/local/bin:/usr/bin:/sbin:/bin:/usr/sbin -MAILTO="" -30 * * * * heat heat-manage purge_deleted 1 2>&1 | /usr/bin/logger -t heat-purge-deleted-cron -EOF diff --git a/elements/heat-engine/install.d/heat-package-install/package-installs-heat-engine b/elements/heat-engine/install.d/heat-package-install/package-installs-heat-engine deleted file mode 100644 index bcc9069f4..000000000 --- a/elements/heat-engine/install.d/heat-package-install/package-installs-heat-engine +++ /dev/null @@ -1 +0,0 @@ -openstack-heat-engine diff --git a/elements/heat-engine/install.d/heat-source-install/10-heat-engine b/elements/heat-engine/install.d/heat-source-install/10-heat-engine deleted file mode 100755 index 556bd205a..000000000 --- a/elements/heat-engine/install.d/heat-source-install/10-heat-engine +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -set -eu -set -o pipefail - -cp -r /opt/stack/heat/etc/heat/environment.d /etc/heat -cp -r /opt/stack/heat/etc/heat/templates /etc/heat - -ln -s $HEAT_VENV_DIR/bin/heat-manage /usr/local/bin/heat-manage - -os-svc-daemon -a -i "$HEAT_VENV_DIR" heat-engine heat heat-engine diff --git a/elements/heat-engine/install.d/heat-source-install/package-installs-heat-engine b/elements/heat-engine/install.d/heat-source-install/package-installs-heat-engine deleted file mode 100644 index 1829850df..000000000 --- a/elements/heat-engine/install.d/heat-source-install/package-installs-heat-engine +++ /dev/null @@ -1 +0,0 @@ -python-mysqldb diff --git a/elements/heat-engine/os-refresh-config/configure.d/90-heat-db-sync b/elements/heat-engine/os-refresh-config/configure.d/90-heat-db-sync deleted file mode 100755 index 53902bbc9..000000000 --- a/elements/heat-engine/os-refresh-config/configure.d/90-heat-db-sync +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -if os-is-bootstrap-host ; then - su -s /bin/bash -c 'heat-manage db_sync' heat -fi diff --git a/elements/heat-engine/os-refresh-config/post-configure.d/79-heat-engine b/elements/heat-engine/os-refresh-config/post-configure.d/79-heat-engine deleted file mode 100755 index 7928c7a71..000000000 --- a/elements/heat-engine/os-refresh-config/post-configure.d/79-heat-engine +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -set -eu -set -o pipefail - -os-svc-enable -an heat-engine - -os-svc-restart -an heat-engine diff --git a/elements/heat-engine/svc-map b/elements/heat-engine/svc-map deleted file mode 100644 index d7cf2efd7..000000000 --- a/elements/heat-engine/svc-map +++ /dev/null @@ -1,3 +0,0 @@ -heat-engine: - default: openstack-heat-engine - debian: heat-engine diff --git a/elements/heat/README.md b/elements/heat/README.md deleted file mode 100644 index 84882b6d1..000000000 --- a/elements/heat/README.md +++ /dev/null @@ -1,16 +0,0 @@ -Install heat software on the machine. - -Configuration -------------- - - heat: - verbose: False - # Print more verbose output (set logging level to INFO instead - # of default WARNING level). - debug: False - # Print debugging output (set logging level to DEBUG instead of - # default WARNING level). - - -Configuration of heat services is done in the heat-api and heat-engine -elements, which enable those services. diff --git a/elements/heat/cleanup.d/50-remove-source-heat b/elements/heat/cleanup.d/50-remove-source-heat deleted file mode 100755 index 8cd1e5f50..000000000 --- a/elements/heat/cleanup.d/50-remove-source-heat +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eu - -sudo rm -fr "${TMP_MOUNT_PATH}/opt/stack/heat" diff --git a/elements/heat/element-deps b/elements/heat/element-deps deleted file mode 100644 index 0af028333..000000000 --- a/elements/heat/element-deps +++ /dev/null @@ -1,5 +0,0 @@ -os-apply-config -os-refresh-config -os-svc-install -selinux -source-repositories diff --git a/elements/heat/environment.d/10-heat-venv-dir.bash b/elements/heat/environment.d/10-heat-venv-dir.bash deleted file mode 100644 index aad05547d..000000000 --- a/elements/heat/environment.d/10-heat-venv-dir.bash +++ /dev/null @@ -1,6 +0,0 @@ -if [ -z "${HEAT_VENV_DIR:-}" ]; then - export HEAT_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/heat"} -fi -if [ -z "${HEAT_EXTRA_INSTALL_OPTS:-}" ]; then - export HEAT_EXTRA_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-""} -fi diff --git a/elements/heat/install.d/heat-package-install/05-heat b/elements/heat/install.d/heat-package-install/05-heat deleted file mode 100755 index 0dd9c7180..000000000 --- a/elements/heat/install.d/heat-package-install/05-heat +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages openstack-heat-common - -rm -rf /usr/lib/python2.7/site-packages/heat/db/sqlalchemy/migrate_repo/versions/065_update_at_fsp.py{,c,o} diff --git a/elements/heat/install.d/heat-source-install/05-heat b/elements/heat/install.d/heat-source-install/05-heat deleted file mode 100755 index b0bca9d78..000000000 --- a/elements/heat/install.d/heat-source-install/05-heat +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -eu -install-packages python-setuptools python-eventlet python-greenlet \ - python-httplib2 python-iso8601 python-lxml python-sqlalchemy \ - python-paste python-routes python-webob python-yaml libffi-dev - -os-svc-install $HEAT_EXTRA_INSTALL_OPTS -i "$HEAT_VENV_DIR" -u heat -r /opt/stack/heat - -cp /opt/stack/heat/etc/heat/policy.json /etc/heat/policy.json - -install -d -m 0770 -o root -g heat /var/log/heat - -add-selinux-path-substitution /usr/bin $HEAT_VENV_DIR/bin diff --git a/elements/heat/os-apply-config/etc/heat/heat.conf b/elements/heat/os-apply-config/etc/heat/heat.conf deleted file mode 100644 index 55973309d..000000000 --- a/elements/heat/os-apply-config/etc/heat/heat.conf +++ /dev/null @@ -1,695 +0,0 @@ -[DEFAULT] -# -# Options defined in heat.common.config -# - -{{#heat.verbose}} -# Print more verbose output (set logging level to INFO instead -# of default WARNING level). (boolean value) -verbose={{heat.verbose}} -{{/heat.verbose}} -{{#heat.debug}} -# Print debugging output (set logging level to DEBUG instead -# of default WARNING level). (boolean value) -debug={{heat.debug}} -{{/heat.debug}} - -# Address to bind the server. Useful when selecting a -# particular network interface. (string value) -#bind_host=0.0.0.0 -{{#haproxy}} -{{#stunnel.connect_host}} -bind_host = {{stunnel.connect_host}} -{{/stunnel.connect_host}} -{{^stunnel.connect_host}} -bind_host = {{local-ipv4}} -{{/stunnel.connect_host}} -{{/haproxy}} - -# The SQLAlchemy connection string used to connect to the -# database (string value) -sql_connection = {{heat.db}} - -# timeout before idle sql connections are reaped (integer -# value) -#sql_idle_timeout=3600 - -# The default user for new instances (string value) -instance_user=heat-admin - -# Driver to use for controlling instances (string value) -#instance_driver=heat.engine.nova - -# List of directories to search for Plugins (list value) -#plugin_dirs=/usr/lib64/heat,/usr/lib/heat - -# The directory to search for environment files (string value) -#environment_dir=/etc/heat/environment.d - -# Select deferred auth method, stored password or trusts -# (string value) -#deferred_auth_method=password - -# Subset of trustor roles to be delegated to heat (list value) -#trusts_delegated_roles=heat_stack_owner - -# Name of the engine node. This can be an opaque identifier.It -# is not necessarily a hostname, FQDN, or IP address. (string -# value) -#host=heat - -# seconds between running periodic tasks (integer value) -#periodic_interval=60 - -# URL of the Heat metadata server (string value) -heat_metadata_server_url = {{heat.metadata_server_url}} - -# URL of the Heat waitcondition server (string value) -heat_waitcondition_server_url = {{heat.waitcondition_server_url}} - -# URL of the Heat cloudwatch server (string value) -heat_watch_server_url = {{heat.watch_server_url}} - -# Instance connection to cfn/cw API via https (string value) -#instance_connection_is_secure=0 - -# Instance connection to cfn/cw API validate certs if ssl -# (string value) -#instance_connection_https_validate_certificates=1 - -# Keystone role for heat template-defined users (string value) -#heat_stack_user_role=heat_stack_user - -# Maximum raw byte size of any template. (integer value) -#max_template_size=524288 - -# Maximum depth allowed when using nested stacks. (integer -# value) -#max_nested_stack_depth=3 - - -# -# Options defined in heat.common.crypt -# - -# Encryption key used for authentication info in database -# (string value) -auth_encryption_key = {{heat.auth_encryption_key}} - - -# -# Options defined in heat.db.api -# - -# The backend to use for db (string value) -#db_backend=sqlalchemy - - -# -# Options defined in heat.engine.clients -# - -# Cloud module to use as a backend. Defaults to OpenStack. -# (string value) -#cloud_backend= - - -# -# Options defined in heat.openstack.common.db.sqlalchemy.session -# - -# the filename to use with sqlite (string value) -#sqlite_db=heat.sqlite - -# If true, use synchronous mode for sqlite (boolean value) -#sqlite_synchronous=true - - -# -# Options defined in heat.openstack.common.eventlet_backdoor -# - -# Enable eventlet backdoor. Acceptable values are 0, , -# and :, where 0 results in listening on a random -# tcp port number; results in listening on the -# specified port number (and not enabling backdoor if that -# port is in use); and : results in listening on -# the smallest unused port number within the specified range -# of port numbers. The chosen port is displayed in the -# service's log file. (string value) -#backdoor_port= - - -# -# Options defined in heat.openstack.common.lockutils -# - -# Whether to disable inter-process locks (boolean value) -#disable_process_locking=false - -# Directory to use for lock files. (string value) -#lock_path= - - -# -# Options defined in heat.openstack.common.log -# - -# Print debugging output (set logging level to DEBUG instead -# of default WARNING level). (boolean value) -#debug=false - -# Print more verbose output (set logging level to INFO instead -# of default WARNING level). (boolean value) -#verbose=false - -# Log output to standard error (boolean value) -#use_stderr=true - -# format string to use for log messages with context (string -# value) -#logging_context_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user)s %(tenant)s] %(instance)s%(message)s - -# format string to use for log messages without context -# (string value) -#logging_default_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s - -# data to append to log format when level is DEBUG (string -# value) -#logging_debug_format_suffix=%(funcName)s %(pathname)s:%(lineno)d - -# prefix each line of exception output with this format -# (string value) -#logging_exception_prefix=%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s - -# list of logger=LEVEL pairs (list value) -#default_log_levels=amqplib=WARN,sqlalchemy=WARN,boto=WARN,suds=INFO,keystone=INFO,eventlet.wsgi.server=WARN - -# publish error events (boolean value) -#publish_errors=false - -# make deprecations fatal (boolean value) -#fatal_deprecations=false - -# If an instance is passed with the log message, format it -# like this (string value) -#instance_format="[instance: %(uuid)s] " - -# If an instance UUID is passed with the log message, format -# it like this (string value) -#instance_uuid_format="[instance: %(uuid)s] " - -# If this option is specified, the logging configuration file -# specified is used and overrides any other logging options -# specified. Please see the Python logging module -# documentation for details on logging configuration files. -# (string value) -#log_config= - -# DEPRECATED. A logging.Formatter log message format string -# which may use any of the available logging.LogRecord -# attributes. This option is deprecated. Please use -# logging_context_format_string and -# logging_default_format_string instead. (string value) -#log_format= - -# Format string for %%(asctime)s in log records. Default: -# %(default)s (string value) -#log_date_format=%Y-%m-%d %H:%M:%S - -# (Optional) Name of log file to output to. If no default is -# set, logging will go to stdout. (string value) -#log_file= - -# (Optional) The base directory used for relative --log-file -# paths (string value) -#log_dir= - -# Use syslog for logging. (boolean value) -#use_syslog=false - -# syslog facility to receive log lines (string value) -#syslog_log_facility=LOG_USER - - -# -# Options defined in heat.openstack.common.notifier.api -# - -# Driver or drivers to handle sending notifications (multi -# valued) -#notification_driver= - -# Default notification level for outgoing notifications -# (string value) -#default_notification_level=INFO - -# Default publisher_id for outgoing notifications (string -# value) -#default_publisher_id= - - -# -# Options defined in heat.openstack.common.notifier.list_notifier -# - -# List of drivers to send notifications (multi valued) -#list_notifier_drivers=heat.openstack.common.notifier.no_op_notifier - - -# -# Options defined in heat.openstack.common.notifier.rpc_notifier -# - -# AMQP topic used for openstack notifications (list value) -#notification_topics=notifications - - -# -# Options defined in heat.openstack.common.policy -# - -# JSON file containing policy (string value) -#policy_file=policy.json - -# Rule enforced when requested rule is not found (string -# value) -#policy_default_rule=default - - -# -# Options defined in heat.openstack.common.rpc -# - -# The messaging module to use, defaults to kombu. (string -# value) -#rpc_backend=heat.openstack.common.rpc.impl_kombu - -# Size of RPC thread pool (integer value) -#rpc_thread_pool_size=64 - -# Size of RPC connection pool (integer value) -#rpc_conn_pool_size=30 - -# Seconds to wait for a response from call or multicall -# (integer value) -#rpc_response_timeout=60 - -# Seconds to wait before a cast expires (TTL). Only supported -# by impl_zmq. (integer value) -#rpc_cast_timeout=30 - -# Modules of exceptions that are permitted to be recreatedupon -# receiving exception data from an rpc call. (list value) -#allowed_rpc_exception_modules=heat.openstack.common.exception,heat.common.exception,nova.exception,cinder.exception,exceptions - -# If passed, use a fake RabbitMQ provider (boolean value) -#fake_rabbit=false - -# AMQP exchange to connect to if using RabbitMQ or Qpid -# (string value) -#control_exchange=openstack - - -# -# Options defined in heat.openstack.common.rpc.amqp -# - -# Use durable queues in amqp. (boolean value) -#amqp_durable_queues=false - -# Auto-delete queues in amqp. (boolean value) -#amqp_auto_delete=false - -{{#rabbit}} -rabbit_password={{password}} -rpc_backend=heat.openstack.common.rpc.impl_kombu -{{#rabbit.host}} -rabbit_host={{.}} -{{/rabbit.host}} -{{^rabbit.host}} -rabbit_hosts={{rabbit.nodes}} -rabbit_ha_queues=true -{{/rabbit.host}} -{{/rabbit}} - -{{#qpid}} -# -# Options defined in heat.openstack.common.rpc.impl_qpid -# -rpc_backend=heat.openstack.common.rpc.impl_qpid - -# Qpid broker hostname (string value) -qpid_hostname={{host}} - -# Qpid broker port (integer value) -#qpid_port=5672 - -# Qpid HA cluster host:port pairs (list value) -#qpid_hosts=$qpid_hostname:$qpid_port - -# Username for qpid connection (string value) -qpid_username={{username}} - -# Password for qpid connection (string value) -qpid_password={{password}} - -# Space separated list of SASL mechanisms to use for auth -# (string value) -#qpid_sasl_mechanisms= - -# Seconds between connection keepalive heartbeats (integer -# value) -#qpid_heartbeat=60 - -# Transport to use, either 'tcp' or 'ssl' (string value) -#qpid_protocol=tcp - -# Disable Nagle algorithm (boolean value) -#qpid_tcp_nodelay=true - -# The qpid topology version to use. Version 1 is what was -# originally used by impl_qpid. Version 2 includes some -# backwards-incompatible changes that allow broker federation -# to work. Users should update to version 2 when they are -# able to take everything down, as it requires a clean break. -# (integer value) -#qpid_topology_version=1 -{{/qpid}} - -# -# Options defined in heat.openstack.common.rpc.impl_zmq -# - -# ZeroMQ bind address. Should be a wildcard (*), an ethernet -# interface, or IP. The "host" option should point or resolve -# to this address. (string value) -#rpc_zmq_bind_address=* - -# MatchMaker driver (string value) -#rpc_zmq_matchmaker=heat.openstack.common.rpc.matchmaker.MatchMakerLocalhost - -# ZeroMQ receiver listening port (integer value) -#rpc_zmq_port=9501 - -# Number of ZeroMQ contexts, defaults to 1 (integer value) -#rpc_zmq_contexts=1 - -# Maximum number of ingress messages to locally buffer per -# topic. Default is unlimited. (integer value) -#rpc_zmq_topic_backlog= - -# Directory for holding IPC sockets (string value) -#rpc_zmq_ipc_dir=/var/run/openstack - -# Name of this node. Must be a valid hostname, FQDN, or IP -# address. Must match "host" option, if running Nova. (string -# value) -#rpc_zmq_host=heat - - -# -# Options defined in heat.openstack.common.rpc.matchmaker -# - -# Heartbeat frequency (integer value) -#matchmaker_heartbeat_freq=300 - -# Heartbeat time-to-live. (integer value) -#matchmaker_heartbeat_ttl=600 - - -[ssl] - -# -# Options defined in heat.openstack.common.sslutils -# - -# CA certificate file to use to verify connecting clients -# (string value) -#ca_file= - -# Certificate file to use when starting the server securely -# (string value) -#cert_file= - -# Private key file to use when starting the server securely -# (string value) -#key_file= - - -[database] - -# -# Options defined in heat.openstack.common.db.api -# - -# The backend to use for db (string value) -#backend=sqlalchemy - -# Enable the experimental use of thread pooling for all DB API -# calls (boolean value) -#use_tpool=false - - -# -# Options defined in heat.openstack.common.db.sqlalchemy.session -# - -# The SQLAlchemy connection string used to connect to the -# database (string value) -#connection=sqlite:////heat/openstack/common/db/$sqlite_db - -# The SQLAlchemy connection string used to connect to the -# slave database (string value) -#slave_connection= - -# timeout before idle sql connections are reaped (integer -# value) -#idle_timeout=3600 - -# Minimum number of SQL connections to keep open in a pool -# (integer value) -#min_pool_size=1 - -# Maximum number of SQL connections to keep open in a pool -# (integer value) -#max_pool_size= - -# maximum db connection retries during startup. (setting -1 -# implies an infinite retry count) (integer value) -#max_retries=10 - -# interval between retries of opening a sql connection -# (integer value) -#retry_interval=10 - -# If set, use this value for max_overflow with sqlalchemy -# (integer value) -#max_overflow= - -# Verbosity of SQL debugging information. 0=None, -# 100=Everything (integer value) -#connection_debug=0 - -# Add python stack traces to SQL as comment strings (boolean -# value) -#connection_trace=false - -# If set, use this value for pool_timeout with sqlalchemy -# (integer value) -#pool_timeout= - - -[paste_deploy] - -# -# Options defined in heat.common.config -# - -# The flavor to use (string value) -#flavor= - -# The API paste config file to use (string value) -#api_paste_config=api-paste.ini - - -[rpc_notifier2] - -# -# Options defined in heat.openstack.common.notifier.rpc_notifier2 -# - -# AMQP topic(s) used for openstack notifications (list value) -#topics=notifications - -[keystone_authtoken] -auth_uri = http://{{keystone.host}}:5000/v2.0 -identity_uri=http://{{keystone.host}}:35357 - -# These must be set to your local values in order for the token -# authentication to work. -admin_tenant_name = {{heat.admin_tenant_name}} -admin_user = {{heat.admin_user}} -admin_password = {{heat.admin_password}} - -[ec2authtoken] - -# -# Options defined in heat.api.aws.ec2token -# - -# Authentication Endpoint URI (string value) -#auth_uri= -auth_uri = http://{{keystone.host}}:5000/v2.0 - -# Allow orchestration of multiple clouds (boolean value) -#multi_cloud=false - -# Allowed keystone endpoints for auth_uri when multi_cloud is -# enabled. At least one endpoint needs to be specified. (list -# value) -#allowed_auth_uris= - - -[heat_api_cloudwatch] - -# -# Options defined in heat.common.wsgi -# - -# Address to bind the server. Useful when selecting a -# particular network interface. (string value) -#bind_host=0.0.0.0 - -# The port on which the server will listen. (integer value) -#bind_port=8003 - -# Number of backlog requests to configure the socket with -# (integer value) -#backlog=4096 - -# Location of the SSL Certificate File to use for SSL mode -# (string value) -#cert_file= - -# Location of the SSL Key File to use for enabling SSL mode -# (string value) -#key_file= - -# Number of workers for Heat service (integer value) -#workers=0 - - -[heat_api] - -# -# Options defined in heat.common.wsgi -# - -# Address to bind the server. Useful when selecting a -# particular network interface. (string value) -#bind_host=0.0.0.0 - -# The port on which the server will listen. (integer value) -#bind_port=8004 - -# Number of backlog requests to configure the socket with -# (integer value) -#backlog=4096 - -# Location of the SSL Certificate File to use for SSL mode -# (string value) -#cert_file= - -# Location of the SSL Key File to use for enabling SSL mode -# (string value) -#key_file= - -# Number of workers for Heat service (integer value) -#workers=0 - - -[heat_api_cfn] - -# -# Options defined in heat.common.wsgi -# - -# Address to bind the server. Useful when selecting a -# particular network interface. (string value) -#bind_host=0.0.0.0 - -# The port on which the server will listen. (integer value) -#bind_port=8000 - -# Number of backlog requests to configure the socket with -# (integer value) -#backlog=4096 - -# Location of the SSL Certificate File to use for SSL mode -# (string value) -#cert_file= - -# Location of the SSL Key File to use for enabling SSL mode -# (string value) -#key_file= - -# Number of workers for Heat service (integer value) -#workers=0 - - -[auth_password] - -# -# Options defined in heat.common.config -# - -# Allow orchestration of multiple clouds (boolean value) -#multi_cloud=false - -# Allowed keystone endpoints for auth_uri when multi_cloud is -# enabled. At least one endpoint needs to be specified. (list -# value) -#allowed_auth_uris= - - -[matchmaker_ring] - -# -# Options defined in heat.openstack.common.rpc.matchmaker_ring -# - -# Matchmaker ring file (JSON) (string value) -#ringfile=/etc/oslo/matchmaker_ring.json - - -[matchmaker_redis] - -# -# Options defined in heat.openstack.common.rpc.matchmaker_redis -# - -# Host to locate redis (string value) -#host=127.0.0.1 - -# Use this port to connect to redis host. (integer value) -#port=6379 - -# Password for Redis server. (optional) (string value) -#password= - -{{#heat}} -{{#config}} -[{{{section}}}] -{{#values}} -{{#comment}} -# {{{.}}} -{{/comment}} -{{#option}} -{{{option}}} = {{{value}}} -{{/option}} -{{/values}} - -{{/config}} -{{/heat}} diff --git a/elements/heat/source-repository-heat b/elements/heat/source-repository-heat deleted file mode 100644 index 0c7090c97..000000000 --- a/elements/heat/source-repository-heat +++ /dev/null @@ -1 +0,0 @@ -heat git /opt/stack/heat https://git.openstack.org/openstack/heat.git diff --git a/elements/horizon/README.md b/elements/horizon/README.md deleted file mode 100644 index 0ef5c090a..000000000 --- a/elements/horizon/README.md +++ /dev/null @@ -1,15 +0,0 @@ -Install and configure OpenStack Dashboard (Horizon). - -Horizon runs on port 80 behind Apache using mod_wsgi. - - -Configuration -------------- - -We use the `keystone.host` key to connect to Keystone and `horizon.secret_key` -as the Django secret key. - -The Django sessions storage backend is set to LocMemCache by default. If -`horizon.caches.memcached` is found instead not empty, the sessions storage -backend is set to Memcached and the control nodes are configured as memcached -locations. \ No newline at end of file diff --git a/elements/horizon/cleanup.d/50-remove-source-horizon b/elements/horizon/cleanup.d/50-remove-source-horizon deleted file mode 100755 index f7dc8a254..000000000 --- a/elements/horizon/cleanup.d/50-remove-source-horizon +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eu - -sudo rm -fr "${TMP_MOUNT_PATH}/opt/stack/horizon" diff --git a/elements/horizon/element-deps b/elements/horizon/element-deps deleted file mode 100644 index 875096a41..000000000 --- a/elements/horizon/element-deps +++ /dev/null @@ -1,7 +0,0 @@ -apache2 -iptables -memcached -os-apply-config -os-refresh-config -os-svc-install -source-repositories diff --git a/elements/horizon/environment.d/10-horizon-venv-dir.bash b/elements/horizon/environment.d/10-horizon-venv-dir.bash deleted file mode 100644 index 307dec36d..000000000 --- a/elements/horizon/environment.d/10-horizon-venv-dir.bash +++ /dev/null @@ -1,6 +0,0 @@ -if [ -z "${HORIZON_VENV_DIR:-}" ]; then - export HORIZON_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/horizon"} -fi -if [ -z "${HORIZON_EXTRA_INSTALL_OPTS:-}" ]; then - export HORIZON_EXTRA_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-""} -fi diff --git a/elements/horizon/files/etc/httpd/conf.d/horizon.conf b/elements/horizon/files/etc/httpd/conf.d/horizon.conf deleted file mode 100644 index 866063f02..000000000 --- a/elements/horizon/files/etc/httpd/conf.d/horizon.conf +++ /dev/null @@ -1,40 +0,0 @@ - - WSGIScriptAlias / HORIZON_VENV_DIR/lib/python2.7/site-packages/openstack_dashboard/wsgi/django.wsgi - WSGIDaemonProcess horizon user=horizon group=horizon processes=3 threads=10 home=HORIZON_VENV_DIR python-path=HORIZON_VENV_DIR:HORIZON_VENV_DIR/lib/python2.7/site-packages/ - WSGIApplicationGroup %{GLOBAL} - - SetEnv APACHE_RUN_USER horizon - SetEnv APACHE_RUN_GROUP horizon - WSGIProcessGroup horizon - - DocumentRoot /var/www/horizon/static - Alias /static /var/www/horizon/static - Alias /media /var/www/horizon/static - - - Options FollowSymLinks - AllowOverride None - - - - Options Indexes FollowSymLinks MultiViews - Require all granted - AllowOverride None - Order allow,deny - allow from all - - - - Options Indexes FollowSymLinks MultiViews - Require all granted - AllowOverride None - Order allow,deny - allow from all - - - ErrorLog /var/log/httpd/horizon_error.log - LogLevel debug - CustomLog /var/log/httpd/horizon_access.log combined - - -WSGISocketPrefix /var/run/httpd diff --git a/elements/horizon/files/etc/httpd/conf.d/ports.conf b/elements/horizon/files/etc/httpd/conf.d/ports.conf deleted file mode 100644 index d1d21c1da..000000000 --- a/elements/horizon/files/etc/httpd/conf.d/ports.conf +++ /dev/null @@ -1,12 +0,0 @@ -NameVirtualHost *:80 -{{#haproxy}} -{{#stunnel.connect_host}} -Listen {{stunnel.connect_host}}:80 -{{/stunnel.connect_host}} -{{^stunnel.connect_host}} -Listen {{local-ipv4}}:80 -{{/stunnel.connect_host}} -{{/haproxy}} -{{^haproxy}} -Listen 80 -{{/haproxy}} diff --git a/elements/horizon/install.d/horizon-package-install/100-horizon b/elements/horizon/install.d/horizon-package-install/100-horizon deleted file mode 100755 index d616f4bcc..000000000 --- a/elements/horizon/install.d/horizon-package-install/100-horizon +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages openstack-dashboard - -# Make sure apache doesn't listen to the Controller virtual IP -TEMPLATE_ROOT=$(os-apply-config --print-templates) - -sed -i '/Listen/s/^/#/' /etc/httpd/conf/httpd.conf -mkdir -p "${TEMPLATE_ROOT}/etc/httpd/conf.d/" -install -m 0644 -o root -g root "$(dirname $0)/../files/etc/httpd/conf.d/ports.conf" "${TEMPLATE_ROOT}/etc/httpd/conf.d/" diff --git a/elements/horizon/install.d/horizon-source-install/100-horizon b/elements/horizon/install.d/horizon-source-install/100-horizon deleted file mode 100755 index 9da4c6006..000000000 --- a/elements/horizon/install.d/horizon-source-install/100-horizon +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash -set -eux - -install-packages libapache2-mod-wsgi libssl-dev libffi-dev gettext - -TEMPLATE_ROOT="$(os-apply-config --print-templates)" -FILES="$(dirname $0)/../files/" -HORIZON_CONF=/etc/httpd/conf.d/horizon.conf -PORTS_CONF=/etc/httpd/conf.d/ports.conf - -if [ -d /etc/httpd ]; then - # This is required to allow different ports configuration - # e.g haproxy or apache listening on 80 - sed -i '/Listen/s/^/#/g' /etc/httpd/conf/httpd.conf - mkdir -p "${TEMPLATE_ROOT}/etc/httpd/conf.d/" - for FILE in "${HORIZON_CONF}" "${PORTS_CONF}"; do - install -m 0644 -o root -g root "${FILES}${FILE}" "${TEMPLATE_ROOT}${FILE}" - done - sed -e "s|HORIZON_VENV_DIR|${HORIZON_VENV_DIR}|g" -i "${TEMPLATE_ROOT}/etc/httpd/conf.d/horizon.conf" -fi - -if [ -d /etc/apache2 ]; then - mkdir -p "${TEMPLATE_ROOT}/etc/apache2/sites-available" - install -m 0644 -o root -g root "${FILES}${HORIZON_CONF}" "${TEMPLATE_ROOT}/etc/apache2/sites-available/" - install -m 0644 -o root -g root "${FILES}${PORTS_CONF}" "${TEMPLATE_ROOT}/etc/apache2/ports.conf" - ln -s /etc/apache2/sites-available/horizon.conf /etc/apache2/sites-enabled/horizon.conf - [ ! -d /var/log/httpd ] && ln -s /var/log/apache2 /var/log/httpd - rm -f /etc/apache2/sites-enabled/{000-default.conf,default.conf,default-ssl.conf} - sed -e "s|HORIZON_VENV_DIR|${HORIZON_VENV_DIR}|g" -i "${TEMPLATE_ROOT}/etc/apache2/sites-available/horizon.conf" -fi - -os-svc-install ${HORIZON_EXTRA_INSTALL_OPTS} -i "${HORIZON_VENV_DIR}" -u horizon -r /opt/stack/horizon -set +u -source "${HORIZON_VENV_DIR}/bin/activate" -set -u -pip install python-memcached -write-pip-manifest horizon -set +u -deactivate -set -u - -if [ ! -d /var/www/horizon/static ]; then - mkdir -p /var/www/horizon/static - chown -R horizon:horizon /var/www/horizon -fi - -# Django won't start otherwise: -touch /etc/horizon/.secret_key_store -chmod 600 /etc/horizon/.secret_key_store -chown horizon:horizon /etc/horizon/.secret_key_store - -# Workaround for https://bugs.launchpad.net/osprofiler/+bug/1361235 -sed -i "s#'../..'#os.path.realpath('../..')#" "$HORIZON_VENV_DIR"/lib/python2.7/site-packages/openstack_dashboard/wsgi/django.wsgi - -# We need to splice this into local_settings.py at configuration time -ENVDIR="$(os-refresh-config --print-base)/environment.d" -mkdir -p "${ENVDIR}" -echo "export HORIZON_VENV_DIR='${HORIZON_VENV_DIR}'" > "${ENVDIR}/10-horizon-venv-dir.bash" diff --git a/elements/horizon/os-apply-config/etc/horizon/.secret_key_store b/elements/horizon/os-apply-config/etc/horizon/.secret_key_store deleted file mode 100644 index 21fdd1afa..000000000 --- a/elements/horizon/os-apply-config/etc/horizon/.secret_key_store +++ /dev/null @@ -1 +0,0 @@ -{{horizon.secret_key}} diff --git a/elements/horizon/os-apply-config/etc/horizon/local_settings.py b/elements/horizon/os-apply-config/etc/horizon/local_settings.py deleted file mode 100644 index 79122833d..000000000 --- a/elements/horizon/os-apply-config/etc/horizon/local_settings.py +++ /dev/null @@ -1,96 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import os - -from openstack_dashboard import exceptions - -DEBUG = False -TEMPLATE_DEBUG = DEBUG -COMPRESS_OFFLINE = True - -ROOT_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), "..")) -STATIC_ROOT = '/var/www/horizon/static' - -ALLOWED_HOSTS = ['*'] - -with open('/etc/horizon/.secret_key_store', 'r') as f: - SECRET_KEY = f.read() - -HORIZON_CONFIG = { - 'dashboards': ('project', 'admin', 'settings',), - 'default_dashboard': 'project', - 'user_home': 'openstack_dashboard.views.get_user_home', - 'ajax_queue_limit': 10, - 'auto_fade_alerts': { - 'delay': 3000, - 'fade_duration': 1500, - 'types': ['alert-success', 'alert-info'] - }, - 'help_url': "http://docs.openstack.org", - 'exceptions': {'recoverable': exceptions.RECOVERABLE, - 'not_found': exceptions.NOT_FOUND, - 'unauthorized': exceptions.UNAUTHORIZED}, -} - - -CACHES = { - 'default': { - {{#horizon.caches.memcached}} - 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', - 'LOCATION': [{{#nodes}}'{{.}}',{{/nodes}}] - {{/horizon.caches.memcached}} # flake8: noqa - {{^horizon.caches.memcached}} - 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache' - {{/horizon.caches.memcached}} - } -} - -{{#horizon.caches.memcached}} -SESSION_ENGINE = 'django.contrib.sessions.backends.cache' -{{/horizon.caches.memcached}} - -# Send email to the console by default -EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' - -OPENSTACK_HOST = "{{keystone.host}}" -OPENSTACK_KEYSTONE_URL = "http://%s:5000/v2.0" % OPENSTACK_HOST -OPENSTACK_KEYSTONE_DEFAULT_ROLE = "_member_" - -OPENSTACK_KEYSTONE_BACKEND = { - 'name': 'native', - 'can_edit_user': True, - 'can_edit_group': True, - 'can_edit_project': True, - 'can_edit_domain': True, - 'can_edit_role': True -} - -OPENSTACK_HYPERVISOR_FEATURES = { - 'can_set_mount_point': True, - - # NOTE: as of Grizzly this is not yet supported in Nova so enabling this - # setting will not do anything useful - 'can_encrypt_volumes': False -} - - -OPENSTACK_NEUTRON_NETWORK = { - 'enable_lb': False -} - - -API_RESULT_LIMIT = 1000 -API_RESULT_PAGE_SIZE = 20 - -TIME_ZONE = "UTC" diff --git a/elements/horizon/os-refresh-config/configure.d/20-horizon-selinux b/elements/horizon/os-refresh-config/configure.d/20-horizon-selinux deleted file mode 100755 index 30bfbcb61..000000000 --- a/elements/horizon/os-refresh-config/configure.d/20-horizon-selinux +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -set -eux -set -o pipefail - -[ -x /usr/sbin/semanage ] || exit 0 - -# https://bugs.launchpad.net/tripleo/+bug/1361630 -# https://bugzilla.redhat.com/show_bug.cgi?id=1133904 -setsebool -P httpd_can_network_connect 1 diff --git a/elements/horizon/os-refresh-config/configure.d/25-horizon-fedora-iptables b/elements/horizon/os-refresh-config/configure.d/25-horizon-fedora-iptables deleted file mode 100755 index ad109560b..000000000 --- a/elements/horizon/os-refresh-config/configure.d/25-horizon-fedora-iptables +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -eu - -# Open the appropriate port for Horizon depending on its configuration (i.e. 80 vs 443) -add-rule INPUT -p tcp --dport $(os-apply-config --key 'horizon.port' --type int --key-default 80) -j ACCEPT diff --git a/elements/horizon/os-refresh-config/post-configure.d/14-horizon b/elements/horizon/os-refresh-config/post-configure.d/14-horizon deleted file mode 100755 index 602dc3251..000000000 --- a/elements/horizon/os-refresh-config/post-configure.d/14-horizon +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -set -e -set -o pipefail - -if [ -n "${HORIZON_VENV_DIR:-}" ] ; then - cp /etc/horizon/local_settings.py $HORIZON_VENV_DIR/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py - - # TODO(shadower) workaround for: - # https://bugs.launchpad.net/os-apply-config/+bug/1246266 - chmod 600 /etc/horizon/.secret_key_store - chown horizon:horizon /etc/horizon/.secret_key_store - - # Collect static artifacts. The following steps are required to be run here - # rather than in install.d due to requiring the local_settings.py config - # file. - source $HORIZON_VENV_DIR/bin/activate - DJANGO_SETTINGS_MODULE=openstack_dashboard.settings django-admin.py collectstatic --noinput - DJANGO_SETTINGS_MODULE=openstack_dashboard.settings django-admin.py compress - - # Compile translations. makemessages isn't necessary because the - # non-English .po files are updated from Transifex. This also has to be - # done here for the same reason as above. It requires gettext. - for project in openstack_dashboard horizon openstack_auth; do - pushd $HORIZON_VENV_DIR/lib/python2.7/site-packages/$project - DJANGO_SETTINGS_MODULE=openstack_dashboard.settings django-admin.py compilemessages - popd - done -else - cp /etc/horizon/local_settings.py /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py - sed -i 's#^STATIC_ROOT.*#STATIC_ROOT="/usr/share/openstack-dashboard/static"#' /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py -fi - -os-svc-enable -an apache2 -os-svc-restart -an apache2 diff --git a/elements/horizon/source-repository-horizon b/elements/horizon/source-repository-horizon deleted file mode 100644 index 6b974d23b..000000000 --- a/elements/horizon/source-repository-horizon +++ /dev/null @@ -1 +0,0 @@ -horizon git /opt/stack/horizon https://git.openstack.org/openstack/horizon diff --git a/elements/hosts/README.md b/elements/hosts/README.md deleted file mode 100644 index 414c02113..000000000 --- a/elements/hosts/README.md +++ /dev/null @@ -1,5 +0,0 @@ -Permit injecting content into /etc/hosts from heat - -# Configuration - - hosts: '192.0.2.1 my-host.example.com' diff --git a/elements/hosts/element-deps b/elements/hosts/element-deps deleted file mode 100644 index 9d8b6b7a5..000000000 --- a/elements/hosts/element-deps +++ /dev/null @@ -1,2 +0,0 @@ -os-apply-config -os-refresh-config diff --git a/elements/hosts/os-refresh-config/configure.d/51-hosts b/elements/hosts/os-refresh-config/configure.d/51-hosts deleted file mode 100755 index 32ac86a8c..000000000 --- a/elements/hosts/os-refresh-config/configure.d/51-hosts +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash - -set -eux -set -o pipefail - -write_entries() { - local file="$1" - local entries="$2" - - # Don't do anything if the file isn't there - if [ ! -f "$file" ]; then - return - fi - - if grep -q "^# HEAT_HOSTS_START" "$file"; then - temp=$(mktemp) - ( - sed '/^# HEAT_HOSTS_START/,$d' "$file" - echo -ne "\n# HEAT_HOSTS_START - Do not edit manually within this section!\n" - echo "$entries" - echo -ne "# HEAT_HOSTS_END\n\n" - sed '1,/^# HEAT_HOSTS_END/d' "$file" - ) > "$temp" - echo "INFO: Updating hosts file $file, check below for changes" - diff "$file" "$temp" || true - cat "$temp" > "$file" - else - echo -ne "\n# HEAT_HOSTS_START - Do not edit manually within this section!\n" >> "$file" - echo "$entries" >> "$file" - echo -ne "# HEAT_HOSTS_END\n\n" >> "$file" - fi - -} - -ENTRIES=$(os-apply-config --key hosts --type raw --key-default '' | tr '[A-Z]' '[a-z]' | sed -e 's/\\n/\n/g' -e '/^$/d') -if [ ! -z "$ENTRIES" ]; then - # cloud-init files are /etc/cloud/templates/hosts.OSNAME.tmpl - DIST=$(lsb_release -is | tr -s '[A-Z]' '[a-z]') - case $DIST in - fedora|redhatenterpriseserver) - name="redhat" - ;; - *) - name="$DIST" - ;; - esac - write_entries "/etc/cloud/templates/hosts.${name}.tmpl" "$ENTRIES" - write_entries "/etc/hosts" "$ENTRIES" -else - echo "No hosts in Heat, nothing written." -fi diff --git a/elements/hosts/package-installs.yaml b/elements/hosts/package-installs.yaml deleted file mode 100644 index 63257d7b2..000000000 --- a/elements/hosts/package-installs.yaml +++ /dev/null @@ -1 +0,0 @@ -lsb_release: diff --git a/elements/hosts/pkg-map b/elements/hosts/pkg-map deleted file mode 100644 index b64cefb3e..000000000 --- a/elements/hosts/pkg-map +++ /dev/null @@ -1,7 +0,0 @@ -{ - "family": { - "redhat": { - "lsb_release": "redhat-lsb-core" - } - } -} diff --git a/elements/icinga-core/README.md b/elements/icinga-core/README.md deleted file mode 100644 index fe25472ac..000000000 --- a/elements/icinga-core/README.md +++ /dev/null @@ -1,2 +0,0 @@ -Install Icinga's core from the distribution repository. - diff --git a/elements/icinga-core/install.d/05-icinga-core b/elements/icinga-core/install.d/05-icinga-core deleted file mode 100755 index 7d5909a3b..000000000 --- a/elements/icinga-core/install.d/05-icinga-core +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -# install icinga-core - -set -eux -set -o pipefail - -install-packages icinga-core - -# check_icmp needs to be setuid 0 to run correctly -# but for some reason the package doesn't do this. -chmod u+s /usr/lib/nagios/plugins/check_icmp diff --git a/elements/icinga-web/README.md b/elements/icinga-web/README.md deleted file mode 100644 index a0c6d1377..000000000 --- a/elements/icinga-web/README.md +++ /dev/null @@ -1,2 +0,0 @@ -Install Icinga's web interface from the distribution repository. - diff --git a/elements/icinga-web/install.d/06-icinga-web b/elements/icinga-web/install.d/06-icinga-web deleted file mode 100755 index d0fc3ea00..000000000 --- a/elements/icinga-web/install.d/06-icinga-web +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# install icinga-web - -set -e -set -o xtrace - -install-packages icinga-web icinga-cgi - diff --git a/elements/ironic-api/README.md b/elements/ironic-api/README.md deleted file mode 100644 index 8111e175b..000000000 --- a/elements/ironic-api/README.md +++ /dev/null @@ -1 +0,0 @@ -Enable Ironic API service. diff --git a/elements/ironic-api/element-deps b/elements/ironic-api/element-deps deleted file mode 100644 index 88acbca0f..000000000 --- a/elements/ironic-api/element-deps +++ /dev/null @@ -1,7 +0,0 @@ -iptables -ironic -os-is-bootstrap-host -os-refresh-config -os-svc-install -package-installs -pkg-map diff --git a/elements/ironic-api/install.d/ironic-package-install/package-installs-ironic-api b/elements/ironic-api/install.d/ironic-package-install/package-installs-ironic-api deleted file mode 100644 index 011344cc8..000000000 --- a/elements/ironic-api/install.d/ironic-package-install/package-installs-ironic-api +++ /dev/null @@ -1 +0,0 @@ -ironic_api_package diff --git a/elements/ironic-api/install.d/ironic-source-install/68-ironic-api b/elements/ironic-api/install.d/ironic-source-install/68-ironic-api deleted file mode 100755 index bc6a956ad..000000000 --- a/elements/ironic-api/install.d/ironic-source-install/68-ironic-api +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -eux - -os-svc-daemon -i "$IRONIC_VENV_DIR" ironic-api ironic ironic-api "--config-file /etc/ironic/ironic.conf" diff --git a/elements/ironic-api/os-refresh-config/configure.d/90-ironic-db-sync b/elements/ironic-api/os-refresh-config/configure.d/90-ironic-db-sync deleted file mode 100755 index 3041d87a6..000000000 --- a/elements/ironic-api/os-refresh-config/configure.d/90-ironic-db-sync +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -if os-is-bootstrap-host ; then - su -s /bin/bash -c 'ironic-dbsync --config-file /etc/ironic/ironic.conf' ironic -fi diff --git a/elements/ironic-api/os-refresh-config/post-configure.d/68-ironic-api b/elements/ironic-api/os-refresh-config/post-configure.d/68-ironic-api deleted file mode 100755 index 23f206212..000000000 --- a/elements/ironic-api/os-refresh-config/post-configure.d/68-ironic-api +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -eu -set -o pipefail - -os-svc-enable -an ironic-api - -os-svc-restart -an ironic-api diff --git a/elements/ironic-api/os-refresh-config/pre-configure.d/97-fedora-ironic-api-iptables b/elements/ironic-api/os-refresh-config/pre-configure.d/97-fedora-ironic-api-iptables deleted file mode 100755 index ddde8e744..000000000 --- a/elements/ironic-api/os-refresh-config/pre-configure.d/97-fedora-ironic-api-iptables +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -eu -set -o pipefail - -add-rule INPUT -p tcp --dport 6385 -j ACCEPT diff --git a/elements/ironic-api/pkg-map b/elements/ironic-api/pkg-map deleted file mode 100644 index b0b80b4ff..000000000 --- a/elements/ironic-api/pkg-map +++ /dev/null @@ -1,5 +0,0 @@ -{ - "default": { - "ironic_api_package": "openstack-ironic-api" - } -} diff --git a/elements/ironic-api/svc-map b/elements/ironic-api/svc-map deleted file mode 100644 index b3c2f4b3f..000000000 --- a/elements/ironic-api/svc-map +++ /dev/null @@ -1,3 +0,0 @@ -ironic-api: - default: ironic-api - redhat: openstack-ironic-api diff --git a/elements/ironic-conductor/README.md b/elements/ironic-conductor/README.md deleted file mode 100644 index ffe552e17..000000000 --- a/elements/ironic-conductor/README.md +++ /dev/null @@ -1 +0,0 @@ -Enable Ironic Conductor service. diff --git a/elements/ironic-conductor/element-deps b/elements/ironic-conductor/element-deps deleted file mode 100644 index 1d2aa1127..000000000 --- a/elements/ironic-conductor/element-deps +++ /dev/null @@ -1,6 +0,0 @@ -ironic -os-apply-config -os-refresh-config -os-svc-install -package-installs -pkg-map diff --git a/elements/ironic-conductor/install.d/69-ironic-tftp-support b/elements/ironic-conductor/install.d/69-ironic-tftp-support deleted file mode 100755 index d0b44a9c8..000000000 --- a/elements/ironic-conductor/install.d/69-ironic-tftp-support +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -# setup tftp directory structure -if [ -f /usr/lib/syslinux/pxelinux.0 ]; then - # Ubuntu - pxe_zero="/usr/lib/syslinux/pxelinux.0" -elif [ -f /usr/share/syslinux/pxelinux.0 ]; then - # Fedora/RHEL - pxe_zero="/usr/share/syslinux/pxelinux.0" -else - echo "Failed to find pxelinux.0." - exit 1 -fi - -# create tftpboot and cache directories -install -d -m 0755 -o ironic -g ironic /tftpboot/pxelinux.cfg/ -install -o ironic -g ironic -m 744 $pxe_zero /tftpboot/pxelinux.0 - -# for newer syslinux versions we may need to copy in the library -# modules as well (Fedora 21 for example) -if [ -f /usr/share/syslinux/ldlinux.* ]; then - # Fedora/RHEL - cp /usr/share/syslinux/ldlinux.* /tftpboot -fi - -# Copy in the chain loader for full disk image booting. -syslinux='/usr/share/syslinux' -for f in chain.c32 libcom32.c32 libutil.c32; do - if [ -f $syslinux/$f ]; then - cp $syslinux/$f /tftpboot - fi -done - -# Disable the tftp-hpa upstart job, we're using xinetd -[ -f /etc/init/tftpd-hpa.conf ] && echo "manual" > /etc/init/tftpd-hpa.override - -# Disable the tftpd-hpa SysV script for the same reason -[ -f /etc/init.d/tftpd-hpa ] && update-rc.d -f tftpd-hpa disable - -cat > /etc/xinetd.d/tftp << EOF -service tftp -{ - protocol = udp - port = 69 - socket_type = dgram - wait = yes - user = root - server = /usr/sbin/in.tftpd - server_args = --map-file /tftpboot/map-file /tftpboot - disable = no - flags = IPv4 -} -EOF - -# Adds support for tftp requests that don't include the directory name. -echo 'r ^([^/]) /tftpboot/\1' > /tftpboot/map-file - -# ensure tftpboot dir and all files in it are owned by ironic user -chown ironic:ironic -R /tftpboot diff --git a/elements/ironic-conductor/install.d/ironic-package-install/package-installs-ironic-conductor b/elements/ironic-conductor/install.d/ironic-package-install/package-installs-ironic-conductor deleted file mode 100644 index 7117e94e4..000000000 --- a/elements/ironic-conductor/install.d/ironic-package-install/package-installs-ironic-conductor +++ /dev/null @@ -1 +0,0 @@ -ironic_conductor_package diff --git a/elements/ironic-conductor/install.d/ironic-source-install/68-ironic-conductor b/elements/ironic-conductor/install.d/ironic-source-install/68-ironic-conductor deleted file mode 100755 index 0c358f917..000000000 --- a/elements/ironic-conductor/install.d/ironic-source-install/68-ironic-conductor +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -echo "ironic ALL=(root) NOPASSWD: $IRONIC_VENV_DIR/bin/ironic-rootwrap" > /etc/sudoers.d/ironic -chmod 0440 /etc/sudoers.d/ironic -visudo -c - -os-svc-daemon -a -i "$IRONIC_VENV_DIR" ironic-conductor ironic ironic-conductor "--config-file /etc/ironic/ironic.conf" diff --git a/elements/ironic-conductor/os-apply-config/mnt/state/var/lib/ironic/virtual-power-key b/elements/ironic-conductor/os-apply-config/mnt/state/var/lib/ironic/virtual-power-key deleted file mode 100644 index ac8e3933a..000000000 --- a/elements/ironic-conductor/os-apply-config/mnt/state/var/lib/ironic/virtual-power-key +++ /dev/null @@ -1 +0,0 @@ -{{ironic.virtual_power_ssh_key}} diff --git a/elements/ironic-conductor/os-refresh-config/post-configure.d/68-ironic-conductor b/elements/ironic-conductor/os-refresh-config/post-configure.d/68-ironic-conductor deleted file mode 100755 index 171e48145..000000000 --- a/elements/ironic-conductor/os-refresh-config/post-configure.d/68-ironic-conductor +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -set -eu -set -o pipefail - -parent_dir=/mnt/state/var/lib/ironic - -# Ensure the images and master-images directories exist and are owned by ironic -install -d -m 0755 -o ironic -g ironic $parent_dir -for directory in images master_images; do - mkdir -p $parent_dir/$directory - chown ironic:ironic $parent_dir/$directory -done - -os-svc-enable -an ironic-conductor - -os-svc-restart -an ironic-conductor - -# ssh really wants these permissions -chmod 600 /mnt/state/var/lib/ironic/virtual-power-key - -# make sure ironic can read the ssh key -chown ironic:ironic /mnt/state/var/lib/ironic/virtual-power-key diff --git a/elements/ironic-conductor/package-installs.yaml b/elements/ironic-conductor/package-installs.yaml deleted file mode 100644 index 3df039265..000000000 --- a/elements/ironic-conductor/package-installs.yaml +++ /dev/null @@ -1,5 +0,0 @@ -syslinux: -tftpd-hpa: -xinetd: -parted: -psmisc: diff --git a/elements/ironic-conductor/pkg-map b/elements/ironic-conductor/pkg-map deleted file mode 100644 index 4d25b1fae..000000000 --- a/elements/ironic-conductor/pkg-map +++ /dev/null @@ -1,5 +0,0 @@ -{ - "default": { - "ironic_conductor_package": "openstack-ironic-conductor" - } -} diff --git a/elements/ironic-conductor/svc-map b/elements/ironic-conductor/svc-map deleted file mode 100644 index ff04d71c3..000000000 --- a/elements/ironic-conductor/svc-map +++ /dev/null @@ -1,3 +0,0 @@ -ironic-conductor: - default: ironic-conductor - redhat: openstack-ironic-conductor diff --git a/elements/ironic/README.md b/elements/ironic/README.md deleted file mode 100644 index 590c38d0a..000000000 --- a/elements/ironic/README.md +++ /dev/null @@ -1,16 +0,0 @@ -Install and configure Ironic. - -Required options can be provided via heat. -For example: - - ironic: - db: mysql://ironic:unset@192.0.2.2/ironic - service-password: unset - keystone: - host: 192.0.2.2 - glance: - host: 192.0.2.2 - rabbit: - host: 192.0.2.2 - password: guest - diff --git a/elements/ironic/cleanup.d/50-remove-ironic b/elements/ironic/cleanup.d/50-remove-ironic deleted file mode 100755 index 0165cb998..000000000 --- a/elements/ironic/cleanup.d/50-remove-ironic +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eu - -sudo rm -fr "${TMP_MOUNT_PATH}/opt/stack/ironic" diff --git a/elements/ironic/element-deps b/elements/ironic/element-deps deleted file mode 100644 index e63a65587..000000000 --- a/elements/ironic/element-deps +++ /dev/null @@ -1,8 +0,0 @@ -openstack-clients -os-apply-config -os-refresh-config -os-svc-install -package-installs -pkg-map -selinux -source-repositories diff --git a/elements/ironic/environment.d/10-ironic-venv-dir.bash b/elements/ironic/environment.d/10-ironic-venv-dir.bash deleted file mode 100644 index acea3a8d7..000000000 --- a/elements/ironic/environment.d/10-ironic-venv-dir.bash +++ /dev/null @@ -1,6 +0,0 @@ -if [ -z "${IRONIC_VENV_DIR:-}" ]; then - export IRONIC_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/ironic"} -fi -if [ -z "${IRONIC_EXTRA_INSTALL_OPTS:-}" ]; then - export IRONIC_EXTRA_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-""} -fi diff --git a/elements/ironic/install.d/ironic-package-install/package-installs-ironic b/elements/ironic/install.d/ironic-package-install/package-installs-ironic deleted file mode 100644 index 390b26a21..000000000 --- a/elements/ironic/install.d/ironic-package-install/package-installs-ironic +++ /dev/null @@ -1 +0,0 @@ -ironic_package diff --git a/elements/ironic/install.d/ironic-source-install/68-ironic b/elements/ironic/install.d/ironic-source-install/68-ironic deleted file mode 100755 index 239d4eec7..000000000 --- a/elements/ironic/install.d/ironic-source-install/68-ironic +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -set -eux - -os-svc-install $IRONIC_EXTRA_INSTALL_OPTS -i "$IRONIC_VENV_DIR" -u ironic -r /opt/stack/ironic - -install -d -m 0750 -o ironic -g ironic /etc/ironic -install -o root -g root -m 0644 /opt/stack/ironic/etc/ironic/policy.json /etc/ironic - -# Setup Ironic's rootwrap. -install -o root -g root -m 0755 -d /etc/ironic/rootwrap.d -install -o root -g root -m 0644 -t /etc/ironic/rootwrap.d /opt/stack/ironic/etc/ironic/rootwrap.d/* -install -o root -g root -m 0644 /opt/stack/ironic/etc/ironic/rootwrap.conf /etc/ironic/rootwrap.conf - -ln -s $IRONIC_VENV_DIR/bin/ironic-dbsync /usr/local/bin/ironic-dbsync - -ln -sf $IRONIC_VENV_DIR/bin/ironic-rootwrap /usr/local/bin/ironic-rootwrap - -add-selinux-path-substitution /usr/bin $IRONIC_VENV_DIR/bin diff --git a/elements/ironic/install.d/package-installs-ironic b/elements/ironic/install.d/package-installs-ironic deleted file mode 100644 index 7c992e22d..000000000 --- a/elements/ironic/install.d/package-installs-ironic +++ /dev/null @@ -1,2 +0,0 @@ -# need the libssl header files -libssl-dev diff --git a/elements/ironic/os-apply-config/etc/ironic/ironic.conf b/elements/ironic/os-apply-config/etc/ironic/ironic.conf deleted file mode 100644 index c7fca9b95..000000000 --- a/elements/ironic/os-apply-config/etc/ironic/ironic.conf +++ /dev/null @@ -1,63 +0,0 @@ -[DEFAULT] -{{#ironic.debug}}debug=True{{/ironic.debug}} -{{#ironic.verbose}}verbose=True{{/ironic.verbose}} -{{#haproxy}} -{{#stunnel.connect_host}} -host_ip = {{stunnel.connect_host}} -{{/stunnel.connect_host}} -{{^stunnel.connect_host}} -host_ip = {{local-ipv4}} -{{/stunnel.connect_host}} -{{/haproxy}} - -{{#rabbit}} -rabbit_userid=guest -rabbit_password={{password}} -{{#rabbit.host}} -rabbit_host={{.}} -{{/rabbit.host}} -{{^rabbit.host}} -rabbit_hosts={{rabbit.nodes}} -rabbit_ha_queues=true -{{/rabbit.host}} -{{/rabbit}} - -{{#local-ipv4}} -my_ip={{local-ipv4}} -{{/local-ipv4}} - -policy_file=/etc/ironic/policy.json - -enabled_drivers = pxe_ssh,pxe_ipmitool - -[database] -connection={{ironic.db}} - -[keystone_authtoken] -admin_password={{ironic.service-password}} -admin_tenant_name=service -admin_user=ironic -auth_uri = http://{{keystone.host}}:5000/v2.0 -identity_uri=http://{{keystone.host}}:35357 - -[glance] -host={{glance.host}} - -[pxe] -images_path=/mnt/state/var/lib/ironic/images/ -instance_master_path=/mnt/state/var/lib/ironic/master_images - -{{#ironic}} -{{#config}} -[{{{section}}}] -{{#values}} -{{#comment}} -# {{{.}}} -{{/comment}} -{{#option}} -{{{option}}} = {{{value}}} -{{/option}} -{{/values}} - -{{/config}} -{{/ironic}} diff --git a/elements/ironic/pkg-map b/elements/ironic/pkg-map deleted file mode 100644 index 90ae840b2..000000000 --- a/elements/ironic/pkg-map +++ /dev/null @@ -1,5 +0,0 @@ -{ - "default": { - "ironic_package": "openstack-ironic-common" - } -} diff --git a/elements/ironic/pre-install.d/00-ironic-disable-requiretty b/elements/ironic/pre-install.d/00-ironic-disable-requiretty deleted file mode 100755 index f3b184f61..000000000 --- a/elements/ironic/pre-install.d/00-ironic-disable-requiretty +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -eu - -if [ -d /etc/sudoers.d ]; then - echo "Defaults:ironic !requiretty" > /etc/sudoers.d/ironic-notty - chmod 0440 /etc/sudoers.d/ironic-notty - visudo -c -fi diff --git a/elements/ironic/source-repository-ironic b/elements/ironic/source-repository-ironic deleted file mode 100644 index 75b8f9c33..000000000 --- a/elements/ironic/source-repository-ironic +++ /dev/null @@ -1 +0,0 @@ -ironic git /opt/stack/ironic https://git.openstack.org/openstack/ironic diff --git a/elements/jenkins/README.md b/elements/jenkins/README.md deleted file mode 100644 index a80d8c433..000000000 --- a/elements/jenkins/README.md +++ /dev/null @@ -1,25 +0,0 @@ -Provisions a jenkins for doing tests of openstack cloud images -============================================================== - -After deploying the image, jenkins should be available on port 8080. - -*The following is fiction* - -To use this, add a new application at -`https://github.com/organizations/$ORGANISATION/settings/applications` and grab -the client id and secret it provides. - -Config options --------------- - -XXX: These should be passed in via cloud-init or salt, not on image build. For -now, export before building the image. - -* export `GITHUB_ORGANISATION` to set the which organisation to look for github - committers from. - -* export `GITHUB_ADMINS` to set a list of github users to be jenkins admins. - -* export `GITHUB_CLIENT_ID` to set the github OAuth client id. - -* export `GITHUB_SECRET` to set the github OAuth secret. diff --git a/elements/jenkins/install.d/10-jenkins b/elements/jenkins/install.d/10-jenkins deleted file mode 100755 index 161bc6b36..000000000 --- a/elements/jenkins/install.d/10-jenkins +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -set -eu -set -o xtrace - -install-packages jenkins - -# jenkins installs into /var/lib/jenkins which is rather restrictive. -mv /var/lib/jenkins /mnt/ -ln -s /mnt/jenkins /var/lib/jenkins diff --git a/elements/jenkins/install.d/11-jenkins-plugins b/elements/jenkins/install.d/11-jenkins-plugins deleted file mode 100755 index 70a777846..000000000 --- a/elements/jenkins/install.d/11-jenkins-plugins +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -set -eu -set -o xtrace - -source $(dirname $0)/defaults - -if [ -n "${JENKINS_PLUGINS}" ];then - for plugin in ${JENKINS_PLUGINS//,/ }; do - wget -q http://updates.jenkins-ci.org/latest/${plugin}.hpi -O /var/lib/jenkins/plugins/${plugin}.hpi - done - chown jenkins:nogroup /var/lib/jenkins/plugins/* -fi diff --git a/elements/jenkins/install.d/defaults b/elements/jenkins/install.d/defaults deleted file mode 100644 index cc9be69f1..000000000 --- a/elements/jenkins/install.d/defaults +++ /dev/null @@ -1,5 +0,0 @@ -set -e - -#List of plugins to install, comma separated list -#full list of plugins available at: http://updates.jenkins-ci.org/download/plugins/ -#JENKINS_PLUGINS="github-oauth,ircbot,debian-package-builder" diff --git a/elements/jenkins/pre-install.d/10-jenkins b/elements/jenkins/pre-install.d/10-jenkins deleted file mode 100755 index aa4d479e8..000000000 --- a/elements/jenkins/pre-install.d/10-jenkins +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -# Add the Jenkins package archive - -set -eu -set -o xtrace - -wget -q -O - http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key | apt-key add - -echo deb http://pkg.jenkins-ci.org/debian binary/ > /etc/apt/sources.list.d/jenkins.list diff --git a/elements/keepalived/README.md b/elements/keepalived/README.md deleted file mode 100644 index 96d4ad56f..000000000 --- a/elements/keepalived/README.md +++ /dev/null @@ -1,50 +0,0 @@ -Element to install keepalived - -Configuration -------------- - -Configuration can be provided two ways: the simpler, deprecated, way: - - keepalived: - # interface used for VRRP traffic - keepalive_interface: eth0 - # initial state MASTER|BACKUP - state: BACKUP - # enable/disable autofailback on higher - # priority ip being available - preempt: false - # Detailed Logging - log_detail: false - # Dumps the configuration to the logs on startup - dump_conf: false - - virtual_ips: - # you can define one or more virtual IPs including IPv6: - - ip: 192.0.2.254/24 - interface: eth0 - - ip: fe80::5cc1:afff:fe58:143b/64 - interface: br-ctlplane - -or the more detailed newer way for more complicated setups. If both ``virtual_interfaces`` and ``keepalived`` keys are present, the latter is ignored. - - virtual_interfaces: - instances: - - vrrp_instance_name: VI_CONTROL - virtual_router_id: 51 - keepalive_interface: eth0 - priority: 101 - virtual_ips: - - ip: 192.0.2.254/24 - interface: eth0 - - vrrp_instance_name: VI_PUBLIC - virtual_router_id: 52 - keepalive_interface: eth0 - priority: 101 - virtual_ips: - - ip: 10.16.15.154/24 - interface: vlan25 - vrrp_sync_groups: - - name: VG1 - members: - - VI_CONTROL - - VI_PUBLIC diff --git a/elements/keepalived/bin/keepalived_vip_change.sh b/elements/keepalived/bin/keepalived_vip_change.sh deleted file mode 100755 index a0fd8b464..000000000 --- a/elements/keepalived/bin/keepalived_vip_change.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -# A simple script triggered by keepalived when VIPs are moved -# around. When VIPs are moved to this node, explicit route for -# each VIP is added - this assures that any connection to VIP -# will use by default local-ipv4 as source address. Without this -# explicit route VIP address is used which causes issues when VIP -# moved to another node. -# https://bugs.launchpad.net/tripleo/+bug/1376200 -# -# When VIP is moved from this node, this explicit route is removed -# to allow proper routing from this node to new VIP node. - -set -eu - -logger "Started $0 $@" -PATH="$PATH:/bin:/sbin" -LOCAL_IP=$(os-apply-config --key local-ipv4 --type netaddress) - -if [ "$3" = "MASTER" ]; then - for ip in $(cat /etc/keepalived/virtual_ips); do - logger "adding explicit route for $ip" - ip ro replace local $ip dev lo src $LOCAL_IP - done -else - for ip in $(cat /etc/keepalived/virtual_ips); do - logger "removing explicit route for $ip" - ip ro del local $ip - done -fi diff --git a/elements/keepalived/element-deps b/elements/keepalived/element-deps deleted file mode 100644 index 29e4e2426..000000000 --- a/elements/keepalived/element-deps +++ /dev/null @@ -1,2 +0,0 @@ -os-svc-install -package-installs diff --git a/elements/keepalived/files/keepalived.crontab b/elements/keepalived/files/keepalived.crontab deleted file mode 100644 index 8bbb64cc5..000000000 --- a/elements/keepalived/files/keepalived.crontab +++ /dev/null @@ -1 +0,0 @@ -*/5 * * * * root [ -s /var/run/keepalived.pid ] && kill -HUP $(cat /var/run/keepalived.pid) diff --git a/elements/keepalived/install.d/76-keepalived b/elements/keepalived/install.d/76-keepalived deleted file mode 100755 index b291e3ae8..000000000 --- a/elements/keepalived/install.d/76-keepalived +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -set -eux - -[ -d /var/log/keepalived ] || install -d -o root -g root -m 0775 /var/log/keepalived -register-state-path --leave-symlink /var/log/keepalived - -cat > /etc/rsyslog.d/keepalived.conf<<'EOF' -#Send keepalived messages to a dedicated logfile -if $programname startswith 'Keepalived' then /var/log/keepalived/keepalived.log -& ~ -EOF diff --git a/elements/keepalived/install.d/78-keepalived-reload b/elements/keepalived/install.d/78-keepalived-reload deleted file mode 100755 index fb0fc7475..000000000 --- a/elements/keepalived/install.d/78-keepalived-reload +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -set -eux - -# bug#1367742 Stop a confused keepalived from erroneously bringing up a VIP -# This is an incredibly clunky approach. -install -m 0640 -o root -g root $(dirname $0)/../files/keepalived.crontab /etc/cron.d/keepalived diff --git a/elements/keepalived/install.d/package-installs-keepalived b/elements/keepalived/install.d/package-installs-keepalived deleted file mode 100644 index 01ba2e0f8..000000000 --- a/elements/keepalived/install.d/package-installs-keepalived +++ /dev/null @@ -1,2 +0,0 @@ -keepalived -psmisc diff --git a/elements/keepalived/os-apply-config/etc/default/keepalived b/elements/keepalived/os-apply-config/etc/default/keepalived deleted file mode 100644 index ce9ca0233..000000000 --- a/elements/keepalived/os-apply-config/etc/default/keepalived +++ /dev/null @@ -1,4 +0,0 @@ -# Options to pass to keepalived - -# DAEMON_ARGS are appended to the keepalived command-line -DAEMON_ARGS="{{#keepalived.log_detail}}-D{{/keepalived.log_detail}} {{#keepalived.dump_conf}}-d{{/keepalived.dump_conf}}" diff --git a/elements/keepalived/os-apply-config/etc/keepalived/keepalived.conf b/elements/keepalived/os-apply-config/etc/keepalived/keepalived.conf deleted file mode 100644 index fdbef7bed..000000000 --- a/elements/keepalived/os-apply-config/etc/keepalived/keepalived.conf +++ /dev/null @@ -1,63 +0,0 @@ -vrrp_script chk_haproxy { - script "killall -0 haproxy" - interval 2 - timeout 3 - rise 2 - fall 4 -} - -{{#virtual_interfaces}} -{{#instances}} -vrrp_instance {{vrrp_instance_name}} { - interface {{keepalive_interface}} - state MASTER - virtual_router_id {{virtual_router_id}} - priority {{priority}} - virtual_ipaddress { - {{#virtual_ips}} - {{ip}} dev {{interface}} - {{/virtual_ips}} - } - track_script { - chk_haproxy - } - notify /usr/local/bin/keepalived_vip_change.sh -} - -{{/instances}} - -{{#vrrp_sync_groups}} -vrrp_sync_group {{name}} - group { - {{#members}} - {{.}} - {{/members}} - } -{{/vrrp_sync_groups}} -{{/virtual_interfaces}} - -{{^virtual_interfaces}} -vrrp_instance VI_1 { - interface {{keepalived.keepalive_interface}} - {{#keepalived.state}} - state {{{.}}} - {{/keepalived.state}} - {{^keepalived.state}} - state BACKUP - {{/keepalived.state}} - {{^keepalived.preempt}} - nopreempt - {{/keepalived.preempt}} - virtual_router_id 51 - priority {{keepalived.priority}} # 101 on master, 100 on backup - virtual_ipaddress { - {{#virtual_ips}} - {{ip}} dev {{interface}} - {{/virtual_ips}} - } - track_script { - chk_haproxy - } - notify /usr/local/bin/keepalived_vip_change.sh -} -{{/virtual_interfaces}} diff --git a/elements/keepalived/os-apply-config/etc/keepalived/virtual_ips b/elements/keepalived/os-apply-config/etc/keepalived/virtual_ips deleted file mode 100644 index 40cc27c6e..000000000 --- a/elements/keepalived/os-apply-config/etc/keepalived/virtual_ips +++ /dev/null @@ -1,3 +0,0 @@ -{{#virtual_ips}} -{{ip}} -{{/virtual_ips}} diff --git a/elements/keepalived/os-apply-config/etc/logrotate.d/keepalived b/elements/keepalived/os-apply-config/etc/logrotate.d/keepalived deleted file mode 100644 index c7db4562f..000000000 --- a/elements/keepalived/os-apply-config/etc/logrotate.d/keepalived +++ /dev/null @@ -1,10 +0,0 @@ -/var/log/keepalived/keepalived.log { - daily - compress - delaycompress - missingok - copytruncate - maxsize 45M - rotate 6 - create 640 root adm -} diff --git a/elements/keepalived/os-refresh-config/configure.d/20-keepalived-selinux b/elements/keepalived/os-refresh-config/configure.d/20-keepalived-selinux deleted file mode 100755 index 412eaf1ae..000000000 --- a/elements/keepalived/os-refresh-config/configure.d/20-keepalived-selinux +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -if [[ -x /usr/sbin/semanage ]]; then - # Allow keepalived to load kernel modules - # https://bugs.launchpad.net/tripleo/+bug/1342872 - setsebool -P domain_kernel_load_modules 1 - - semanage fcontext -a -t var_log_t "/mnt/state/var/log/keepalived(/.*)?" - restorecon -Rv /mnt/state/var/log/keepalived -fi diff --git a/elements/keepalived/os-refresh-config/configure.d/22-keepalived b/elements/keepalived/os-refresh-config/configure.d/22-keepalived deleted file mode 100755 index 2252693ad..000000000 --- a/elements/keepalived/os-refresh-config/configure.d/22-keepalived +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -INTERFACES=$(os-apply-config --key virtual_interfaces.instances --type raw --key-default '') -if [ -z "$INTERFACES" ] ; then - echo "No virtual interfaces to use" - exit 1 -fi - -os-svc-enable -an keepalived - -if [ -e /var/run/keepalived.pid ] && pgrep -F /var/run/keepalived.pid keepalived &>/dev/null; then - service keepalived reload -else - service keepalived restart -fi diff --git a/elements/keepalived/svc-map b/elements/keepalived/svc-map deleted file mode 100644 index 9e16bc325..000000000 --- a/elements/keepalived/svc-map +++ /dev/null @@ -1,3 +0,0 @@ -keepalived: - default: keepalived - diff --git a/elements/keystone/README.md b/elements/keystone/README.md deleted file mode 100644 index ef06df91f..000000000 --- a/elements/keystone/README.md +++ /dev/null @@ -1,90 +0,0 @@ -Install and configure Keystone. - -Upon booting the image, the service should be running on port 5000. - -Configuration -------------- - -Default template for /etc/keystone/keystone.conf file contains minimal set of -configuration parameters, which are expected to be passed in with Heat Metadata. -For example, keystone.db key is required to provide MySQL connection string: - -``` -keystone: - db: "mysql://keyuser:keypass@localhost/keystone" -``` - -All customizations to _/etc/keystone/keystone.conf_ are expected to be done using -[passthrough configuration feature](https://blueprints.launchpad.net/tripleo/+spec/passthrough-config). - -Additional configuration file _/etc/keystone/domains/keystone.ldap.conf_ is also -maintained to provide -[domain-specific configuration](http://docs.openstack.org/trunk/config-reference/content/section_keystone-domain-configs.html) -for LDAP. This file is also populated using -[passthrough configuration feature](https://blueprints.launchpad.net/tripleo/+spec/passthrough-config) -with "keystone_ldap" key. Here is a sample content for ExtraConfig Heat Metadata -parameter: - -``` -{ - "keystone": { - "config": [ - { - "section": "identity", - "values": [ - { - "option": "domain_specific_drivers_enabled", - "value": "True" - }, - { - "option": "domain_config_dir", - "value": "/etc/keystone/domains" - } - ] - } - ] - }, - "keystone_ldap": { - "config": [ - { - "section": "identity", - "values": [ - { - "option": "driver", - "value": "keystone.identity.backends.ldap.Identity" - } - ] - }, - { - "section": "assignment", - "values": [ - { - "option": "driver", - "value": "keystone.assignment.backends.sql.Assignment" - } - ] - }, - { - "section": "ldap", - "values": [ - { - "option": "url", - "value": "ldap://ldap.example.com" - }, - { - "option": "suffix", - "value": "dc=example,dc=com" - }, - . . . - ] - } - ] - } -} -``` - -NOTE: Token cleanup will cause poor performance until the upstream -bug (https://bugs.launchpad.net/keystone/+bug/1188378) is fixed. This -problem is fixed in some distributions (Ubuntu, RHEL, CentOS) where -percona-toolkit's is supported and used to clean out the table on mysql. -http://www.percona.com/mysql-support/policies/percona-toolkit-supported-platforms-and-versions diff --git a/elements/keystone/cleanup-keystone-tokens.sh b/elements/keystone/cleanup-keystone-tokens.sh deleted file mode 100755 index e6ad47099..000000000 --- a/elements/keystone/cleanup-keystone-tokens.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -set -eu -set -o pipefail - -KEYSTONE_DB=$(os-apply-config --key keystone.db --type dsn) - -KEYSTONE_DB_TYPE=${KEYSTONE_DB%%://*} -# Use keystone-manage if not mysql or pt-archiver isn't available -# We can just call this directly if bug #1188378 is ever fixed -if [ "$KEYSTONE_DB_TYPE" != "mysql" ] || ! which pt-archiver 2> /dev/null ; then - exec keystone-manage token_flush -fi - -KEYSTONE_DB_P1=${KEYSTONE_DB##mysql://} -KEYSTONE_DB_USERPASS=${KEYSTONE_DB_P1%%@*} -KEYSTONE_DB_USER=${KEYSTONE_DB_USERPASS%%:*} -KEYSTONE_DB_PASS=${KEYSTONE_DB_USERPASS##*:} -KEYSTONE_DB_P2=${KEYSTONE_DB_P1##*@} -KEYSTONE_DB_P2=${KEYSTONE_DB_P2%%\?*} -KEYSTONE_DB_HOST=${KEYSTONE_DB_P2%%/*} -KEYSTONE_DB_NAME=${KEYSTONE_DB_P2##*/} - -pt-archiver --source h=$KEYSTONE_DB_HOST,u=$KEYSTONE_DB_USER,p=$KEYSTONE_DB_PASS,D=$KEYSTONE_DB_NAME,t=token \ - --charset utf8 \ - --where "expires < UTC_TIMESTAMP()" \ - --purge \ - --txn-size 500 \ - --run-time 59m \ - --statistics \ - --primary-key-only | logger -t cleanup-keystone-tokens diff --git a/elements/keystone/cleanup.d/50-remove-source-keystone b/elements/keystone/cleanup.d/50-remove-source-keystone deleted file mode 100755 index 77f84f11c..000000000 --- a/elements/keystone/cleanup.d/50-remove-source-keystone +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eu - -sudo rm -fr "${TMP_MOUNT_PATH}/opt/stack/keystone" diff --git a/elements/keystone/element-deps b/elements/keystone/element-deps deleted file mode 100644 index c20b9da59..000000000 --- a/elements/keystone/element-deps +++ /dev/null @@ -1,8 +0,0 @@ -iptables -os-apply-config -os-is-bootstrap-host -os-refresh-config -os-svc-install -selinux -source-repositories -sysctl diff --git a/elements/keystone/environment.d/10-keystone-venv-dir.bash b/elements/keystone/environment.d/10-keystone-venv-dir.bash deleted file mode 100644 index 0ecede78f..000000000 --- a/elements/keystone/environment.d/10-keystone-venv-dir.bash +++ /dev/null @@ -1,6 +0,0 @@ -if [ -z "${KEYSTONE_VENV_DIR:-}" ]; then - export KEYSTONE_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/keystone"} -fi -if [ -z "${KEYSTONE_EXTRA_INSTALL_OPTS:-}" ]; then - export KEYSTONE_EXTRA_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-""} -fi diff --git a/elements/keystone/install.d/keystone-package-install/05-keystone b/elements/keystone/install.d/keystone-package-install/05-keystone deleted file mode 100755 index 78b9c9932..000000000 --- a/elements/keystone/install.d/keystone-package-install/05-keystone +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -set -eux -set -o pipefail - -KEYSTONE_USER=keystone -if [ "opensuse" = "$DISTRO_NAME" ]; then - KEYSTONE_USER=openstack-keystone -fi - -# When keystone-manage is run as root during os-refresh-config it will create -# the initial keystone log file root owned, and then the keystone service will -# fail to start. Create the initial keystone owned log file here instead. -touch /var/log/keystone/keystone.log -chown $KEYSTONE_USER: /var/log/keystone/keystone.log diff --git a/elements/keystone/install.d/keystone-package-install/package-installs-keystone b/elements/keystone/install.d/keystone-package-install/package-installs-keystone deleted file mode 100644 index 2714a2b73..000000000 --- a/elements/keystone/install.d/keystone-package-install/package-installs-keystone +++ /dev/null @@ -1,2 +0,0 @@ -openstack-keystone -python-ldap diff --git a/elements/keystone/install.d/keystone-source-install/05-keystone b/elements/keystone/install.d/keystone-source-install/05-keystone deleted file mode 100755 index 135b2bafd..000000000 --- a/elements/keystone/install.d/keystone-source-install/05-keystone +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -os-svc-install $KEYSTONE_EXTRA_INSTALL_OPTS -i "$KEYSTONE_VENV_DIR" -u keystone -r /opt/stack/keystone - -# Workaround for https://bugs.launchpad.net/tripleo/+bug/1288425 -$KEYSTONE_VENV_DIR/bin/pip install -U kombu -$KEYSTONE_VENV_DIR/bin/pip install -U qpid-python diff --git a/elements/keystone/install.d/keystone-source-install/70-keystone b/elements/keystone/install.d/keystone-source-install/70-keystone deleted file mode 100755 index e1106ad37..000000000 --- a/elements/keystone/install.d/keystone-source-install/70-keystone +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -RELEASE=`lsb_release -r` || true - -os-svc-install $KEYSTONE_EXTRA_INSTALL_OPTS -i "$KEYSTONE_VENV_DIR" -u keystone -r /opt/stack/keystone -os-svc-daemon -a -i "$KEYSTONE_VENV_DIR" keystone keystone keystone-all "--config-dir /etc/keystone" -install -m 0755 -o keystone -g keystone -d /etc/keystone/ssl - -ln -s $KEYSTONE_VENV_DIR/bin/keystone-manage /usr/local/bin/keystone-manage - -cp /opt/stack/keystone/etc/policy.json /etc/keystone/policy.json -cp /opt/stack/keystone/etc/keystone-paste.ini /etc/keystone/keystone-paste.ini - -# Reserve the Keystone port out of the ephemeral port range. -sysctl-append-value net.ipv4.ip_local_reserved_ports 35357 - -# Install scripts to clean up tokens -install -m 0755 -o root -g root $(dirname $0)/../cleanup-keystone-tokens.sh /usr/local/bin -install -m 0640 -o root -g root $(dirname $0)/../keystone.crontab /etc/cron.d/keystone - -# LDAP backend support -install-packages -m keystone ldap_devel_package sasl_devel_package ssl_devel_package -$KEYSTONE_VENV_DIR/bin/pip install -U python-ldap ldappool - -# percona-tookit is NOT supported on Fedora (retrieved 25-06-2013) -# http://www.percona.com/mysql-support/policies/percona-toolkit-supported-platforms-and-versions -if [[ "ubuntu rhel rhel7 centos7" =~ "$DISTRO_NAME" ]]; then - if [[ "$DISTRO_NAME" =~ "rhel" && "$RELEASE" =~ "7." ]]; then - exit 0 - fi - install-packages percona-toolkit -fi - -add-selinux-path-substitution /usr/bin $KEYSTONE_VENV_DIR/bin diff --git a/elements/keystone/keystone.crontab b/elements/keystone/keystone.crontab deleted file mode 100644 index 49688f607..000000000 --- a/elements/keystone/keystone.crontab +++ /dev/null @@ -1,2 +0,0 @@ -PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -0 */2 * * * root /usr/local/bin/cleanup-keystone-tokens.sh diff --git a/elements/keystone/os-apply-config/etc/keystone/domains/keystone.ldap.conf b/elements/keystone/os-apply-config/etc/keystone/domains/keystone.ldap.conf deleted file mode 100644 index 944fbd24a..000000000 --- a/elements/keystone/os-apply-config/etc/keystone/domains/keystone.ldap.conf +++ /dev/null @@ -1,14 +0,0 @@ -{{#keystone_ldap}} -{{#config}} -[{{{section}}}] -{{#values}} -{{#comment}} -# {{{.}}} -{{/comment}} -{{#option}} -{{{option}}} = {{{value}}} -{{/option}} -{{/values}} - -{{/config}} -{{/keystone_ldap}} diff --git a/elements/keystone/os-apply-config/etc/keystone/keystone.conf b/elements/keystone/os-apply-config/etc/keystone/keystone.conf deleted file mode 100644 index 2aa11a0bd..000000000 --- a/elements/keystone/os-apply-config/etc/keystone/keystone.conf +++ /dev/null @@ -1,76 +0,0 @@ -[DEFAULT] -admin_token = {{admin-token}} - -{{#keystone.verbose}} -# Print more verbose output -verbose={{keystone.verbose}} -{{/keystone.verbose}} -{{#keystone.debug}} -# Print debugging output -# (includes plaintext request logging, potentially including passwords) -debug={{keystone.debug}} -{{/keystone.debug}} - -{{#haproxy}} -{{#stunnel.connect_host}} -public_bind_host = {{stunnel.connect_host}} -admin_bind_host = {{stunnel.connect_host}} -{{/stunnel.connect_host}} -{{^stunnel.connect_host}} -public_bind_host = {{local-ipv4}} -admin_bind_host = {{local-ipv4}} -{{/stunnel.connect_host}} -{{/haproxy}} - -[sql] -connection = {{keystone.db}} - -[identity] -driver = keystone.identity.backends.sql.Identity - -[catalog] -driver = keystone.catalog.backends.sql.Catalog - -[token] -driver = keystone.token.persistence.backends.sql.Token - -# Amount of time a token should remain valid (in seconds) -# We set this because of bug https://bugs.launchpad.net/tripleo/+bug/1306294 -expiration = 14400 - -[policy] -# driver = keystone.policy.backends.sql.Policy - -[ec2] -driver = keystone.contrib.ec2.backends.sql.Ec2 - -[ssl] -#enable = True -#certfile = /etc/keystone/ssl/certs/keystone.pem -#keyfile = /etc/keystone/ssl/private/keystonekey.pem -#ca_certs = /etc/keystone/ssl/certs/ca.pem -#cert_required = True - -[signing] -certfile = /mnt/state/etc/keystone/ssl/certs/signing_cert.pem -keyfile = /mnt/state/etc/keystone/ssl/private/signing_key.pem -ca_certs = /mnt/state/etc/keystone/ssl/certs/ca.pem -ca_key = /mnt/state/etc/keystone/ssl/private/cakey.pem -#key_size = 1024 -#valid_days = 3650 -#ca_password = None - -{{#keystone}} -{{#config}} -[{{{section}}}] -{{#values}} -{{#comment}} -# {{{.}}} -{{/comment}} -{{#option}} -{{{option}}} = {{{value}}} -{{/option}} -{{/values}} - -{{/config}} -{{/keystone}} diff --git a/elements/keystone/os-apply-config/mnt/state/etc/keystone/ssl/certs/ca.pem b/elements/keystone/os-apply-config/mnt/state/etc/keystone/ssl/certs/ca.pem deleted file mode 100644 index 26b04949b..000000000 --- a/elements/keystone/os-apply-config/mnt/state/etc/keystone/ssl/certs/ca.pem +++ /dev/null @@ -1 +0,0 @@ -{{keystone.ca_certificate}} diff --git a/elements/keystone/os-apply-config/mnt/state/etc/keystone/ssl/certs/signing_cert.pem b/elements/keystone/os-apply-config/mnt/state/etc/keystone/ssl/certs/signing_cert.pem deleted file mode 100644 index 3dea42f49..000000000 --- a/elements/keystone/os-apply-config/mnt/state/etc/keystone/ssl/certs/signing_cert.pem +++ /dev/null @@ -1 +0,0 @@ -{{#keystone.ssl.certificate}}{{.}}{{/keystone.ssl.certificate}}{{^keystone.ssl.certificate}}{{keystone.signing_certificate}}{{/keystone.ssl.certificate}} diff --git a/elements/keystone/os-apply-config/mnt/state/etc/keystone/ssl/private/signing_key.pem b/elements/keystone/os-apply-config/mnt/state/etc/keystone/ssl/private/signing_key.pem deleted file mode 100644 index 44c47a39c..000000000 --- a/elements/keystone/os-apply-config/mnt/state/etc/keystone/ssl/private/signing_key.pem +++ /dev/null @@ -1 +0,0 @@ -{{#keystone.ssl.certificate_key}}{{.}}{{/keystone.ssl.certificate_key}}{{^keystone.ssl.certificate_key}}{{keystone.signing_key}}{{/keystone.ssl.certificate_key}} diff --git a/elements/keystone/os-refresh-config/configure.d/10-keystone-state b/elements/keystone/os-refresh-config/configure.d/10-keystone-state deleted file mode 100755 index d5cf3f702..000000000 --- a/elements/keystone/os-refresh-config/configure.d/10-keystone-state +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -[ -d /mnt/state/etc/keystone/ssl/certs ] || install -m 0750 -o keystone -g keystone -d /mnt/state/etc/keystone/ssl/certs -[ -d /mnt/state/etc/keystone/ssl/private ] || install -m 0750 -o keystone -g keystone -d /mnt/state/etc/keystone/ssl/private - -# precreate ssl key file with correct permissions -# TODO: this can be replaced with mode metadata header when supported in -# os-apply-config (spec's Change-Id: I8fe7126d7261c1f106d7413bd31aa379e9ae5c3e) -touch /mnt/state/etc/keystone/ssl/private/signing_key.pem -chown keystone.keystone /mnt/state/etc/keystone/ssl/private/signing_key.pem -chmod 0640 /mnt/state/etc/keystone/ssl/private/signing_key.pem diff --git a/elements/keystone/os-refresh-config/configure.d/20-keystone-selinux b/elements/keystone/os-refresh-config/configure.d/20-keystone-selinux deleted file mode 100755 index dce0ae8fa..000000000 --- a/elements/keystone/os-refresh-config/configure.d/20-keystone-selinux +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -# Allow openssl to read keys - -[ -x /usr/sbin/semanage ] || exit 0 - -semanage fcontext -a -t cert_t "/mnt/state/etc/keystone/ssl(/.*)?" -restorecon -Rv /mnt/state/etc/keystone/ssl diff --git a/elements/keystone/os-refresh-config/configure.d/90-keystone-db-sync b/elements/keystone/os-refresh-config/configure.d/90-keystone-db-sync deleted file mode 100755 index 3fdb8a5d5..000000000 --- a/elements/keystone/os-refresh-config/configure.d/90-keystone-db-sync +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -if os-is-bootstrap-host ; then - su -s /bin/bash -c 'keystone-manage db_sync' keystone -fi diff --git a/elements/keystone/os-refresh-config/post-configure.d/70-keystone b/elements/keystone/os-refresh-config/post-configure.d/70-keystone deleted file mode 100755 index 80b3ed716..000000000 --- a/elements/keystone/os-refresh-config/post-configure.d/70-keystone +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -os-svc-enable -an keystone - -os-svc-restart -an keystone diff --git a/elements/keystone/os-refresh-config/pre-configure.d/97-keystone-fedora-iptables b/elements/keystone/os-refresh-config/pre-configure.d/97-keystone-fedora-iptables deleted file mode 100755 index 06859b71a..000000000 --- a/elements/keystone/os-refresh-config/pre-configure.d/97-keystone-fedora-iptables +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -# keystone service, keystone admin -add-rule INPUT -p tcp -m multiport --dports 5000,35357 -j ACCEPT diff --git a/elements/keystone/pkg-map b/elements/keystone/pkg-map deleted file mode 100644 index 042900de7..000000000 --- a/elements/keystone/pkg-map +++ /dev/null @@ -1,24 +0,0 @@ -{ - "family": { - "redhat": { - "ldap_devel_package": "openldap-devel", - "sasl_devel_package": "cyrus-sasl-devel", - "ssl_devel_package": "openssl-devel" - }, - "debian": { - "ldap_devel_package": "libldap2-dev", - "sasl_devel_package": "libsasl2-dev", - "ssl_devel_package": "libssl-dev", - "openstack-keystone": "keystone" - }, - "suse": { - "ldap_devel_package": "openldap2-devel", - "sasl_devel_package": "cyrus-sasl-devel", - "ssl_devel_package": "libopenssl-devel" - } - }, - "default": { - "openstack-keystone": "openstack-keystone", - "python-ldap": "python-ldap" - } -} diff --git a/elements/keystone/source-repository-keystone b/elements/keystone/source-repository-keystone deleted file mode 100644 index 1276b4cd6..000000000 --- a/elements/keystone/source-repository-keystone +++ /dev/null @@ -1 +0,0 @@ -keystone git /opt/stack/keystone https://git.openstack.org/openstack/keystone.git diff --git a/elements/keystone/svc-map b/elements/keystone/svc-map deleted file mode 100644 index d3975f7ef..000000000 --- a/elements/keystone/svc-map +++ /dev/null @@ -1,4 +0,0 @@ -keystone: - default: openstack-keystone - debian: keystone - diff --git a/elements/mariadb-common/README.md b/elements/mariadb-common/README.md deleted file mode 100644 index 11dad13ea..000000000 --- a/elements/mariadb-common/README.md +++ /dev/null @@ -1,2 +0,0 @@ -This element contains code common for mariadb installations, make sure -you include one of mariadb or mariadb-rpm when including this element. diff --git a/elements/mariadb-common/element-deps b/elements/mariadb-common/element-deps deleted file mode 100644 index 78247487c..000000000 --- a/elements/mariadb-common/element-deps +++ /dev/null @@ -1,2 +0,0 @@ -mysql-common -use-ephemeral diff --git a/elements/mariadb-common/install.d/11-mariadb b/elements/mariadb-common/install.d/11-mariadb deleted file mode 100755 index 55dbcdbf7..000000000 --- a/elements/mariadb-common/install.d/11-mariadb +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -# Install controller base requiered packages - -set -eux - -# Templates write the configs into /mnt/state. However, MySQL makes it very -# difficult not to use this as the directory for configs. -rm -rf /etc/mysql -ln -s /mnt/state/etc/mysql /etc/mysql -if [ -e /etc/apparmor.d/usr.sbin.mysqld ] ; then - sed -i -e 's,/var/lib/mysql/,/mnt/state/var/lib/mysql/,g' /etc/apparmor.d/usr.sbin.mysqld - sed -i -e 's,/var/log/mysql/,/mnt/state/var/log/mysql/,g' /etc/apparmor.d/usr.sbin.mysqld - sed -i -e 's,/etc/mysql/,/mnt/state/etc/mysql/,g' /etc/apparmor.d/usr.sbin.mysqld -fi -if [ -e /etc/init/mysql.conf ]; then - sed -i -e 's,/var/lib/mysql/,/mnt/state/var/lib/mysql/,g' /etc/init/mysql.conf -fi - -# Fedora/RHEL install /etc/my.cnf but we do not want any unmanaged configs -# mariadb elements install using packages, so we don't want to just delete this -# file, so symlink it to the config we actually use. -ln -f -s /etc/mysql/my.cnf /etc/my.cnf - -# On openSUSE /var/lib/mysql is not part of the mariadb packages. -[ -d /var/lib/mysql ] || install -d -o mysql -g root -m 0700 /var/lib/mysql -register-state-path /var/lib/mysql -# We need to setup the directory with appropriate permissions and then -# the first time we boot a particular state partition we rsync this in. -[ -d /var/log/mysql ] || install -d -o root -g mysql -m 0775 /var/log/mysql -register-state-path /var/log/mysql - -# galera lib path is set in mysql config file, creating symlink -# /usr/local/mysql/lib/libgalera_smm.so allows us to use same path -# for mysql and mariadb and for i386/amd64 -[ -e /usr/local/mysql/lib ] || install -m 0755 -o root -g root -d /usr/local/mysql/lib -if [ -e /usr/lib64/galera/libgalera_smm.so ];then - ln -sf /usr/lib64/galera/libgalera_smm.so /usr/local/mysql/lib/libgalera_smm.so -elif [ -e /usr/lib/galera/libgalera_smm.so ];then - ln -sf /usr/lib/galera/libgalera_smm.so /usr/local/mysql/lib/libgalera_smm.so -fi diff --git a/elements/mariadb-common/os-refresh-config/pre-configure.d/50-mariadb-socket b/elements/mariadb-common/os-refresh-config/pre-configure.d/50-mariadb-socket deleted file mode 100755 index bba59e183..000000000 --- a/elements/mariadb-common/os-refresh-config/pre-configure.d/50-mariadb-socket +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -set -eu - -# mariadb clients (from mariadb.org) expect the socket at -# /var/lib/mysql/mysql.sock -# -# mysql server is started from 51-init-openstack (reset-db script) - we need to -# create symlink to make sure reset-db will not fail -[ -d /var/lib/mysql ] || install -d -m 0755 -o mysql -g mysql /var/lib/mysql -[ -d /var/run/mysqld ] || ln -sf /var/run/mariadb/ /var/run/mysqld -ln -sf /var/run/mysqld/mysqld.sock /var/lib/mysql/mysql.sock diff --git a/elements/mariadb-dev-rpm/README.md b/elements/mariadb-dev-rpm/README.md deleted file mode 100644 index e8862d0a5..000000000 --- a/elements/mariadb-dev-rpm/README.md +++ /dev/null @@ -1,4 +0,0 @@ -Installs mariadb devel package from default repositories - -This is a separate element because different devel packages are installed for -mysql and for mariadb. diff --git a/elements/mariadb-dev-rpm/element-provides b/elements/mariadb-dev-rpm/element-provides deleted file mode 100644 index 063f2a84b..000000000 --- a/elements/mariadb-dev-rpm/element-provides +++ /dev/null @@ -1 +0,0 @@ -mysql-dev diff --git a/elements/mariadb-dev-rpm/install.d/package-installs-mariadb-dev-rpm b/elements/mariadb-dev-rpm/install.d/package-installs-mariadb-dev-rpm deleted file mode 100644 index f0bf73fc1..000000000 --- a/elements/mariadb-dev-rpm/install.d/package-installs-mariadb-dev-rpm +++ /dev/null @@ -1 +0,0 @@ -libmariadb-dev diff --git a/elements/mariadb-dev/README.md b/elements/mariadb-dev/README.md deleted file mode 100644 index 5b0b0f763..000000000 --- a/elements/mariadb-dev/README.md +++ /dev/null @@ -1,4 +0,0 @@ -Installs mariadb devel package - -This is a separate element because different devel packages are installed for -mysql and for mariadb. diff --git a/elements/mariadb-dev/element-provides b/elements/mariadb-dev/element-provides deleted file mode 100644 index 063f2a84b..000000000 --- a/elements/mariadb-dev/element-provides +++ /dev/null @@ -1 +0,0 @@ -mysql-dev diff --git a/elements/mariadb-dev/environment.d/20-mariadb b/elements/mariadb-dev/environment.d/20-mariadb deleted file mode 100755 index a75d0f16b..000000000 --- a/elements/mariadb-dev/environment.d/20-mariadb +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -set -ue - -# The mariadb download url arch values are not the same as ours -if [ $ARCH = "i386" ]; then - MARIADB_ARCH=x86 -else - MARIADB_ARCH=$ARCH -fi -export MARIADB_ARCH diff --git a/elements/mariadb-dev/install.d/03-mariadb-dev b/elements/mariadb-dev/install.d/03-mariadb-dev deleted file mode 100755 index 047019d71..000000000 --- a/elements/mariadb-dev/install.d/03-mariadb-dev +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -set -eux - -# TODO: fedora mysql_config has to be tweaked to exclude probes_mysql lib -# https://mariadb.atlassian.net/browse/MDEV-5793 -FILE=$(which mysql_config) -if $FILE --libs_r | grep probes_mysql;then - sed -i.orig "s/-lprobes_mysql//" $FILE -fi diff --git a/elements/mariadb-dev/install.d/package-installs-mariadb-dev b/elements/mariadb-dev/install.d/package-installs-mariadb-dev deleted file mode 100644 index f0bf73fc1..000000000 --- a/elements/mariadb-dev/install.d/package-installs-mariadb-dev +++ /dev/null @@ -1 +0,0 @@ -libmariadb-dev diff --git a/elements/mariadb-dev/pre-install.d/05-mysql-mariadb-repo b/elements/mariadb-dev/pre-install.d/05-mysql-mariadb-repo deleted file mode 100755 index e10e8e7f2..000000000 --- a/elements/mariadb-dev/pre-install.d/05-mysql-mariadb-repo +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -set -e -set -o xtrace - -# repo urls -# 5.5 version is used instead of 10.0 (which is already out) because of -# dependency issues - python-mysql depends on mariadb-libs which conflicts -# with mysql-galera-server pkg -# http://yum.mariadb.org/5.5/fedora20-amd64 -# http://yum.mariadb.org/5.5/fedora20-x86 -# http://yum.mariadb.org/5.5/rhel6-amd64 -# http://yum.mariadb.org/5.5/rhel6-x86 -# http://mirror.jmu.edu/pub/mariadb/repo/5.5/ubuntu saucy main -# http://mirror.jmu.edu/pub/mariadb/repo/5.5/debian wheezy main - -function add_yum_repo() { - ver=`lsb_release -sr` - - cat > /etc/yum.repos.d/mariadb.repo <> /etc/services -mysqlchk 9200/tcp # MySQL check -EOF diff --git a/elements/mysql-common/install.d/clustercheck b/elements/mysql-common/install.d/clustercheck deleted file mode 100644 index bad29f781..000000000 --- a/elements/mysql-common/install.d/clustercheck +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/bash -# Copyright (c) 2012-2014, Olaf van Zandwijk -# All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. - -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. - -# 3. Neither the name of the copyright holder nor the names of its contributors -# may be used to endorse or promote products derived from this software without -# specific prior written permission. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# Script to make a proxy (ie HAProxy) capable of monitoring Percona XtraDB Cluster nodes properly -# -# Author: Olaf van Zandwijk -# Author: Raghavendra Prabhu -# -# Documentation and download: https://github.com/olafz/percona-clustercheck -# -# Based on the original script from Unai Rodriguez -# - -if [[ $1 == '-h' || $1 == '--help' ]];then - echo "Usage: $0 " - exit -fi - -MYSQL_USERNAME="${1-clustercheckuser}" -MYSQL_PASSWORD="${2-clustercheckpassword!}" -AVAILABLE_WHEN_DONOR=${3:-0} -ERR_FILE="${4:-/dev/null}" -AVAILABLE_WHEN_READONLY=${5:-1} -DEFAULTS_EXTRA_FILE=${6:-/etc/my.cnf} - -#Timeout exists for instances where mysqld may be hung -TIMEOUT=10 - -EXTRA_ARGS="" -if [[ -n "$MYSQL_USERNAME" ]]; then - EXTRA_ARGS="$EXTRA_ARGS --user=${MYSQL_USERNAME}" -fi -if [[ -n "$MYSQL_PASSWORD" ]]; then - EXTRA_ARGS="$EXTRA_ARGS --password=${MYSQL_PASSWORD}" -fi -if [[ -r $DEFAULTS_EXTRA_FILE ]];then - MYSQL_CMDLINE="mysql --defaults-extra-file=$DEFAULTS_EXTRA_FILE -nNE --connect-timeout=$TIMEOUT \ - ${EXTRA_ARGS}" -else - MYSQL_CMDLINE="mysql -nNE --connect-timeout=$TIMEOUT ${EXTRA_ARGS}" -fi -# -# Perform the query to check the wsrep_local_state -# -WSREP_STATUS=$($MYSQL_CMDLINE -e "SHOW STATUS LIKE 'wsrep_local_state';" \ - 2>${ERR_FILE} | tail -1 2>>${ERR_FILE}) - -if [[ "${WSREP_STATUS}" == "4" ]] || [[ "${WSREP_STATUS}" == "2" && ${AVAILABLE_WHEN_DONOR} == 1 ]] -then - # Check only when set to 0 to avoid latency in response. - if [[ $AVAILABLE_WHEN_READONLY -eq 0 ]];then - READ_ONLY=$($MYSQL_CMDLINE -e "SHOW GLOBAL VARIABLES LIKE 'read_only';" \ - 2>${ERR_FILE} | tail -1 2>>${ERR_FILE}) - - if [[ "${READ_ONLY}" == "ON" ]];then - # Percona XtraDB Cluster node local state is 'Synced', but it is in - # read-only mode. The variable AVAILABLE_WHEN_READONLY is set to 0. - # => return HTTP 503 - # Shell return-code is 1 - echo -en "HTTP/1.1 503 Service Unavailable\r\n" - echo -en "Content-Type: text/plain\r\n" - echo -en "Connection: close\r\n" - echo -en "Content-Length: 43\r\n" - echo -en "\r\n" - echo -en "Percona XtraDB Cluster Node is read-only.\r\n" - sleep 0.1 - exit 1 - fi - fi - # Percona XtraDB Cluster node local state is 'Synced' => return HTTP 200 - # Shell return-code is 0 - echo -en "HTTP/1.1 200 OK\r\n" - echo -en "Content-Type: text/plain\r\n" - echo -en "Connection: close\r\n" - echo -en "Content-Length: 40\r\n" - echo -en "\r\n" - echo -en "Percona XtraDB Cluster Node is synced.\r\n" - sleep 0.1 - exit 0 -else - # Percona XtraDB Cluster node local state is not 'Synced' => return HTTP 503 - # Shell return-code is 1 - echo -en "HTTP/1.1 503 Service Unavailable\r\n" - echo -en "Content-Type: text/plain\r\n" - echo -en "Connection: close\r\n" - echo -en "Content-Length: 44\r\n" - echo -en "\r\n" - echo -en "Percona XtraDB Cluster Node is not synced.\r\n" - sleep 0.1 - exit 1 -fi diff --git a/elements/mysql-common/install.d/clustercheck-tripleo b/elements/mysql-common/install.d/clustercheck-tripleo deleted file mode 100644 index 195926d35..000000000 --- a/elements/mysql-common/install.d/clustercheck-tripleo +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# xinetd is incapable of passing the two empty arguments, causing the check -# to fail regardless of if the server is up and sync'd or not and requiring -# us to wrap the clustercheck script with this. - -/usr/local/bin/clustercheck "" "" 0 /dev/null 1 /mnt/state/etc/mysql/mysqlchk.my.cnf diff --git a/elements/mysql-common/install.d/mysqlchk b/elements/mysql-common/install.d/mysqlchk deleted file mode 100644 index 584358700..000000000 --- a/elements/mysql-common/install.d/mysqlchk +++ /dev/null @@ -1,16 +0,0 @@ -# default: on -# description: mysqlchk -service mysqlchk -{ - disable = no - flags = REUSE - socket_type = stream - port = 9200 - wait = no - user = nobody - server = /usr/local/bin/clustercheck-tripleo - env = PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin - log_on_failure += USERID - only_from = 0.0.0.0/0 - per_source = UNLIMITED -} diff --git a/elements/mysql-common/install.d/package-installs-mysql-common b/elements/mysql-common/install.d/package-installs-mysql-common deleted file mode 100644 index 2cf31e590..000000000 --- a/elements/mysql-common/install.d/package-installs-mysql-common +++ /dev/null @@ -1,2 +0,0 @@ -python-mysqldb -xinetd diff --git a/elements/mysql-common/os-apply-config/etc/ssl/mysql/from-heat.crt b/elements/mysql-common/os-apply-config/etc/ssl/mysql/from-heat.crt deleted file mode 100644 index 6b120b16a..000000000 --- a/elements/mysql-common/os-apply-config/etc/ssl/mysql/from-heat.crt +++ /dev/null @@ -1 +0,0 @@ -{{mysql.cluster_certificate}} diff --git a/elements/mysql-common/os-apply-config/etc/ssl/mysql/from-heat.key b/elements/mysql-common/os-apply-config/etc/ssl/mysql/from-heat.key deleted file mode 100644 index ac75a782c..000000000 --- a/elements/mysql-common/os-apply-config/etc/ssl/mysql/from-heat.key +++ /dev/null @@ -1 +0,0 @@ -{{mysql.cluster_key}} diff --git a/elements/mysql-common/os-apply-config/mnt/state/etc/mysql/conf.d/README b/elements/mysql-common/os-apply-config/mnt/state/etc/mysql/conf.d/README deleted file mode 100644 index f1fdc1ff7..000000000 --- a/elements/mysql-common/os-apply-config/mnt/state/etc/mysql/conf.d/README +++ /dev/null @@ -1,9 +0,0 @@ -Other elements can drop templates in a matching path to this to influence -the mysql configuration if need-be. - -This file also serves as a place holder. my.cnf has an include line -which references it. The code in MySQL that implements the include bits -can't deal with an empty directory. We still want the conf.d though, -so that other elements can drop mysql configs in (such as a "mysql -go faster in dev" element which would disable InnoDB's sync-on-commit -durability protections). diff --git a/elements/mysql-common/os-apply-config/mnt/state/etc/mysql/conf.d/cluster.cnf b/elements/mysql-common/os-apply-config/mnt/state/etc/mysql/conf.d/cluster.cnf deleted file mode 100644 index 75b6550a5..000000000 --- a/elements/mysql-common/os-apply-config/mnt/state/etc/mysql/conf.d/cluster.cnf +++ /dev/null @@ -1,21 +0,0 @@ -[mysqld] -# Path to Galera library -wsrep_provider=/usr/local/mysql/lib/libgalera_smm.so - -# Addresses of nodes in cluster -wsrep_cluster_address=gcomm://{{#mysql.nodes}}{{ip}},{{/mysql.nodes}} - -# Node's network address, this address should be also included in -# wsrep_cluster_address addresses list -wsrep_node_address={{local-ipv4}} - -# SST method -wsrep_sst_method=rsync - -# Cluster name -wsrep_cluster_name=tripleo-{{mysql.cluster_name}} - -{{#mysql.cluster_key}} -# Security options -wsrep_provider_options="gmcast.listen_addr=tcp://{{local-ipv4}}:4567; socket.ssl_cert=/etc/ssl/mysql/from-heat.crt; socket.ssl_key=/etc/ssl/mysql/from-heat.key" -{{/mysql.cluster_key}} diff --git a/elements/mysql-common/os-apply-config/mnt/state/etc/mysql/dbusers.json b/elements/mysql-common/os-apply-config/mnt/state/etc/mysql/dbusers.json deleted file mode 100644 index 85f45fdeb..000000000 --- a/elements/mysql-common/os-apply-config/mnt/state/etc/mysql/dbusers.json +++ /dev/null @@ -1 +0,0 @@ -{{^mysql.create-users}}[]{{/mysql.create-users}}{{mysql.create-users}} diff --git a/elements/mysql-common/os-apply-config/mnt/state/etc/mysql/debian.cnf b/elements/mysql-common/os-apply-config/mnt/state/etc/mysql/debian.cnf deleted file mode 100644 index 4ceccee1a..000000000 --- a/elements/mysql-common/os-apply-config/mnt/state/etc/mysql/debian.cnf +++ /dev/null @@ -1,3 +0,0 @@ -# This file is used by the start-up scripts for mysql on Debian and Ubuntu -[client] -user = root diff --git a/elements/mysql-common/os-apply-config/mnt/state/etc/mysql/my.cnf b/elements/mysql-common/os-apply-config/mnt/state/etc/mysql/my.cnf deleted file mode 100644 index a6869aca1..000000000 --- a/elements/mysql-common/os-apply-config/mnt/state/etc/mysql/my.cnf +++ /dev/null @@ -1,88 +0,0 @@ -[client] -port = 3306 -socket = /var/run/mysqld/mysqld.sock - -[mysqld] - -# GENERAL # -user = mysql -default_storage_engine = InnoDB -socket = /var/run/mysqld/mysqld.sock -pid_file = /var/run/mysqld/mysqld.pid -{{#mysql.bind_address}} -bind-address = {{.}} -{{/mysql.bind_address}} -{{^mysql.bind_address}} -{{#mysql.local_bind}} -bind-address = {{local-ipv4}} -{{/mysql.local_bind}} -{{^mysql.local_bind}} -bind-address = 0.0.0.0 -{{/mysql.local_bind}} -{{/mysql.bind_address}} - -# UTF8 # -character-set-client-handshake = FALSE -character-set-server = utf8 -collation-server = utf8_unicode_ci - -# MyISAM # -key_buffer_size = 32M -myisam_recover = FORCE,BACKUP - -# SAFETY # -max_allowed_packet = 16M -max_connect_errors = 1000000 -skip_name_resolve -sysdate_is_now = 1 -innodb = FORCE -innodb_strict_mode = 1 - -# DATA STORAGE # -datadir = /mnt/state/var/lib/mysql/ - -# CACHES AND LIMITS # -tmp_table_size = 32M -max_heap_table_size = 32M -query_cache_type = 0 -query_cache_size = 0 -max_connections = 500 -thread_cache_size = 50 -open_files_limit = 65535 -table_definition_cache = 4096 -table_open_cache = 4096 - -# INNODB # -innodb_flush_method = O_DIRECT -innodb_log_files_in_group = 2 -innodb_log_file_size = 64M -innodb_flush_log_at_trx_commit = 2 -innodb_file_per_table = 1 -{{#mysql.innodb_buffer_pool_size}} -innodb_buffer_pool_size = {{mysql.innodb_buffer_pool_size}}M -{{/mysql.innodb_buffer_pool_size}} -{{^mysql.innodb_buffer_pool_size}} -innodb_buffer_pool_size = 100M -{{/mysql.innodb_buffer_pool_size}} -# TODO -# innodb_read_io_threads -# innodb_write_io_threads - - -# LOGGING # -log_error = /mnt/state/var/log/mysql/error.log -log_queries_not_using_indexes = 0 -slow_query_log = 1 -slow_query_log_file = /mnt/state/var/log/mysql/mysql-slow.log - -# server_id set in /etc/mysql/conf.d/server_id.cnf -# server_id = 1 -log_bin = /mnt/state/var/lib/mysql/mysql-bin -expire_logs_days = 7 -max_binlog_size = 100M -binlog_format = ROW -!includedir /etc/mysql/conf.d/ - -# PASSTHRU options included last -# will override all previous options -!include /etc/mysql/passthru.cnf diff --git a/elements/mysql-common/os-apply-config/mnt/state/etc/mysql/mysqlchk.my.cnf b/elements/mysql-common/os-apply-config/mnt/state/etc/mysql/mysqlchk.my.cnf deleted file mode 100644 index 3a44d7a24..000000000 --- a/elements/mysql-common/os-apply-config/mnt/state/etc/mysql/mysqlchk.my.cnf +++ /dev/null @@ -1,6 +0,0 @@ -# This file is used by the mysqlchk xinetd service / clustercheck script -[client] -user = clustercheck -{{#mysql.clustercheck-password}} -password = {{.}} -{{/mysql.clustercheck-password}} diff --git a/elements/mysql-common/os-apply-config/mnt/state/etc/mysql/passthru.cnf b/elements/mysql-common/os-apply-config/mnt/state/etc/mysql/passthru.cnf deleted file mode 100644 index 78fdc2ea5..000000000 --- a/elements/mysql-common/os-apply-config/mnt/state/etc/mysql/passthru.cnf +++ /dev/null @@ -1,19 +0,0 @@ -# Passthrough configuration -{{#mysql}} -{{#config}} -[{{{section}}}] -{{#values}} -{{#comment}} -# {{{.}}} -{{/comment}} -{{#option}} -{{#value}} -{{{option}}} = {{{.}}} -{{/value}} -{{^value}} -{{{option}}} -{{/value}} -{{/option}} -{{/values}} -{{/config}} -{{/mysql}} diff --git a/elements/mysql-common/os-apply-config/mnt/state/etc/mysql/static-dbusers.json b/elements/mysql-common/os-apply-config/mnt/state/etc/mysql/static-dbusers.json deleted file mode 100644 index 3051c300a..000000000 --- a/elements/mysql-common/os-apply-config/mnt/state/etc/mysql/static-dbusers.json +++ /dev/null @@ -1,9 +0,0 @@ -[{"username": "root"{{#mysql.root-password}}, - "password": "{{mysql.root-password}}" -{{/mysql.root-password}} -}, -{"username": "clustercheck", - "privilege": "USAGE"{{#mysql.clustercheck-password}}, - "password": "{{mysql.clustercheck-password}}" -{{/mysql.clustercheck-password}} -}] diff --git a/elements/mysql-common/os-apply-config/mnt/state/root/metadata.my.cnf b/elements/mysql-common/os-apply-config/mnt/state/root/metadata.my.cnf deleted file mode 100644 index 7a6858f95..000000000 --- a/elements/mysql-common/os-apply-config/mnt/state/root/metadata.my.cnf +++ /dev/null @@ -1,5 +0,0 @@ -[client] -user = root -{{#mysql.root-password}} -password = {{.}} -{{/mysql.root-password}} diff --git a/elements/mysql-common/os-refresh-config/configure.d/51-mysql-server-id b/elements/mysql-common/os-refresh-config/configure.d/51-mysql-server-id deleted file mode 100755 index 74c6702e8..000000000 --- a/elements/mysql-common/os-refresh-config/configure.d/51-mysql-server-id +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -set -eux - -# Set mysql server_id based on instance-id - -INSTANCE_ID_FILE="/var/lib/cloud/data/instance-id" -CONF_TARGET="/etc/mysql/conf.d/server_id.cnf" - -if [ ! -f $INSTANCE_ID_FILE ] ; then - exit 0 -fi - -if [ -f $CONF_TARGET ] ; then - echo "MySQL Server ID has already been configured" - exit 0 -fi - -INSTANCE_ID=$(cat $INSTANCE_ID_FILE) - -if [ $INSTANCE_ID = 'nocloud' ]; then - echo "nocloud, not configuring server-id" - exit 0 -fi - -SERVER_ID=$(python -c "import hashlib; h = hashlib.sha1(); h.update('${INSTANCE_ID}'); print(int(h.hexdigest(), 16) % (2 ** 32 - 1))") - -cat > $CONF_TARGET </nagios3. -Sets the default web user name as nagiosadmin with a password of nagiosadmin. - -Options to set the web password and parse nova list output for initial ip list -can be provided via heat. For example: - - nagios3: - adm_web_passwd: nagiosadmin - os_auth_url: 192.0.2.1 - os_password: unset - os_username: admin - os_tenant_name: admin - monitor_networks: - - ctlplane - -Sample heat template with defaults configured for a boot-stack vm located at: - https://git.openstack.org/cgit/openstack/tripleo-heat-templates diff --git a/elements/nagios3/bin/refresh-nagios-from-nova b/elements/nagios3/bin/refresh-nagios-from-nova deleted file mode 100755 index c4cd26369..000000000 --- a/elements/nagios3/bin/refresh-nagios-from-nova +++ /dev/null @@ -1,90 +0,0 @@ -#!/usr/bin/env python -# Copyright 2014 Hewlett-Packard Development Company, L.P. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import os -import subprocess -import sys - -from novaclient.v1_1 import client -from pynag import Model - -conn = client.Client(os.environ['OS_USERNAME'], - os.environ['OS_PASSWORD'], - os.environ['OS_TENANT_NAME'], - os.environ['OS_AUTH_URL']) - -if len(sys.argv): - target_nets = [unicode(x) for x in sys.argv[1:]] -else: - target_net = [u'default-net'] - -errors = 0 -reload_nagios = False - -for net in target_nets: - try: - Model.Hostgroup.objects.get_by_name(net) - except Exception as e: - sys.stderr.write("INFO: creating hostgroup %s\n" % net) - hg = Model.Hostgroup() - hg.name = net - hg.hostgroup_name = net - if hg.is_dirty(): - try: - if hg.save(): - reload_nagios = True - except Exception as e: - sys.stderr.write("ERROR: %s\n" % e) - errors += 1 - print(hg) - -for server in conn.servers.list(): - server.get() - monitor_nets = set(target_nets) & set(server.networks.keys()) - if not monitor_nets: - continue - # Prefer first net, and IPv6 - for net in target_nets: - if net in server.networks: - addrs = server.networks[net] - break - # If there is a floating IP, thats what we want. - addr = addrs[-1] - try: - host = Model.Host.objects.get_by_name(server.name) - except Exception as e: - host = Model.Host() - sys.stderr.write("INFO: creating host %s\n" % server.name) - host.use = 'generic-host' - host.name = server.name - host.host_name = server.name - host.alias = server.name - host.hostgroups = '%s,ssh-servers' % (','.join(monitor_nets),) - host.address = addr - try: - if host.save(): - reload_nagios = True - except Exception as e: - sys.stderr.write("ERROR: %s\n" % e) - errors += 1 - print(host) - -if errors: - sys.stderr.write("ERROR: %d error(s).\n" % errors) - sys.exit(1) - -if reload_nagios: - sys.stderr.write("INFO: reloading nagios.") - subprocess.call(["service", "nagios3", "reload"]) diff --git a/elements/nagios3/element-deps b/elements/nagios3/element-deps deleted file mode 100644 index a1e52aaa7..000000000 --- a/elements/nagios3/element-deps +++ /dev/null @@ -1,5 +0,0 @@ -apache2 -os-apply-config -os-refresh-config -package-installs -postfix diff --git a/elements/nagios3/install.d/17-nagios b/elements/nagios3/install.d/17-nagios deleted file mode 100755 index dc641ce56..000000000 --- a/elements/nagios3/install.d/17-nagios +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -set -eux - -# set check_external_commands -sed -i "s/check_external_commands=0/check_external_commands=1/" /etc/nagios3/nagios.cfg -# fix a minior display issue -if [ -f /etc/nagios3/conf.d/extinfo_nagios2.cfg ]; then - sed -i "s/base\/debian/debian/g" /etc/nagios3/conf.d/extinfo_nagios2.cfg -fi -mkdir -p /etc/nagios3/pynag -if ! grep -q '^cfg_dir=/etc/nagios3/pynag' /etc/nagios3/nagios.cfg ; then - echo "cfg_dir=/etc/nagios3/pynag" >> /etc/nagios3/nagios.cfg -fi -install -m 0755 -o root -g root $(dirname $0)/../bin/refresh-nagios-from-nova /usr/local/bin -install -m 0644 -o root -g root $(dirname $0)/nagios3-crontab /etc/cron.d/nagios3 -virtualenv /opt/stack/venvs/nagios-tools -/opt/stack/venvs/nagios-tools/bin/pip install pynag python-novaclient -# some cleanup -chmod g+x /var/lib/nagios3/rw -chmod g+x /var/lib/nagios3 diff --git a/elements/nagios3/install.d/nagios3-crontab b/elements/nagios3/install.d/nagios3-crontab deleted file mode 100644 index 4cb62301f..000000000 --- a/elements/nagios3/install.d/nagios3-crontab +++ /dev/null @@ -1,2 +0,0 @@ -# Refresh from nova periodically -*/5 * * * * root bash -c '. /opt/stack/venvs/nagios-tools/bin/activate ; . /etc/nagios3/nova_access_info ; /usr/local/bin/refresh-nagios-from-nova $monitor_networks' diff --git a/elements/nagios3/install.d/package-installs-nagios b/elements/nagios3/install.d/package-installs-nagios deleted file mode 100644 index 816179c04..000000000 --- a/elements/nagios3/install.d/package-installs-nagios +++ /dev/null @@ -1 +0,0 @@ -nagios3 diff --git a/elements/nagios3/os-apply-config/etc/nagios3/nova_access_info b/elements/nagios3/os-apply-config/etc/nagios3/nova_access_info deleted file mode 100644 index e0f12720b..000000000 --- a/elements/nagios3/os-apply-config/etc/nagios3/nova_access_info +++ /dev/null @@ -1,10 +0,0 @@ -export NOVA_VERSION=1.1 -export OS_PASSWORD={{nagios3.os_password}} -export OS_AUTH_URL={{nagios3.os_auth_url}} -export OS_USERNAME={{nagios3.os_username}} -export OS_TENANT_NAME={{nagios3.os_tenant_name}} -export COMPUTE_API_VERSION=1.1 -export OS_NO_CACHE=True -# add initial split network. -monitor_networks="{{#nagios3.monitor_networks}}{{.}} {{/nagios3.monitor_networks}}" -nagiosadmin_pass={{nagios3.adm_web_passwd}} diff --git a/elements/nagios3/os-refresh-config/post-configure.d/17-nagios b/elements/nagios3/os-refresh-config/post-configure.d/17-nagios deleted file mode 100755 index dbefd52a1..000000000 --- a/elements/nagios3/os-refresh-config/post-configure.d/17-nagios +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -eu - -# exit if we can't source our required data -DEFAULTS=/etc/nagios3/nova_access_info -source $DEFAULTS -htpasswd -bc /etc/nagios3/htpasswd.users nagiosadmin $nagiosadmin_pass diff --git a/elements/network-utils/README.md b/elements/network-utils/README.md deleted file mode 100644 index 1ab2ce23a..000000000 --- a/elements/network-utils/README.md +++ /dev/null @@ -1,20 +0,0 @@ -Install a set of network utility scripts - -Currently only installs a single script - -ensure-bridge : A bridge configuration script which can be used to create - a ovs bridge and place a network device on it. Transferring ip addresses and - routes to the bridge. The script takes 3 parameters: - - $ ensure-bridge EXTERNAL_BRIDGE PHYSICAL_INTERFACE [PUBLIC_IP_CIDR [PUBLIC_INTERFACE_ROUTE]] - EXTERNAL_BRIDGE : The name of the bridge to create. - PHYSICAL_INTERFACE : The physical interface to place on the bridge. - PUBLIC_IP_CIDR : Optional static IP address in CIDR notation - 1.2.3.4/5 - PUBLIC_INTERFACE_ROUTE : Add a default route via this for all IP's except - 169.254.169.254/32 - - ensure-bridge also accepts: - - * --public-tag: A VLAN tag to use for creating a public IP access port on a VLAN. - * --public-tag-ip: An IP address to put on the access port public-tag creates. - * --bridge-route: A route "prefix via" to add to the bridge. diff --git a/elements/network-utils/bin/ensure-bridge b/elements/network-utils/bin/ensure-bridge deleted file mode 100755 index 860cda58c..000000000 --- a/elements/network-utils/bin/ensure-bridge +++ /dev/null @@ -1,346 +0,0 @@ -#!/bin/bash - -# Idempotent script to create an ovs bridge and add a physical NIC -# onto it as an OVS port. Any IP address on the physical NIC will -# be automatically moved onto the OVS bridge. -# -# Uses the OS default networking script format to write out persistent -# config files to disk. These config files persist across reboots -# an are only updated if metadata changes are detected (these are passed -# in as script parameters). If a config change is made the network interface -# and OVS bridge are restarted using ifdown/ifup scripts. -# -# If public_interface_route is set then the current default route is -# specialised to a 169.254.169.254/32 only route (unless there is already a -# 169.254.169.254 route - such as a neutron network with host routes can -# create) and a default route via public_interface_route is added on the public -# interface. - -set -eu - -PATH=/usr/local/bin:$PATH - -SCRIPT_NAME=$(basename $0) -SCRIPT_HOME=$(dirname $0) - -function show_options () { - echo "Usage: $SCRIPT_NAME [options]
[ []]" - echo - echo "Create a bridge br with an external port interface." - echo - echo "This will ensure that br exists and that interface is a port on it." - echo "If IP is not empty, it will be set as the IP address for the bridge." - echo "Otherwise the bridge will be configured for DHCP. If route is supplied" - echo "it will be used as the default route." - echo "Public-tag and public-tag-ip must both be empty, or both set." - echo - echo "Options:" - echo " -h|--help -- this help." - echo " --bridge-route -- Add a route to the bridge, e.g. to IPMI network." - echo " Accepts one parameter, the prefix and via with a" - echo " space between them." - echo " --public-tag -- Make int_public an access port with this tag." - echo " --public-tag-ip -- Give int_public this IP address." - echo - exit $1 -} - -BRIDGE_ROUTE= -PUBLIC_TAG= -PUBLIC_TAG_IP= - -TEMP=$(getopt -o h -l bridge-route:,help,public-tag:,public-tag-ip: -n $SCRIPT_NAME -- "$@") -if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi - -# Note the quotes around `$TEMP': they are essential! -eval set -- "$TEMP" - -while true ; do - case "$1" in - -h|--help) show_options 0;; - --bridge-route) BRIDGE_ROUTE=$2; shift 2;; - --public-tag) PUBLIC_TAG=$2; shift 2;; - --public-tag-ip) PUBLIC_TAG_IP=$2; shift 2;; - --) shift ; break ;; - *) echo "Error: unsupported option $1." ; exit 1 ;; - esac -done - -EXTERNAL_BRIDGE="$1" -PHYSICAL_INTERFACE="$2" -PHYSICAL_INTERFACE_IP_NETMASK="${3:-}" #optional, by default uses DHCP -PUBLIC_INTERFACE_ROUTE="${4:-}" #optional -EXTRA=${5:-""} - -if [ -z "$PHYSICAL_INTERFACE" -o -n "$EXTRA" ]; then - show_options 1 -fi - -if [ \( -n "$PUBLIC_TAG" -a -z "$PUBLIC_TAG_IP" \) -o \ - \( -z "$PUBLIC_TAG" -a -n "$PUBLIC_TAG_IP" \) ]; then - # For now, we don't support DHCP on vlans - the next gen stuff will be well - # layered and do that. - echo "Only one of --public-tag and --public-tag-ip supplied." >&2 - show_options 1 -fi - -if [ -n "$BRIDGE_ROUTE" ]; then - read -s BRIDGE_ROUTE_PREFIX BRIDGE_ROUTE_VIA <<< $BRIDGE_ROUTE - if [ -z "$BRIDGE_ROUTE_PREFIX" -o -z "$BRIDGE_ROUTE_VIA" ]; then - echo "Invalid route '$BRIDGE_ROUTE'" >&2 - show_options 1 - fi -else - BRIDGE_ROUTE_PREFIX= - BRIDGE_ROUTE_VIA= -fi - -set -x - -# network scripts function used on Fedora/RHEL/Centos, etc. -function configure_bridge_interface_dhcp_netscripts() { - - local bridge=$1 - local interface=$2 - local public_ip_addr=${3:-''} - local public_ip_netmask=${4:-''} - local interface_mac=${5} - local public_tag=${6} - local public_tag_ip=${7} - local public_tag_ip_netmask=${8} - local bridge_route_prefix=${9} - local bridge_route_via=${10} - local tmp_bridge_config=$(mktemp) - local tmp_bridge_route=$(mktemp) - local tmp_interface_config=$(mktemp) - local tmp_int_public_config=$(mktemp) - local bridge_config="/etc/sysconfig/network-scripts/ifcfg-$bridge" - local bridge_route="/etc/sysconfig/network-scripts/route-$bridge" - local interface_config="/etc/sysconfig/network-scripts/ifcfg-$interface" - local int_public_config="/etc/sysconfig/network-scripts/ifcfg-int_public" - - #interface config - cat > $tmp_interface_config < $tmp_bridge_config < $tmp_bridge_config < $tmp_bridge_route - fi - if [ -n "$public_tag" ]; then - # Setup the access port - cat > $tmp_int_public_config </dev/null || \ - ! diff $tmp_bridge_config $bridge_config &>/dev/null || \ - ! diff $tmp_int_public_config $int_public_config &>/dev/null || \ - ! diff $tmp_bridge_route $bridge_route &>/dev/null ; then - - ifdown int_public &>/dev/null || true - ifdown $interface &>/dev/null || true - ifdown $bridge &>/dev/null || true - - cp $tmp_interface_config $interface_config - cp $tmp_bridge_config $bridge_config - cp $tmp_bridge_route $bridge_route - if [ -n "$public_tag" ]; then - cp $tmp_int_public_config $int_public_config - else - rm -f $int_public_config - fi - - ifup $bridge - ifup $interface - if [ -n "$public_tag" ]; then - ifup int_public - fi - fi - - rm $tmp_bridge_config - rm $tmp_interface_config - -} - -# elastic network interfaces used on Debian/Ubuntu, etc. -function configure_bridge_interface_dhcp_eni() { - - local bridge=$1 - local interface=$2 - local public_ip_addr=${3:-''} - local public_ip_netmask=${4:-''} - local interface_mac=${5} - local public_tag=${6} - local public_tag_ip=${7} - local public_tag_ip_netmask=${8} - local bridge_route_prefix=${9} - local bridge_route_via=${10} - local tmp_config=$(mktemp) - local config="/etc/network/interfaces" - - cp $config $tmp_config - sed -e "/auto $interface\$/,/^$/d" -i $tmp_config - sed -e "/allow-ovs $bridge\$/,/^$/d" -i $tmp_config - sed -e "/auto int_public\$/,/^$/d" -i $tmp_config - sed -e "/allow-$bridge $interface\$/,/^$/d" -i $tmp_config - - if [ -n "$bridge_route_prefix" ]; then - local route_line="post-up ip route replace $bridge_route_prefix via $bridge_route_via" - else - local route_line= - fi - - ovs_ports="$interface" - if [ -n "$public_tag" ]; then - ovs_ports="$ovs_ports int_public" - fi - - #bridge config - if [ -z "$public_ip_addr" ]; then - # DHCP for the bridge itself. - cat >> $tmp_config <> $tmp_config <> $tmp_config <> $tmp_config </dev/null; then - ifdown int_public &>/dev/null || true - ifdown $interface &>/dev/null || true - ifdown $bridge &>/dev/null || true - - cp $tmp_config $config - - ifup $bridge - ifup $interface - if [ -n "$public_tag" ]; then - ifup int_public - fi - fi - - rm $tmp_config - -} - -if [ -n "$PHYSICAL_INTERFACE_IP_NETMASK" ]; then - IP=$(python -c "import netaddr; print netaddr.IPNetwork('$PHYSICAL_INTERFACE_IP_NETMASK').ip") - NETMASK=$(python -c "import netaddr; print netaddr.IPNetwork('$PHYSICAL_INTERFACE_IP_NETMASK').netmask") -else - IP='' - NETMASK='' -fi - -if [ -n "$PUBLIC_TAG_IP" ]; then - PUBLIC_TAG_IP_NETMASK=$(python -c "import netaddr; print netaddr.IPNetwork('$PUBLIC_TAG_IP').netmask") - PUBLIC_TAG_IP=$(python -c "import netaddr; print netaddr.IPNetwork('$PUBLIC_TAG_IP').ip") -else - PUBLIC_TAG_IP_NETMASK= -fi - -interface_mac=$(ip link show dev "$PHYSICAL_INTERFACE" | awk '/ether/ {print $2}') - -if [ -d "/etc/sysconfig/network-scripts/" ]; then - configure_bridge_interface_dhcp_netscripts $EXTERNAL_BRIDGE $PHYSICAL_INTERFACE "$IP" "$NETMASK" $interface_mac "$PUBLIC_TAG" "$PUBLIC_TAG_IP" "$PUBLIC_TAG_IP_NETMASK" "$BRIDGE_ROUTE_PREFIX" "$BRIDGE_ROUTE_VIA" -elif [ -d "/etc/network" ]; then - configure_bridge_interface_dhcp_eni $EXTERNAL_BRIDGE $PHYSICAL_INTERFACE "$IP" "$NETMASK" $interface_mac "$PUBLIC_TAG" "$PUBLIC_TAG_IP" "$PUBLIC_TAG_IP_NETMASK" "$BRIDGE_ROUTE_PREFIX" "$BRIDGE_ROUTE_VIA" -else - echo "Unsupported network configuration type!" - exit 1 -fi - -# Handle default route replacement. -if [ -n "$PUBLIC_INTERFACE_ROUTE" ]; then - DEFAULT_VIA=$(ip route show | awk '/default / { print $3 }') - if [ "$DEFAULT_VIA" != "$PUBLIC_INTERFACE_ROUTE" ]; then - if [ -z "$(ip route show 169.254.169.254)" ]; then - # No explicit route to 169.254.169.254 - set one. - ip route add 169.254.169.254/32 via $DEFAULT_VIA - fi - ip route replace default via $PUBLIC_INTERFACE_ROUTE - fi -fi diff --git a/elements/network-utils/element-deps b/elements/network-utils/element-deps deleted file mode 100644 index 64796f72c..000000000 --- a/elements/network-utils/element-deps +++ /dev/null @@ -1 +0,0 @@ -openvswitch diff --git a/elements/network-utils/install.d/70-network-utils b/elements/network-utils/install.d/70-network-utils deleted file mode 100755 index d703540ff..000000000 --- a/elements/network-utils/install.d/70-network-utils +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -eux - -install-packages python-netaddr diff --git a/elements/neutron-dhcp-agent/README.md b/elements/neutron-dhcp-agent/README.md deleted file mode 100644 index 3c4ddebb5..000000000 --- a/elements/neutron-dhcp-agent/README.md +++ /dev/null @@ -1,7 +0,0 @@ -Install the Neutron DHCP agent. - -Configuration -------------- - -No DHCP specific configuration exists. See the neutron-openvswitch-agent -element for configuration parameters. diff --git a/elements/neutron-dhcp-agent/element-deps b/elements/neutron-dhcp-agent/element-deps deleted file mode 100644 index ed0d34d2d..000000000 --- a/elements/neutron-dhcp-agent/element-deps +++ /dev/null @@ -1,3 +0,0 @@ -neutron -neutron-openvswitch-agent -os-refresh-config diff --git a/elements/neutron-dhcp-agent/install.d/neutron-package-install/80-neutron-dhcp-agent b/elements/neutron-dhcp-agent/install.d/neutron-package-install/80-neutron-dhcp-agent deleted file mode 100755 index 878aceddc..000000000 --- a/elements/neutron-dhcp-agent/install.d/neutron-package-install/80-neutron-dhcp-agent +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages openstack-neutron openstack-neutron-dhcp-agent - -os-svc-daemon -i "$NEUTRON_VENV_DIR" -n neutron-dhcp-agent -u neutron diff --git a/elements/neutron-dhcp-agent/install.d/neutron-source-install/80-neutron-dhcp-agent b/elements/neutron-dhcp-agent/install.d/neutron-source-install/80-neutron-dhcp-agent deleted file mode 100755 index 6aa2d95b4..000000000 --- a/elements/neutron-dhcp-agent/install.d/neutron-source-install/80-neutron-dhcp-agent +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -set -eux -# If NEUTRON_VENV_DIR is set, then need to fix up the dhcp.filters rootwrap file to allow dhcp-agent to -# kill processes when networks are deleted. -if [ -n "${NEUTRON_VENV_DIR}" ] -then - sed -i "s, python, ${NEUTRON_VENV_DIR}/bin/python," /etc/neutron/rootwrap.d/dhcp.filters -fi - -install-packages dnsmasq dnsmasq-utils - -os-svc-daemon -i "$NEUTRON_VENV_DIR" -n neutron-dhcp-agent -u neutron -c neutron-dhcp-agent -- --config-file /etc/neutron/dhcp_agent.ini --config-dir /etc/neutron diff --git a/elements/neutron-dhcp-agent/os-refresh-config/post-configure.d/80-neutron-dhcp-agent b/elements/neutron-dhcp-agent/os-refresh-config/post-configure.d/80-neutron-dhcp-agent deleted file mode 100755 index fed0bb57f..000000000 --- a/elements/neutron-dhcp-agent/os-refresh-config/post-configure.d/80-neutron-dhcp-agent +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eux - -os-svc-enable -n neutron-dhcp-agent - -os-svc-restart -n neutron-dhcp-agent diff --git a/elements/neutron-network-node/README.md b/elements/neutron-network-node/README.md deleted file mode 100644 index 3273877cb..000000000 --- a/elements/neutron-network-node/README.md +++ /dev/null @@ -1,16 +0,0 @@ -Install components for Neutron network node. - -Configuration -------------- - -No network-node specific configuration exists. See the -neutron-openvswitch-agent element for configuration parameters. - -A typical ovs configuration will set: - - neutron: - ovs: - enable_tunneling: 'True' - public_interface: eth0 - physical_bridge: br-ex - tenant_network_type: gre diff --git a/elements/neutron-network-node/element-deps b/elements/neutron-network-node/element-deps deleted file mode 100644 index 4304ed564..000000000 --- a/elements/neutron-network-node/element-deps +++ /dev/null @@ -1,5 +0,0 @@ -neutron -neutron-dhcp-agent -neutron-router -os-refresh-config -pacemaker diff --git a/elements/neutron-network-node/os-refresh-config/post-configure.d/80-neutron-networking b/elements/neutron-network-node/os-refresh-config/post-configure.d/80-neutron-networking deleted file mode 100755 index 60f111cd3..000000000 --- a/elements/neutron-network-node/os-refresh-config/post-configure.d/80-neutron-networking +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -set -eux - -# this ensures that neutron-l3-agent and neutron-metadata-agent services -# will be monitored by pacemaker on all nodes. -# Because allow_automatic_l3agent_failover is enabled, we want -# to make sure that if l3-agent service fails it's started again by -# pacemaker. If outage is longer and l3 routers are moved to other -# node meantime, l3-agent will clean up routers on local node when -# started again. -# TODO: it would be cleaner to do service restart above by pacemaker -# command, but it's difficult to restart service on single node only -pcmk-service-create -c -n neutron-metadata-agent -pcmk-service-create -c -n neutron-l3-agent diff --git a/elements/neutron-openvswitch-agent/README.md b/elements/neutron-openvswitch-agent/README.md deleted file mode 100644 index 7aeade3e6..000000000 --- a/elements/neutron-openvswitch-agent/README.md +++ /dev/null @@ -1,95 +0,0 @@ -Install and configure OpenStack Networking Openvswitch agent. - -Configuration -------------- - -The physical interface and bridges to use to bridge traffic onto can be -configured via Heat Metadata. For example: - - neutron: - ovs: - public_interface: vlan25 - public_interface_route: 12.34.56.78 - physical_bridge: br-ctlplane - network_vlan_ranges: ctlplane - bridge_mappings: ctlplane:br-ctlplane - bootstack: - public_interface_ip: 12.34.56.79/24 - -If public\_interface and physical\_bridge are not set, no bridges will be -connected directly. This is normal for neutron hosting virtual machines -when using an overlay network (e.g. GRE tunnelling) with no provider networks. -Some of the other fields will be ignored in this case. Most of them map 1:1 -with their counterparts in ml2\_conf.ini. - -Public\_interface\_ip is used to add an *additional* ip address to the machine. -This is set on the bridge device. Our current scripts write a static -configuration with either DHCP or one IP address per interface, so its not -very flexible. - -There are two ways to setup VLANs. The old deprecated way using -public\_interface\_raw\_device creates a VLAN device under the bridge, which -prevents the use of provider networks other than that for the same VLAN. It -also sometimes leads to issues with access to the metadata server. In this -configuration the raw device is still configured using DHCP and the public IP -is put on the bridge device itself using public\_interface\_ip. - -The new way is to use public\_interface\_tag and public\_interface\_tag\_ip to -create a VLAN access port on top of the bridge. This allows the use of any -provider network desired, as the traffic tagging and filtering occurs in the -bridge rather than below it. In this configuration the access port is given the -public IP address, the bridge is (usually) configured for DHCP, and the -underlying device is no longer given an IP address at all. This can be used -together with public\_interface\_ip to assign a static ip address to the bridge -(which we use for the seed VM as part of bootstrapping an environment). - -Routing on the control plane network can be complex, and we have a new feature -coming in to do arbitrary routes, but for now, we offer the ability to add a -single static route via the physical\_bridge\_route key. - -For instance: - - neutron: - ovs: - public_interface: eth2 - public_interface_route: 45.67.89.1 - public_interface_tag: 25 - public_interface_tag_ip: 45.67.89.10/24 - physical_bridge: br-ctlplane - physical_bridge_route: - prefix: 12.34.0.0/16 - via: 12.34.56.1 - bootstack: - public_interface_ip: 12.34.56.79/24 - -will result in br-ctlplane being created on eth2, a tagged port (`int\_public`) -added to br-ctlplane with tag 25, ip address 45.67.89.10/24, default route -45.67.89.1 and the bridge device itself being assigned 12.34.56.78/24. - -public\_interface\_tag must be an int, or null, which like not present, means -untagged. When public\_interface\_tag is not set, public\_interface\_tag\_ip -must also not be set. The recommended approach is to set the tag, tag\_ip and -\_route options together, or not at all. public\_interface\_ip should only be -used in the seed, as using it elsewhere will usually result in the metadata -service being inaccessible. - -For the deprecated behaviour where public\_interface\_raw\_device is set, -public\_interface must be a vlan device, and the vlan device will be created -using the raw device during os-collect-config configuration. We suggest not -using this and migrating to public\_interface\_ip\_tag as soon as possible as -that will fix tag provider networks. - -When public\_interface\_raw\_device is not set, setting an IP address without -setting a tag for it will result in an invalid configuration where metadata -access is not possible, as the source IP address will be wrong. This may be -useful where metadata access is not an issue (such as the seed VM). - -The bridge is always configured to use the MAC address of the public\_interface -device as its MAC address. - -Once the bridge and access port (if configured) are set up, the -public\_interface\_route (if set) will replace the default route's next hop. -The hop this replaces will be added as the next hop for 169.254.169.254/32 -(unless one already exists). This permits routing default traffic out through -a hardware router without breaking the ability to contact a local subnet bare -metal metadata server. diff --git a/elements/neutron-openvswitch-agent/bin/init-neutron-ovs b/elements/neutron-openvswitch-agent/bin/init-neutron-ovs deleted file mode 100755 index 1df04fc88..000000000 --- a/elements/neutron-openvswitch-agent/bin/init-neutron-ovs +++ /dev/null @@ -1,120 +0,0 @@ -#!/bin/bash - -# Idempotent script to apply heat configuration to the running network -# environment. -# -# NOTE: this script uses Heat parameters to define the physical -# network setup for TripleO. If 'os_net_config' metadata is detected -# it is assumed that Heat metadata is modeling the configuration directly -# and this script does nothing. This is meant to provide an easy way -# to select between the two configuration methods via Heat (parameters vs -# os-net-config modeling). -# -# If a public_interface_raw_device is defined in metadata and public_interface -# does not exist, the public_interface is used to derived a vlan id and a vlan -# interface is configured. -# -# If a bootstrap public_interface_ip is defined in metadata and not attached to -# any device then it will be added to the public_interface device if one is -# defined. -# -# An integration bridge for neutron-ovs-agent is created. -# -# If no physical bridge is defined in metadata, the script will have no -# further effect. -# -# If a physical bridge is defined then os-net-config is called to set it up. -# -# If there is configuration (tag + IP) for an access port, one is created on -# top of the bridge, again by os-net-config. - -set -eux - -PATH=/usr/local/bin:$PATH - -EXTERNAL_BRIDGE=$(os-apply-config --key neutron.ovs.physical_bridge --type raw --key-default '') -PHYSICAL_INTERFACE=$(os-apply-config --key neutron.ovs.public_interface --type raw --key-default '') -PHYSICAL_INTERFACE_IP=$(os-apply-config --key bootstack.public_interface_ip --type netaddress --key-default '') -PUBLIC_INTERFACE_ROUTE=$(os-apply-config --key neutron.ovs.public_interface_route --type netaddress --key-default '') -# TAG is type raw because we can't do an absent key as a default in Heat, and '' is not an int. -PUBLIC_INTERFACE_TAG=$(os-apply-config --key neutron.ovs.public_interface_tag --type raw --key-default '') -PUBLIC_INTERFACE_TAG_IP=$(os-apply-config --key neutron.ovs.public_interface_tag_ip --type netaddress --key-default '') -PHYSICAL_ROUTE_PREFIX=$(os-apply-config --key neutron.ovs.physical_bridge_route.prefix --type netaddress --key-default '') -PHYSICAL_ROUTE_VIA=$(os-apply-config --key neutron.ovs.physical_bridge_route.via --type netaddress --key-default '') -NET_CONFIG=$(os-apply-config --key os_net_config --type raw --key-default '') - -if [ -n "$NET_CONFIG" ]; then - echo "Skipping init-neutron-ovs because os-net-config data detected." - exit 0 -fi - -if [ -z "$EXTERNAL_BRIDGE" ] ; then - exit 0 -fi - -cat > /etc/os-net-config/neutron-openvswitch-agent.conf <> /etc/os-net-config/neutron-openvswitch-agent.conf -} - -if [ -n "$PHYSICAL_INTERFACE_IP" ]; then - append_config " addresses:" - append_config " - ip_netmask: $PHYSICAL_INTERFACE_IP" -fi - -if [ -n "$PUBLIC_INTERFACE_TAG" -a -n "$PUBLIC_INTERFACE_TAG_IP" ]; then - # handle tagged (public VLAN) traffic to the bridge -cat >> /etc/os-net-config/neutron-openvswitch-agent.conf <> /etc/init/network-interface.override -fi diff --git a/elements/neutron-openvswitch-agent/install.d/neutron-package-install/80-neutron-openvswitch-agent b/elements/neutron-openvswitch-agent/install.d/neutron-package-install/80-neutron-openvswitch-agent deleted file mode 100755 index 1420843d0..000000000 --- a/elements/neutron-openvswitch-agent/install.d/neutron-package-install/80-neutron-openvswitch-agent +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages openstack-neutron-openvswitch - -# Use the tripleo ml2 config, openvswitch-agent as installed by package starts with -# --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini -# --config-file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini (pre liberty) -ML2CONFIG=/etc/neutron/plugins/ml2/openvswitch_agent.ini -if [ -e /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini ] ; then - ML2CONFIG=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini -fi -rm -f $ML2CONFIG -ln -s /etc/neutron/plugins/ml2/ml2_conf.ini $ML2CONFIG - -os-svc-daemon -n neutron-openvswitch-agent -u neutron diff --git a/elements/neutron-openvswitch-agent/install.d/neutron-source-install/80-neutron-openvswitch-agent b/elements/neutron-openvswitch-agent/install.d/neutron-source-install/80-neutron-openvswitch-agent deleted file mode 100755 index 46f59e8ec..000000000 --- a/elements/neutron-openvswitch-agent/install.d/neutron-source-install/80-neutron-openvswitch-agent +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -eux - -# The l2 agent now requires ipset since enable_ipset=True enabled by default -install-packages ipset - -os-svc-daemon -i "$NEUTRON_VENV_DIR" neutron-openvswitch-agent neutron neutron-openvswitch-agent \ - "--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-dir /etc/neutron" diff --git a/elements/neutron-openvswitch-agent/os-refresh-config/configure.d/21-neutron-openvswitch-agent b/elements/neutron-openvswitch-agent/os-refresh-config/configure.d/21-neutron-openvswitch-agent deleted file mode 100755 index ec32a7192..000000000 --- a/elements/neutron-openvswitch-agent/os-refresh-config/configure.d/21-neutron-openvswitch-agent +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -eux - -init-neutron-ovs diff --git a/elements/neutron-openvswitch-agent/os-refresh-config/post-configure.d/80-neutron-openvswitch-agent b/elements/neutron-openvswitch-agent/os-refresh-config/post-configure.d/80-neutron-openvswitch-agent deleted file mode 100755 index 1d3b76336..000000000 --- a/elements/neutron-openvswitch-agent/os-refresh-config/post-configure.d/80-neutron-openvswitch-agent +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eux - -os-svc-enable -n neutron-openvswitch-agent - -os-svc-restart -n neutron-openvswitch-agent diff --git a/elements/neutron-openvswitch-agent/os-refresh-config/pre-configure.d/72-openvswitch-iptables b/elements/neutron-openvswitch-agent/os-refresh-config/pre-configure.d/72-openvswitch-iptables deleted file mode 100755 index 1597720bb..000000000 --- a/elements/neutron-openvswitch-agent/os-refresh-config/pre-configure.d/72-openvswitch-iptables +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -# VxLAN ports -add-rule INPUT -p udp -m udp --dport 4789 -j ACCEPT -add-rule INPUT -m pkttype --pkt-type multicast -j ACCEPT diff --git a/elements/neutron-ovs-cleanup/README.md b/elements/neutron-ovs-cleanup/README.md deleted file mode 100644 index 3655f02c7..000000000 --- a/elements/neutron-ovs-cleanup/README.md +++ /dev/null @@ -1,3 +0,0 @@ -Install and configure OpenStack Networking cleanup utility. - -Currently supports systemd distributions only. diff --git a/elements/neutron-ovs-cleanup/element-deps b/elements/neutron-ovs-cleanup/element-deps deleted file mode 100644 index 99d73a448..000000000 --- a/elements/neutron-ovs-cleanup/element-deps +++ /dev/null @@ -1 +0,0 @@ -neutron diff --git a/elements/neutron-ovs-cleanup/install.d/neutron-source-install/81-neutron-ovs-cleanup b/elements/neutron-ovs-cleanup/install.d/neutron-source-install/81-neutron-ovs-cleanup deleted file mode 100755 index 57d921dfe..000000000 --- a/elements/neutron-ovs-cleanup/install.d/neutron-source-install/81-neutron-ovs-cleanup +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -set -ue -set -x - -SCRIPTDIR=$(dirname $0) - -ln -sf $NEUTRON_VENV_DIR/bin/neutron-ovs-cleanup /usr/local/bin/neutron-ovs-cleanup - -DIB_INIT_SYSTEM=$(dib-init-system) -if [ "$DIB_INIT_SYSTEM" == "systemd" ]; then - install -D -g root -o root -m 0755 ${SCRIPTDIR}/neutron-ovs-cleanup.service /usr/lib/systemd/system/neutron-ovs-cleanup.service -elif [ "$DIB_INIT_SYSTEM" == "upstart" ]; then - install -D -g root -o root -m 0755 ${SCRIPTDIR}/neutron-ovs-cleanup.conf /etc/init/neutron-ovs-cleanup.conf -fi diff --git a/elements/neutron-ovs-cleanup/install.d/neutron-source-install/neutron-ovs-cleanup.conf b/elements/neutron-ovs-cleanup/install.d/neutron-source-install/neutron-ovs-cleanup.conf deleted file mode 100644 index dc0e460bb..000000000 --- a/elements/neutron-ovs-cleanup/install.d/neutron-source-install/neutron-ovs-cleanup.conf +++ /dev/null @@ -1,12 +0,0 @@ -# neutron-ovs-cleanup -# - -start on started openvswitch-switch -stop on runlevel [!2345] - -pre-start script - [ ! -e /etc/neutron/neutron.conf ] && exit 0 - - start-stop-daemon --start --chuid neutron --exec /usr/local/bin/neutron-ovs-cleanup -- \ - --config-dir /etc/neutron -end script diff --git a/elements/neutron-ovs-cleanup/install.d/neutron-source-install/neutron-ovs-cleanup.service b/elements/neutron-ovs-cleanup/install.d/neutron-source-install/neutron-ovs-cleanup.service deleted file mode 100644 index e84c75763..000000000 --- a/elements/neutron-ovs-cleanup/install.d/neutron-source-install/neutron-ovs-cleanup.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Neutron OVS Cleanup Service -Wants=network.service openvswitch-nonetwork.service -After=openvswitch-nonetwork.service -Before=network.service - -[Service] -Type=oneshot -ExecStart=/usr/local/bin/neutron-ovs-cleanup -User=root -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target -Alias=neutron-ovs-cleanup.service diff --git a/elements/neutron-ovs-cleanup/os-refresh-config/post-configure.d/81-neutron-ovs-cleanup b/elements/neutron-ovs-cleanup/os-refresh-config/post-configure.d/81-neutron-ovs-cleanup deleted file mode 100755 index e0592f4a6..000000000 --- a/elements/neutron-ovs-cleanup/os-refresh-config/post-configure.d/81-neutron-ovs-cleanup +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -eux - -os-svc-enable -n neutron-ovs-cleanup diff --git a/elements/neutron-router/README.md b/elements/neutron-router/README.md deleted file mode 100644 index 6e32be37a..000000000 --- a/elements/neutron-router/README.md +++ /dev/null @@ -1,16 +0,0 @@ -Install components for Neutron router node. - -Configuration -------------- - -No router node specific configuration exists. See the -neutron-openvswitch-agent element for configuration parameters. - -A typical ovs configuration will set: - - neutron: - ovs: - enable_tunneling: 'True' - public_interface: eth0 - physical_bridge: br-ex - tenant_network_type: gre diff --git a/elements/neutron-router/element-deps b/elements/neutron-router/element-deps deleted file mode 100644 index 025c470c4..000000000 --- a/elements/neutron-router/element-deps +++ /dev/null @@ -1,5 +0,0 @@ -neutron -neutron-openvswitch-agent -os-refresh-config -pkg-map -package-installs diff --git a/elements/neutron-router/install.d/neutron-source-install/80-neutron-router b/elements/neutron-router/install.d/neutron-source-install/80-neutron-router deleted file mode 100755 index f4ad32242..000000000 --- a/elements/neutron-router/install.d/neutron-source-install/80-neutron-router +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -set -eux - -# If NEUTRON_VENV_DIR is set, then need to fix up the l3.filters rootwrap file to allow l3-agent to -# kill metadata-proxy processes when routers are deleted. -if [ -n "${NEUTRON_VENV_DIR}" ] -then - sed -i "s, python, ${NEUTRON_VENV_DIR}/bin/python," /etc/neutron/rootwrap.d/l3.filters -fi - -os-svc-daemon -i "$NEUTRON_VENV_DIR" -n neutron-l3-agent -u neutron -c neutron-l3-agent -- --config-file /etc/neutron/l3_agent.ini --config-dir /etc/neutron -os-svc-daemon -i "$NEUTRON_VENV_DIR" -n neutron-metadata-agent -u neutron -c neutron-metadata-agent -- --config-file /etc/neutron/metadata_agent.ini --config-dir /etc/neutron - -# This has to be on the path of the agent that runs it http://pad.lv/1182704 -ln -sf $NEUTRON_VENV_DIR/bin/neutron-ns-metadata-proxy /usr/bin diff --git a/elements/neutron-router/os-refresh-config/post-configure.d/80-neutron-router b/elements/neutron-router/os-refresh-config/post-configure.d/80-neutron-router deleted file mode 100755 index acbbf553a..000000000 --- a/elements/neutron-router/os-refresh-config/post-configure.d/80-neutron-router +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -eux - -os-svc-enable -n neutron-metadata-agent -os-svc-enable -n neutron-l3-agent - -os-svc-restart -n neutron-metadata-agent -os-svc-restart -n neutron-l3-agent diff --git a/elements/neutron-router/package-installs.yaml b/elements/neutron-router/package-installs.yaml deleted file mode 100644 index ff6388afb..000000000 --- a/elements/neutron-router/package-installs.yaml +++ /dev/null @@ -1,3 +0,0 @@ -arping_package: -conntrack_package: -radvd_package: diff --git a/elements/neutron-router/pkg-map b/elements/neutron-router/pkg-map deleted file mode 100644 index 02e69aca5..000000000 --- a/elements/neutron-router/pkg-map +++ /dev/null @@ -1,13 +0,0 @@ -{ - "family": { - "debian": { - "arping_package": "iputils-arping", - "conntrack_package": "conntrack" - } - }, - "default": { - "arping_package": "iputils", - "conntrack_package": "conntrack-tools", - "radvd_package": "radvd" - } -} diff --git a/elements/neutron-server/README.md b/elements/neutron-server/README.md deleted file mode 100644 index f1e1d9e3c..000000000 --- a/elements/neutron-server/README.md +++ /dev/null @@ -1 +0,0 @@ -Install and configure Neutron server components. diff --git a/elements/neutron-server/element-deps b/elements/neutron-server/element-deps deleted file mode 100644 index fe76d2a9b..000000000 --- a/elements/neutron-server/element-deps +++ /dev/null @@ -1,2 +0,0 @@ -neutron -package-installs diff --git a/elements/neutron-server/install.d/neutron-package-install/76-neutron b/elements/neutron-server/install.d/neutron-package-install/76-neutron deleted file mode 100755 index 81ac882f9..000000000 --- a/elements/neutron-server/install.d/neutron-package-install/76-neutron +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -set -eux - -if [[ "rhel rhel7 centos7 fedora" =~ "$DISTRO_NAME" ]]; then - ln -s /etc/neutron/plugins/ml2/ml2_conf.ini /etc/neutron/plugin.ini - - # Packaged neutron is providing a requires.txt which breaks dependencies at - # runtime. See: - # https://bugzilla.redhat.com/show_bug.cgi?id=1057615 - rm -f /usr/lib/python2.7/site-packages/neutron-*.egg-info/requires.txt -fi -os-svc-daemon -i "$NEUTRON_VENV_DIR" -n neutron-server -u neutron diff --git a/elements/neutron-server/install.d/neutron-package-install/package-installs-neutron-server b/elements/neutron-server/install.d/neutron-package-install/package-installs-neutron-server deleted file mode 100644 index e464570ae..000000000 --- a/elements/neutron-server/install.d/neutron-package-install/package-installs-neutron-server +++ /dev/null @@ -1,2 +0,0 @@ -openstack-neutron -openstack-neutron-ml2 diff --git a/elements/neutron-server/install.d/neutron-source-install/80-neutron-server b/elements/neutron-server/install.d/neutron-source-install/80-neutron-server deleted file mode 100755 index 0651502f4..000000000 --- a/elements/neutron-server/install.d/neutron-source-install/80-neutron-server +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -ue - -os-svc-daemon -i "$NEUTRON_VENV_DIR" neutron-server neutron neutron-server \ - "--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-dir /etc/neutron" diff --git a/elements/neutron-server/os-refresh-config/post-configure.d/79-neutron-server b/elements/neutron-server/os-refresh-config/post-configure.d/79-neutron-server deleted file mode 100755 index 2f7ab3b29..000000000 --- a/elements/neutron-server/os-refresh-config/post-configure.d/79-neutron-server +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eux - -os-svc-enable -n neutron-server - -os-svc-restart -n neutron-server diff --git a/elements/neutron/README.md b/elements/neutron/README.md deleted file mode 100644 index 23e4a3355..000000000 --- a/elements/neutron/README.md +++ /dev/null @@ -1,13 +0,0 @@ -Install and configure Neutron. - -Configuration -------------- - - neutron: - verbose: False - - Print more verbose output (set logging level to INFO - instead of default WARNING level). - debug: False - - Print debugging output (set logging level to DEBUG - instead of default WARNING level). - flat-networks: "tripleo-bm-test" diff --git a/elements/neutron/cleanup.d/50-remove-source-neutron b/elements/neutron/cleanup.d/50-remove-source-neutron deleted file mode 100755 index abce0c6a8..000000000 --- a/elements/neutron/cleanup.d/50-remove-source-neutron +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eu - -sudo rm -fr "${TMP_MOUNT_PATH}/opt/stack/neutron" diff --git a/elements/neutron/element-deps b/elements/neutron/element-deps deleted file mode 100644 index 1777d90bf..000000000 --- a/elements/neutron/element-deps +++ /dev/null @@ -1,8 +0,0 @@ -iptables -os-apply-config -os-is-bootstrap-host -os-refresh-config -os-svc-install -openvswitch-datapath -selinux -source-repositories diff --git a/elements/neutron/environment.d/10-neutron-venv-dir.bash b/elements/neutron/environment.d/10-neutron-venv-dir.bash deleted file mode 100644 index 34035000b..000000000 --- a/elements/neutron/environment.d/10-neutron-venv-dir.bash +++ /dev/null @@ -1,6 +0,0 @@ -if [ -z "${NEUTRON_VENV_DIR:-}" ]; then - export NEUTRON_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/neutron"} -fi -if [ -z "${NEUTRON_EXTRA_INSTALL_OPTS:-}" ]; then - export NEUTRON_EXTRA_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-""} -fi diff --git a/elements/neutron/install.d/neutron-source-install/76-neutron b/elements/neutron/install.d/neutron-source-install/76-neutron deleted file mode 100755 index 2661dc4e3..000000000 --- a/elements/neutron/install.d/neutron-source-install/76-neutron +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -set -eux - -# for BUG: https://bugs.launchpad.net/neutron/+bug/1225232 -echo "qpid-python" | tee -a /opt/stack/neutron/requirements.txt - -os-svc-install $NEUTRON_EXTRA_INSTALL_OPTS -i "$NEUTRON_VENV_DIR" -u neutron -r /opt/stack/neutron - -ln -sf $NEUTRON_VENV_DIR/bin/neutron-rootwrap /usr/bin/neutron-rootwrap -ln -sft /etc/neutron $NEUTRON_VENV_DIR/etc/neutron/rootwrap.d - -cp /opt/stack/neutron/etc/api-paste.ini /etc/neutron/api-paste.ini -cp /opt/stack/neutron/etc/policy.json /etc/neutron/policy.json - -ln -s $NEUTRON_VENV_DIR/bin/neutron-db-manage /usr/local/bin/neutron-db-manage - -echo "neutron ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/neutron -echo "Defaults:neutron !requiretty" >> /etc/sudoers.d/neutron -chmod 0440 /etc/sudoers.d/neutron -visudo -c - -add-selinux-path-substitution /usr/bin $NEUTRON_VENV_DIR/bin diff --git a/elements/neutron/os-apply-config/etc/dnsmasq.d/only-lo b/elements/neutron/os-apply-config/etc/dnsmasq.d/only-lo deleted file mode 100644 index 10a2e4c5c..000000000 --- a/elements/neutron/os-apply-config/etc/dnsmasq.d/only-lo +++ /dev/null @@ -1,2 +0,0 @@ -interface=lo -bind-interfaces \ No newline at end of file diff --git a/elements/neutron/os-apply-config/etc/neutron/dhcp_agent.ini b/elements/neutron/os-apply-config/etc/neutron/dhcp_agent.ini deleted file mode 100644 index 1b66dd395..000000000 --- a/elements/neutron/os-apply-config/etc/neutron/dhcp_agent.ini +++ /dev/null @@ -1,28 +0,0 @@ -## NB: Unpolished config file -## This config file was taken directly from the upstream repo, and tweaked just enough to work. -## This config file has been enabled for passthrough configuration support. -[DEFAULT] -state_path = /var/run/neutron -interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver -dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq -use_namespaces = True -dhcp_domain = - -{{#neutron.dnsmasq-options}} -dnsmasq_config_file=/etc/neutron/dnsmasq/dnsmasq-neutron.conf -{{/neutron.dnsmasq-options}} - -{{#dhcp_agent}} -{{#config}} -[{{{section}}}] -{{#values}} -{{#comment}} -# {{{.}}} -{{/comment}} -{{#option}} -{{{option}}}={{{value}}} -{{/option}} -{{/values}} - -{{/config}} -{{/dhcp_agent}} diff --git a/elements/neutron/os-apply-config/etc/neutron/dnsmasq/dnsmasq-neutron.conf b/elements/neutron/os-apply-config/etc/neutron/dnsmasq/dnsmasq-neutron.conf deleted file mode 100644 index 03ca340dd..000000000 --- a/elements/neutron/os-apply-config/etc/neutron/dnsmasq/dnsmasq-neutron.conf +++ /dev/null @@ -1 +0,0 @@ -{{neutron.dnsmasq-options}} diff --git a/elements/neutron/os-apply-config/etc/neutron/l3_agent.ini b/elements/neutron/os-apply-config/etc/neutron/l3_agent.ini deleted file mode 100644 index d51292ef8..000000000 --- a/elements/neutron/os-apply-config/etc/neutron/l3_agent.ini +++ /dev/null @@ -1,33 +0,0 @@ -## NB: Unpolished config file -## This config file was taken directly from the upstream repo, and tweaked just enough to work. -## This file has been enabled for passthrough configuration support. - -[DEFAULT] -interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver - -state_path = /var/run/neutron - -auth_url = http://{{keystone.host}}:35357/v2.0 -admin_tenant_name = service -admin_user = neutron -admin_password = {{neutron.service-password}} -use_namespaces = True - -{{#neutron.agent_mode}} -agent_mode = {{neutron.agent_mode}} -{{/neutron.agent_mode}} - -{{#l3_agent}} -{{#config}} -[{{{section}}}] -{{#values}} -{{#comment}} -# {{{.}}} -{{/comment}} -{{#option}} -{{{option}}}={{{value}}} -{{/option}} -{{/values}} - -{{/config}} -{{/l3_agent}} diff --git a/elements/neutron/os-apply-config/etc/neutron/metadata_agent.ini b/elements/neutron/os-apply-config/etc/neutron/metadata_agent.ini deleted file mode 100644 index 5dd3dbe86..000000000 --- a/elements/neutron/os-apply-config/etc/neutron/metadata_agent.ini +++ /dev/null @@ -1,26 +0,0 @@ -[DEFAULT] -auth_url = http://{{keystone.host}}:35357/v2.0 -auth_region = regionOne -admin_tenant_name = service -admin_user = neutron -admin_password = {{neutron.service-password}} -metadata_proxy_shared_secret = {{neutron.metadata_proxy_shared_secret}} -nova_metadata_ip = {{nova.host}} -nova_metadata_port = 8775 - -state_path = /var/run/neutron - -{{#metadata_agent}} -{{#config}} -[{{{section}}}] -{{#values}} -{{#comment}} -# {{{.}}} -{{/comment}} -{{#option}} -{{{option}}}={{{value}}} -{{/option}} -{{/values}} - -{{/config}} -{{/metadata_agent}} diff --git a/elements/neutron/os-apply-config/etc/neutron/neutron.conf b/elements/neutron/os-apply-config/etc/neutron/neutron.conf deleted file mode 100644 index 2920c0e1e..000000000 --- a/elements/neutron/os-apply-config/etc/neutron/neutron.conf +++ /dev/null @@ -1,122 +0,0 @@ -## NB: Unpolished config file -## This config file was taken directly from the upstream repo, and tweaked just enough to work. -## It has been enabled for passthrough configuration support. - -[DEFAULT] -{{#neutron.verbose}} -# Print more verbose output (set logging level to INFO instead -# of default WARNING level). (boolean value) -verbose={{neutron.verbose}} -{{/neutron.verbose}} -{{#neutron.debug}} -# Print debugging output (set logging level to DEBUG instead -# of default WARNING level). (boolean value) -debug={{neutron.debug}} -{{/neutron.debug}} - -{{#neutron.allow_automatic_l3agent_failover}} -allow_automatic_l3agent_failover = {{neutron.allow_automatic_l3agent_failover}} -{{/neutron.allow_automatic_l3agent_failover}} - -{{#neutron.l3_ha}} -l3_ha = {{neutron.l3_ha}} -max_l3_agents_per_router = {{#neutron.max_l3_agents_per_router}}{{.}}{{/neutron.max_l3_agents_per_router}}{{^neutron.max_l3_agents_per_router}}3{{/neutron.max_l3_agents_per_router}} -min_l3_agents_per_router = {{#neutron.min_l3_agents_per_router}}{{.}}{{/neutron.min_l3_agents_per_router}}{{^neutron.min_l3_agents_per_router}}2{{/neutron.min_l3_agents_per_router}} -{{/neutron.l3_ha}} - -lock_path = /var/run/neutron/lock - -auth_strategy = keystone -allow_overlapping_ips = False -core_plugin = neutron.plugins.ml2.plugin.Ml2Plugin -service_plugins = neutron.services.l3_router.l3_router_plugin.L3RouterPlugin -nova_url = http://{{nova.host}}:8774/v2 - -nova_admin_auth_url = http://{{keystone.host}}:35357/v2.0 -nova_admin_tenant_name = service -nova_admin_password = {{nova.service-password}} -nova_admin_username = nova - - -{{#rabbit}} -rpc_backend = neutron.openstack.common.rpc.impl_kombu -rabbit_password={{password}} -{{#rabbit.host}} -rabbit_host={{.}} -{{/rabbit.host}} -{{^rabbit.host}} -rabbit_hosts={{rabbit.nodes}} -rabbit_ha_queues=true -{{/rabbit.host}} -{{/rabbit}} - -{{#qpid}} -qpid_hostname = {{host}} -qpid_username = {{username}} -qpid_password = {{password}} -rpc_backend = neutron.openstack.common.rpc.impl_qpid -{{/qpid}} - -{{#haproxy}} -{{#stunnel.connect_host}} -bind_host = {{stunnel.connect_host}} -{{/stunnel.connect_host}} -{{^stunnel.connect_host}} -bind_host = {{local-ipv4}} -{{/stunnel.connect_host}} -{{/haproxy}} - -bind_port = 9696 - -api_paste_config = api-paste.ini - -control_exchange = neutron - -notification_driver = neutron.openstack.common.notifier.rpc_notifier - - -notification_topics = notifications - -{{#neutron.dhcp_agents_per_network}} -dhcp_agents_per_network = {{neutron.dhcp_agents_per_network}} -{{/neutron.dhcp_agents_per_network}} -{{^neutron.dhcp_agents_per_network}} -dhcp_agents_per_network = 3 -{{/neutron.dhcp_agents_per_network}} - -{{#neutron.router_distributed}} -router_distributed = {{neutron.router_distributed}} -{{/neutron.router_distributed}} - -[QUOTAS] -quota_driver = neutron.db.quota_db.DbQuotaDriver - -[DEFAULT_SERVICETYPE] - -[SECURITYGROUP] - -[AGENT] -root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf - -[keystone_authtoken] -admin_tenant_name = service -admin_user = neutron -admin_password = {{neutron.service-password}} -identity_uri=http://{{keystone.host}}:35357 -signing_dir = /mnt/state/var/lib/neutron/keystone-signing -auth_uri = http://{{keystone.host}}:5000/v2.0 - -{{#neutron}} -{{#config}} -[{{{section}}}] -{{#values}} -{{#comment}} -# {{{.}}} -{{/comment}} -{{#option}} -{{{option}}} = {{{value}}} -{{/option}} -{{/values}} - -{{/config}} -{{/neutron}} diff --git a/elements/neutron/os-apply-config/etc/neutron/plugins/ml2/ml2_conf.ini b/elements/neutron/os-apply-config/etc/neutron/plugins/ml2/ml2_conf.ini deleted file mode 100644 index 39e524507..000000000 --- a/elements/neutron/os-apply-config/etc/neutron/plugins/ml2/ml2_conf.ini +++ /dev/null @@ -1,68 +0,0 @@ -[ml2] -type_drivers = local,flat,vlan,gre,vxlan -{{#neutron.mechanism_drivers}} -mechanism_drivers = {{neutron.mechanism_drivers}} -{{/neutron.mechanism_drivers}} -{{^neutron.mechanism_drivers}} -mechanism_drivers = openvswitch -{{/neutron.mechanism_drivers}} -tenant_network_types = {{neutron.ovs.tenant_network_type}} - -[ml2_type_flat] -{{#neutron.flat-networks}} -flat_networks={{neutron.flat-networks}} -{{/neutron.flat-networks}} - -[ml2_type_vlan] -network_vlan_ranges = {{neutron.ovs.network_vlan_ranges}} - -[ml2_type_gre] -{{#neutron.ovs.tunnel_id_ranges}} -tunnel_id_ranges = {{neutron.ovs.tunnel_id_ranges}} -{{/neutron.ovs.tunnel_id_ranges}} -{{^neutron.ovs.tunnel_id_ranges}} -tunnel_id_ranges = 1:1000 -{{/neutron.ovs.tunnel_id_ranges}} - -[ml2_type_vxlan] -{{#neutron.ovs.vni_ranges}} -vni_ranges = {{neutron.ovs.vni_ranges}} -{{/neutron.ovs.vni_ranges}} -{{^neutron.ovs.vni_ranges}} -vni_ranges = 1:1000 -{{/neutron.ovs.vni_ranges}} - -[database] -{{#neutron.ovs_db}} -connection = {{neutron.ovs_db}} -{{/neutron.ovs_db}} - -[ovs] -local_ip = {{neutron.ovs.local_ip}} -bridge_mappings = {{neutron.ovs.bridge_mappings}} -enable_tunneling = {{neutron.ovs.enable_tunneling}} -integration_bridge = br-int -tunnel_bridge = br-tun - -[agent] -root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf -tunnel_types = {{neutron.ovs.tunnel_types}} -{{#neutron.router_distributed}} -l2_population = {{neutron.router_distributed}} -enable_distributed_routing = {{neutron.router_distributed}} -{{/neutron.router_distributed}} - -[securitygroup] -firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver - -{{#ml2}} -{{#config}} -{{#comment}} -# {{.}} -{{/comment}} -[{{section}}] -{{#values}} -{{option}}={{value}} -{{/values}} -{{/config}} -{{/ml2}} diff --git a/elements/neutron/os-apply-config/etc/neutron/rootwrap.conf b/elements/neutron/os-apply-config/etc/neutron/rootwrap.conf deleted file mode 100644 index 4f35f0643..000000000 --- a/elements/neutron/os-apply-config/etc/neutron/rootwrap.conf +++ /dev/null @@ -1,19 +0,0 @@ -[DEFAULT] -# List of directories to load filter definitions from (separated by ','). -# These directories MUST all be only writeable by root ! -filters_path=/etc/neutron/rootwrap.d,/usr/share/neutron/rootwrap - -{{#neutron-rootwrap}} -{{#config}} -[{{{section}}}] -{{#values}} -{{#comment}} -# {{{.}}} -{{/comment}} -{{#option}} -{{{option}}}={{{value}}} -{{/option}} -{{/values}} - -{{/config}} -{{/neutron-rootwrap}} diff --git a/elements/neutron/os-refresh-config/configure.d/10-neutron-state b/elements/neutron/os-refresh-config/configure.d/10-neutron-state deleted file mode 100755 index 613d44a96..000000000 --- a/elements/neutron/os-refresh-config/configure.d/10-neutron-state +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eu - -[ -d /mnt/state/var/lib/neutron ] || install -d -D -m 0770 -o neutron -g neutron /mnt/state/var/lib/neutron -[ -d /var/run/neutron ] || install -D -m 0775 -o neutron -g neutron -d /var/run/neutron -[ -d /mnt/state/var/log/neutron ] || install -D -m 0775 -o neutron -g neutron -d /mnt/state/var/log/neutron diff --git a/elements/neutron/os-refresh-config/configure.d/20-neutron-selinux b/elements/neutron/os-refresh-config/configure.d/20-neutron-selinux deleted file mode 100755 index ad8335f1f..000000000 --- a/elements/neutron/os-refresh-config/configure.d/20-neutron-selinux +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -set -eu - -[ -x /usr/sbin/semanage ] || exit 0 - -# FIXME: Work around SELinux issues on Fedora 21 -# https://bugs.launchpad.net/tripleo/+bug/1428784 -VERSION=`lsb_release -sr` || true -[ $VERSION -eq 21 ] && exit 0 - -semanage fcontext -a -t neutron_var_lib_t "/mnt/state/var/lib/neutron(/.*)?" -restorecon -Rv /mnt/state/var/lib/neutron - -semanage fcontext -a -t neutron_var_lib_t "/var/run/neutron(/.*)?" -restorecon -Rv /var/run/neutron - -semanage fcontext -a -t neutron_log_t "/mnt/state/var/log/neutron(/.*)?" -restorecon -Rv /mnt/state/var/log/neutron diff --git a/elements/neutron/os-refresh-config/configure.d/90-neutron-db-sync b/elements/neutron/os-refresh-config/configure.d/90-neutron-db-sync deleted file mode 100755 index 20351f24e..000000000 --- a/elements/neutron/os-refresh-config/configure.d/90-neutron-db-sync +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eux - -if os-is-bootstrap-host ; then - neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head -fi diff --git a/elements/neutron/os-refresh-config/pre-configure.d/97-fedora-neutron-iptables b/elements/neutron/os-refresh-config/pre-configure.d/97-fedora-neutron-iptables deleted file mode 100755 index 2b584c840..000000000 --- a/elements/neutron/os-refresh-config/pre-configure.d/97-fedora-neutron-iptables +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -set -eu - -add-rule INPUT -p tcp --dport 9696 -j ACCEPT - -# DHCP, TFTP -add-rule INPUT -m udp -p udp --dport 69 -j ACCEPT - -# Need to allow gre where used (on overcloud) -if [ "$(os-apply-config --key neutron.ovs.tenant_network_type)" = 'gre' ] ; then - add-rule INPUT -p gre -j ACCEPT -fi - - diff --git a/elements/neutron/source-repository-neutron b/elements/neutron/source-repository-neutron deleted file mode 100644 index 3ac4c135b..000000000 --- a/elements/neutron/source-repository-neutron +++ /dev/null @@ -1 +0,0 @@ -neutron git /opt/stack/neutron https://git.openstack.org/openstack/neutron.git diff --git a/elements/nfs-client/README.md b/elements/nfs-client/README.md deleted file mode 100644 index d167e89c7..000000000 --- a/elements/nfs-client/README.md +++ /dev/null @@ -1 +0,0 @@ -Provision an image with NFS client binaries. \ No newline at end of file diff --git a/elements/nfs-client/install.d/51-nfs-utils b/elements/nfs-client/install.d/51-nfs-utils deleted file mode 100755 index 851638b42..000000000 --- a/elements/nfs-client/install.d/51-nfs-utils +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -install-packages -m nfs-client nfs_client_package diff --git a/elements/nfs-client/pkg-map b/elements/nfs-client/pkg-map deleted file mode 100644 index 096daf7a9..000000000 --- a/elements/nfs-client/pkg-map +++ /dev/null @@ -1,16 +0,0 @@ -{ - "family": { - "redhat": { - "nfs_client_package": "nfs-utils" - }, - "debian": { - "nfs_client_package": "nfs-client" - }, - "suse": { - "nfs_client_package": "nfs-client" - } - }, - "default": { - "nfs_client_package": "nfs-utils" - } -} diff --git a/elements/nfs-server/README.md b/elements/nfs-server/README.md deleted file mode 100644 index de3ff921f..000000000 --- a/elements/nfs-server/README.md +++ /dev/null @@ -1,28 +0,0 @@ -Installs and configures NFS server services. - -When added to an image this element will, depending on the -config data, create a number of NFS shares and export them to -the given list of clients with respective options. - -Shares are created in /mnt/state/var/lib/nfs - -Configuration -------------- - - nfs_server: - shares: - - name: share_name - clients: - - machine: machine_allowed - options: rw,async,no_root_squash - -**NOTE**: - -* `share_name` should be a valid POSIX dirname, special chars, spaces or -use of quotes is not supported - -* share dir created on filesystem will be owned by root/root with mode 0770 - -* `machine` is required, defines the list of allowed clients, can be repeated - -* `options` can be omitted the following are used: rw,async,no_root_squash \ No newline at end of file diff --git a/elements/nfs-server/element-deps b/elements/nfs-server/element-deps deleted file mode 100644 index a35cfdb7c..000000000 --- a/elements/nfs-server/element-deps +++ /dev/null @@ -1,4 +0,0 @@ -iptables -os-apply-config -os-refresh-config -os-svc-install diff --git a/elements/nfs-server/install.d/68-nfs-server b/elements/nfs-server/install.d/68-nfs-server deleted file mode 100755 index 1605a77b4..000000000 --- a/elements/nfs-server/install.d/68-nfs-server +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -eu - -install-packages -m nfs-server nfs_server_package diff --git a/elements/nfs-server/os-apply-config/etc/exports b/elements/nfs-server/os-apply-config/etc/exports deleted file mode 100644 index c9d10a05b..000000000 --- a/elements/nfs-server/os-apply-config/etc/exports +++ /dev/null @@ -1,3 +0,0 @@ -{{#nfs_server.shares}} -/mnt/state/var/lib/nfs/{{name}}{{#clients}} {{machine}}({{#options}}{{.}}{{/options}}{{^options}}rw,async,no_root_squash{{/options}}){{/clients}} -{{/nfs_server.shares}} \ No newline at end of file diff --git a/elements/nfs-server/os-refresh-config/post-configure.d/74-nfs-server b/elements/nfs-server/os-refresh-config/post-configure.d/74-nfs-server deleted file mode 100755 index d59b43e81..000000000 --- a/elements/nfs-server/os-refresh-config/post-configure.d/74-nfs-server +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -set -eu - -# We want to create a dir for each export in /etc/exports and -# allow valid POSIX paths only. -for share in $(grep -oE '^/[a-zA-Z0-9._-/]+' /etc/exports); do - [ -d "$share" ] || install -d -m 0770 -o root -g root "$share" -done - -# Yet exports(5) allows for # comments; unquoted paths without spaces; -# unquoted paths with octal ascii sequences; double-quoted paths with spaces. -# Parsing all formats correctly requires usage of some non trivial -# code, which we decided to avoid for now. -# Shall we decide to support that, the following code should do (thanks lxsli). -# -#CODE='import ast, os.path, re, sys -#lines = sys.stdin.readlines() -#matchers = [re.match("\"([^\"]+)\"|(\\S+)", line) for line in lines if not re.search("^\s*#", line)] -#lines = [m.group(1) or m.group(2) for m in matchers] -#paths = [ast.literal_eval("\"%s\"" % line) for line in lines] -#paths = [path for path in paths if not os.path.isdir(path)] -#print "\n".join(paths),' -#cat /etc/exports | python -c "$CODE" | xargs -i install -d -m 0770 -o root -g root "{} - -os-svc-enable -n nfs-server -os-svc-restart -n nfs-server -exportfs -a -r -v diff --git a/elements/nfs-server/os-refresh-config/pre-configure.d/97-nfs-iptables b/elements/nfs-server/os-refresh-config/pre-configure.d/97-nfs-iptables deleted file mode 100755 index 1b301a47d..000000000 --- a/elements/nfs-server/os-refresh-config/pre-configure.d/97-nfs-iptables +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -set -eu - -add-rule INPUT -m state --state NEW -m tcp -p tcp --dport 111 -j ACCEPT -add-rule INPUT -m state --state NEW -m udp -p udp --dport 111 -j ACCEPT -add-rule INPUT -m state --state NEW -m tcp -p tcp --dport 2049 -j ACCEPT -add-rule INPUT -m state --state NEW -m udp -p udp --dport 2049 -j ACCEPT -add-rule INPUT -m state --state NEW -m tcp -p tcp --dport 20048 -j ACCEPT -add-rule INPUT -m state --state NEW -m udp -p udp --dport 20048 -j ACCEPT \ No newline at end of file diff --git a/elements/nfs-server/pkg-map b/elements/nfs-server/pkg-map deleted file mode 100644 index 872cc5ee7..000000000 --- a/elements/nfs-server/pkg-map +++ /dev/null @@ -1,16 +0,0 @@ -{ - "family": { - "redhat": { - "nfs_server_package": "nfs-utils" - }, - "debian": { - "nfs_server_package": "nfs-server" - }, - "suse": { - "nfs_server_package": "nfs-kernel-server" - } - }, - "default": { - "nfs_server_package": "nfs-utils" - } -} diff --git a/elements/nova-api/README.md b/elements/nova-api/README.md deleted file mode 100644 index 1f2097f5a..000000000 --- a/elements/nova-api/README.md +++ /dev/null @@ -1,2 +0,0 @@ -Install nova API and control services. See /var/log/upstart/nova-\* -for logs. diff --git a/elements/nova-api/element-deps b/elements/nova-api/element-deps deleted file mode 100644 index d9f6094b0..000000000 --- a/elements/nova-api/element-deps +++ /dev/null @@ -1,5 +0,0 @@ -iptables -nova -nova-novncproxy -os-is-bootstrap-host -package-installs diff --git a/elements/nova-api/install.d/nova-package-install/package-installs-nova-api b/elements/nova-api/install.d/nova-package-install/package-installs-nova-api deleted file mode 100644 index cab77ea00..000000000 --- a/elements/nova-api/install.d/nova-package-install/package-installs-nova-api +++ /dev/null @@ -1,5 +0,0 @@ -openstack-nova-api -openstack-nova-cert -openstack-nova-conductor -openstack-nova-console -openstack-nova-scheduler diff --git a/elements/nova-api/install.d/nova-source-install/80-nova-api b/elements/nova-api/install.d/nova-source-install/80-nova-api deleted file mode 100755 index 00a96a6e2..000000000 --- a/elements/nova-api/install.d/nova-source-install/80-nova-api +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -set -eux - -TEMPLATE_ROOT=$(dirname $0)/../os-apply-config - -get_additional_config(){ - if [ -d ${TEMPLATE_ROOT}/etc/nova/${1} ]; then - echo "--config-dir /etc/nova/${1}" - fi -} - -NOVA_COMPONENTS="api cert scheduler consoleauth conductor" - -for component in $NOVA_COMPONENTS; do - os-svc-daemon -i "${NOVA_VENV_DIR}" nova-${component} nova nova-${component} "--config-dir /etc/nova $(get_additional_config ${component})" -done - -ln -s $NOVA_VENV_DIR/bin/nova-manage /usr/local/bin/nova-manage diff --git a/elements/nova-api/os-refresh-config/configure.d/90-nova-db-sync b/elements/nova-api/os-refresh-config/configure.d/90-nova-db-sync deleted file mode 100755 index 06ff5f433..000000000 --- a/elements/nova-api/os-refresh-config/configure.d/90-nova-db-sync +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eux - -if os-is-bootstrap-host ; then - su -s /bin/bash -c 'nova-manage db sync' nova -fi diff --git a/elements/nova-api/os-refresh-config/post-configure.d/80-nova-api b/elements/nova-api/os-refresh-config/post-configure.d/80-nova-api deleted file mode 100755 index d08ef3c62..000000000 --- a/elements/nova-api/os-refresh-config/post-configure.d/80-nova-api +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -set -eux - -# For nova-rpc-zmq-receiver -mkdir -p /var/run/openstack -# XXX Hrm, but what if others use this dir? -chown -R nova:nova /var/run/openstack - -mkdir -p /var/run/nova -chown -R nova:nova /var/run/nova - -os-svc-enable -n nova-conductor -os-svc-enable -n nova-api -os-svc-enable -n nova-cert -os-svc-enable -n nova-scheduler - -os-svc-restart -n nova-conductor -os-svc-restart -n nova-api -os-svc-restart -n nova-cert -os-svc-restart -n nova-scheduler - -# Allow for non-ha Nova components. -if os-is-bootstrap-host; then - os-svc-enable -n nova-consoleauth - os-svc-restart -n nova-consoleauth -fi diff --git a/elements/nova-api/os-refresh-config/pre-configure.d/97-nova-api-fedora-iptables b/elements/nova-api/os-refresh-config/pre-configure.d/97-nova-api-fedora-iptables deleted file mode 100755 index 91c81551a..000000000 --- a/elements/nova-api/os-refresh-config/pre-configure.d/97-nova-api-fedora-iptables +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -eu - -# nova-api, nova-api-metadata -add-rule INPUT -p tcp -m multiport --dports 8773,8774,8775 -j ACCEPT diff --git a/elements/nova-baremetal/README.md b/elements/nova-baremetal/README.md deleted file mode 100644 index 7a6a670ce..000000000 --- a/elements/nova-baremetal/README.md +++ /dev/null @@ -1,17 +0,0 @@ -Nova baremetal services ------------------------ - -Configures the nova-baremetal directories on disk and restarts the deploy -helper service in os-refresh-config. - -An iptables rule to capture incoming EC2 metadata API requests and redirect -them to the nova API is automatically added to the neutron.ovs.physical\_bridge -interface. See the neutron-openvswitch-agent for the full set of ovs parameters. -For example: - - neutron: - ovs: - physical_bridge: br-ctlplane - -In the future we may create a dedicated parameter to permit nova-baremetal to -run separately from the neutron agents in the undercloud. diff --git a/elements/nova-baremetal/element-deps b/elements/nova-baremetal/element-deps deleted file mode 100644 index 5fa7c1504..000000000 --- a/elements/nova-baremetal/element-deps +++ /dev/null @@ -1,5 +0,0 @@ -iptables -nova-compute -os-apply-config -os-is-bootstrap-host -os-refresh-config diff --git a/elements/nova-baremetal/install.d/80-pxelinux b/elements/nova-baremetal/install.d/80-pxelinux deleted file mode 100755 index 5b3e7bbb2..000000000 --- a/elements/nova-baremetal/install.d/80-pxelinux +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -set -eux - -install-packages syslinux tftpd-hpa xinetd - -mkdir -p /tftpboot/pxelinux.cfg/ -if [ -f /usr/lib/syslinux/pxelinux.0 ]; then - cp /usr/lib/syslinux/pxelinux.0 /tftpboot/ # Ubuntu -elif [ -f /usr/share/syslinux/pxelinux.0 ]; then - cp /usr/share/syslinux/pxelinux.0 /tftpboot/ # Fedora/RHEL -else - echo "Failed to find pxelinux.0." - exit 1 -fi - -# Disable the tftp-hpa upstart job, we're using xinetd -[ -f /etc/init/tftpd-hpa.conf ] && echo "manual" > /etc/init/tftpd-hpa.override - -# Disable the tftpd-hpa SysV script for the same reason -[ -f /etc/init.d/tftpd-hpa ] && update-rc.d -f tftpd-hpa disable - -cat > /etc/xinetd.d/tftp << EOF -service tftp -{ - protocol = udp - port = 69 - socket_type = dgram - wait = yes - user = root - server = /usr/sbin/in.tftpd - server_args = --map-file /tftpboot/map-file /tftpboot - disable = no -} -EOF - -# Adds support for tftp requests that don't include the directory name. -echo 'r ^([^/]) /tftpboot/\1' > /tftpboot/map-file - -os-svc-enable -n xinetd diff --git a/elements/nova-baremetal/install.d/nova-package-install/82-nova-bm-deploy-helper-link b/elements/nova-baremetal/install.d/nova-package-install/82-nova-bm-deploy-helper-link deleted file mode 100755 index 94b2b1bb5..000000000 --- a/elements/nova-baremetal/install.d/nova-package-install/82-nova-bm-deploy-helper-link +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -set -eux - -if [[ "rhel rhel7 centos7 fedora" =~ "$DISTRO_NAME" ]]; then - # This is a fix so that we can use the service file from the source install - # with our packaged nova-baremetal-deploy-helper, which is missing the service: - # https://bugzilla.redhat.com/show_bug.cgi?id=1055788 - os-svc-daemon -i "$NOVA_VENV_DIR" nova-baremetal-deploy-helper nova nova-baremetal-deploy-helper "--config-dir /etc/nova" - - mkdir -p $NOVA_VENV_DIR/bin/ - ln -s /bin/nova-baremetal-deploy-helper $NOVA_VENV_DIR/bin/nova-baremetal-deploy-helper -fi diff --git a/elements/nova-baremetal/install.d/nova-source-install/81-nova-bm-services b/elements/nova-baremetal/install.d/nova-source-install/81-nova-bm-services deleted file mode 100755 index 67bc368bb..000000000 --- a/elements/nova-baremetal/install.d/nova-source-install/81-nova-bm-services +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eux - -os-svc-daemon -i "$NOVA_VENV_DIR" nova-baremetal-deploy-helper nova nova-baremetal-deploy-helper "--config-dir /etc/nova" - -ln -s $NOVA_VENV_DIR/bin/nova-baremetal-manage /usr/local/bin/nova-baremetal-manage diff --git a/elements/nova-baremetal/os-apply-config/mnt/state/var/lib/nova/virtual-power-key b/elements/nova-baremetal/os-apply-config/mnt/state/var/lib/nova/virtual-power-key deleted file mode 100644 index 1af4d2402..000000000 --- a/elements/nova-baremetal/os-apply-config/mnt/state/var/lib/nova/virtual-power-key +++ /dev/null @@ -1 +0,0 @@ -{{nova.baremetal.virtual_power.ssh_key}} diff --git a/elements/nova-baremetal/os-refresh-config/configure.d/80-nova-baremetal b/elements/nova-baremetal/os-refresh-config/configure.d/80-nova-baremetal deleted file mode 100755 index 5e96dec91..000000000 --- a/elements/nova-baremetal/os-refresh-config/configure.d/80-nova-baremetal +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -eux - -mkdir -p /tftpboot -chown -R nova:nova /tftpboot diff --git a/elements/nova-baremetal/os-refresh-config/configure.d/81-nat-metadata b/elements/nova-baremetal/os-refresh-config/configure.d/81-nat-metadata deleted file mode 100755 index d75cd7818..000000000 --- a/elements/nova-baremetal/os-refresh-config/configure.d/81-nat-metadata +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eux - -EXTERNAL_BRIDGE=$(os-apply-config --key neutron.ovs.physical_bridge --type raw --key-default '') - -iptables -t nat -C PREROUTING -d 169.254.169.254/32 -i $EXTERNAL_BRIDGE -p tcp -m tcp --dport 80 -j REDIRECT --to-ports 8775 || iptables -t nat -I PREROUTING -d 169.254.169.254/32 -i $EXTERNAL_BRIDGE -p tcp -m tcp --dport 80 -j REDIRECT --to-ports 8775 diff --git a/elements/nova-baremetal/os-refresh-config/configure.d/82-nova-baremetal-selinux b/elements/nova-baremetal/os-refresh-config/configure.d/82-nova-baremetal-selinux deleted file mode 100755 index a1e471964..000000000 --- a/elements/nova-baremetal/os-refresh-config/configure.d/82-nova-baremetal-selinux +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -eux - -[ -x /usr/sbin/restorecon ] || exit 0 - -# /tftpboot is created in 80-nova-baremetal. -# Here we are ensuring it is labeled correctly. -restorecon -R /tftpboot \ No newline at end of file diff --git a/elements/nova-baremetal/os-refresh-config/configure.d/90-nova-baremetal-db-sync b/elements/nova-baremetal/os-refresh-config/configure.d/90-nova-baremetal-db-sync deleted file mode 100755 index a3b082632..000000000 --- a/elements/nova-baremetal/os-refresh-config/configure.d/90-nova-baremetal-db-sync +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eux - -if os-is-bootstrap-host ; then - su -s /bin/bash -c 'nova-baremetal-manage db sync' nova -fi diff --git a/elements/nova-baremetal/os-refresh-config/post-configure.d/70-enable-iscsid b/elements/nova-baremetal/os-refresh-config/post-configure.d/70-enable-iscsid deleted file mode 100755 index 328082630..000000000 --- a/elements/nova-baremetal/os-refresh-config/post-configure.d/70-enable-iscsid +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -set -eux - -DISTRO=`lsb_release -si` - -if [ "openSUSE project" = "$DISTRO" ]; then - os-svc-enable -n iscsid - os-svc-restart -n iscsid -fi diff --git a/elements/nova-baremetal/os-refresh-config/post-configure.d/80-nova-baremetal b/elements/nova-baremetal/os-refresh-config/post-configure.d/80-nova-baremetal deleted file mode 100755 index f3ba57cb1..000000000 --- a/elements/nova-baremetal/os-refresh-config/post-configure.d/80-nova-baremetal +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eux - -os-svc-enable -n nova-baremetal-deploy-helper - -os-svc-restart -n nova-baremetal-deploy-helper diff --git a/elements/nova-baremetal/os-refresh-config/pre-configure.d/97-fedora-nova-baremetal-iptables b/elements/nova-baremetal/os-refresh-config/pre-configure.d/97-fedora-nova-baremetal-iptables deleted file mode 100755 index bec1a4269..000000000 --- a/elements/nova-baremetal/os-refresh-config/pre-configure.d/97-fedora-nova-baremetal-iptables +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -eu - -# ISCSI -add-rule INPUT -p tcp --dport 10000 -j ACCEPT diff --git a/elements/nova-compute/README.md b/elements/nova-compute/README.md deleted file mode 100644 index 099a8beed..000000000 --- a/elements/nova-compute/README.md +++ /dev/null @@ -1 +0,0 @@ -Install nova compute and baremetal components. diff --git a/elements/nova-compute/element-deps b/elements/nova-compute/element-deps deleted file mode 100644 index 31c787fdd..000000000 --- a/elements/nova-compute/element-deps +++ /dev/null @@ -1 +0,0 @@ -nova diff --git a/elements/nova-compute/install.d/nova-package-install/80-nova-compute b/elements/nova-compute/install.d/nova-package-install/80-nova-compute deleted file mode 100755 index ef8994e33..000000000 --- a/elements/nova-compute/install.d/nova-package-install/80-nova-compute +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages openstack-nova-compute - -# We delete the default libvirt network to avoid a possible -# collision with the network on the seed host machine -# This is also done from the nova-kvm element, but we need to do it here as -# well, since the nova compute packages automatically pull in libvirt. -rm -f /etc/libvirt/qemu/networks/autostart/default.xml -rm -f /etc/libvirt/qemu/networks/default.xml - -os-svc-daemon -i "$NOVA_VENV_DIR" -n nova-compute -u nova diff --git a/elements/nova-compute/install.d/nova-source-install/80-nova-compute b/elements/nova-compute/install.d/nova-source-install/80-nova-compute deleted file mode 100755 index a53995b1a..000000000 --- a/elements/nova-compute/install.d/nova-source-install/80-nova-compute +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -set -eux - -# Used by all compute -install-packages bridge-utils ebtables qemu-utils syslinux - -# LIBVIRT_DEFAULT_URI needs to be set due to -# https://bugs.launchpad.net/tripleo/+bug/1226310 -CONFIG_PARAMETERS="--config-dir /etc/nova" -TEMPLATE_ROOT=$(dirname $0)/../os-apply-config - -if [ -d ${TEMPLATE_ROOT}/etc/nova/compute ]; then - CONFIG_PARAMETERS="${CONFIG_PARAMETERS} --config-dir /etc/nova/compute" -fi - -os-svc-daemon -i "$NOVA_VENV_DIR" -e "LIBVIRT_DEFAULT_URI=qemu:///system" nova-compute nova nova-compute "${CONFIG_PARAMETERS}" - - -# Use the rootwrap config from the source repo. -install -o root -g root -m 0755 -d /etc/nova/rootwrap.d -for f in $(ls /opt/stack/nova/etc/nova/rootwrap.d/); do - install -o root -g root -m 644 /opt/stack/nova/etc/nova/rootwrap.d/$f /etc/nova/rootwrap.d/$f -done -install -o root -g root -m 0644 /opt/stack/nova/etc/nova/rootwrap.conf /etc/nova/rootwrap.conf diff --git a/elements/nova-compute/os-refresh-config/post-configure.d/80-nova-compute b/elements/nova-compute/os-refresh-config/post-configure.d/80-nova-compute deleted file mode 100755 index 9b0719efe..000000000 --- a/elements/nova-compute/os-refresh-config/post-configure.d/80-nova-compute +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -eux - -modprobe nbd || true - -os-svc-enable -n nova-compute - -os-svc-restart -n nova-compute diff --git a/elements/nova-ironic/README.md b/elements/nova-ironic/README.md deleted file mode 100644 index 72def73bf..000000000 --- a/elements/nova-ironic/README.md +++ /dev/null @@ -1,4 +0,0 @@ -Nova Ironic services --------------------- - -Installs the Ironic code for Nova, both scheduler and compute. diff --git a/elements/nova-ironic/element-deps b/elements/nova-ironic/element-deps deleted file mode 100644 index c7e4fa91c..000000000 --- a/elements/nova-ironic/element-deps +++ /dev/null @@ -1,6 +0,0 @@ -ironic-api -ironic-conductor -nova-compute -os-refresh-config -package-installs -pkg-map diff --git a/elements/nova-ironic/install.d/ironic-package-install/package-installs-nova-ironic b/elements/nova-ironic/install.d/ironic-package-install/package-installs-nova-ironic deleted file mode 100644 index 97ee62fb4..000000000 --- a/elements/nova-ironic/install.d/ironic-package-install/package-installs-nova-ironic +++ /dev/null @@ -1 +0,0 @@ -nova_ironic_package diff --git a/elements/nova-ironic/install.d/ironic-source-install/81-nova-ironic-driver b/elements/nova-ironic/install.d/ironic-source-install/81-nova-ironic-driver deleted file mode 100755 index 4f7e735ed..000000000 --- a/elements/nova-ironic/install.d/ironic-source-install/81-nova-ironic-driver +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -set -eu -# Install Ironic and IronicClient in nova venv. -# TODO(NobodyCam): remove once Ironic Nova driver lands in Nova. -set +u -source $NOVA_VENV_DIR/bin/activate -set -u - -pip install /opt/stack/ironic -pip install /opt/stack/python-ironicclient - -set +u -deactivate -set -u - diff --git a/elements/nova-ironic/os-refresh-config/configure.d/81-nat-metadata b/elements/nova-ironic/os-refresh-config/configure.d/81-nat-metadata deleted file mode 100755 index 92014ebe9..000000000 --- a/elements/nova-ironic/os-refresh-config/configure.d/81-nat-metadata +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eux - -EXTERNAL_BRIDGE=$(os-apply-config --key neutron.ovs.physical_bridge --type netdevice --key-default '') - -iptables -t nat -C PREROUTING -d 169.254.169.254/32 -i $EXTERNAL_BRIDGE -p tcp -m tcp --dport 80 -j REDIRECT --to-ports 8775 || iptables -t nat -I PREROUTING -d 169.254.169.254/32 -i $EXTERNAL_BRIDGE -p tcp -m tcp --dport 80 -j REDIRECT --to-ports 8775 diff --git a/elements/nova-ironic/pkg-map b/elements/nova-ironic/pkg-map deleted file mode 100644 index 0581fb333..000000000 --- a/elements/nova-ironic/pkg-map +++ /dev/null @@ -1,5 +0,0 @@ -{ - "default": { - "nova_ironic_package": "openstack-ironic-common" - } -} diff --git a/elements/nova-kvm/README.md b/elements/nova-kvm/README.md deleted file mode 100644 index 0a23b9fe1..000000000 --- a/elements/nova-kvm/README.md +++ /dev/null @@ -1,4 +0,0 @@ -Nova Compute KVM ----------------- - -Software install and configuration hooks for Nova with KVM. diff --git a/elements/nova-kvm/element-deps b/elements/nova-kvm/element-deps deleted file mode 100644 index a6d8a3628..000000000 --- a/elements/nova-kvm/element-deps +++ /dev/null @@ -1,6 +0,0 @@ -nova-compute -os-apply-config -os-refresh-config -os-svc-install -package-installs -use-ephemeral diff --git a/elements/nova-kvm/install.d/81-nova-kvm b/elements/nova-kvm/install.d/81-nova-kvm deleted file mode 100755 index fed5aefbe..000000000 --- a/elements/nova-kvm/install.d/81-nova-kvm +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -set -eux - -# We delete the default libvirt network to avoid a possible -# collision with the network on the seed host machine -rm -f /etc/libvirt/qemu/networks/autostart/default.xml -rm -f /etc/libvirt/qemu/networks/default.xml - -register-state-path --leave-symlink /etc/libvirt/qemu - -SCRIPTDIR=$(dirname $0) - -if [ -f /etc/sysconfig/libvirtd ]; then - install -D -g root -o root -m 0755 ${SCRIPTDIR}/default_libvirtd /etc/sysconfig/libvirtd -elif [ -f /etc/default/libvirt-bin ]; then - install -D -g root -o root -m 0755 ${SCRIPTDIR}/default_libvirt_bin /etc/default/libvirt-bin -else - echo "Unsupported libvirtd/libvirt-bin configuration." - exit 1 -fi - -if [ "$DISTRO_NAME" = "rhel7" ]; then - # Without seabios-bin Nova instances fail to start - install-packages seabios-bin -fi diff --git a/elements/nova-kvm/install.d/default_libvirt_bin b/elements/nova-kvm/install.d/default_libvirt_bin deleted file mode 100644 index 242988070..000000000 --- a/elements/nova-kvm/install.d/default_libvirt_bin +++ /dev/null @@ -1,12 +0,0 @@ -# Defaults for libvirt-bin initscript (/etc/init.d/libvirt-bin) -# This is a POSIX shell fragment - -# Start libvirtd to handle qemu/kvm: -start_libvirtd="yes" - -# options passed to libvirtd, add "-l" to listen on tcp -libvirtd_opts="-d -l" - -# pass in location of kerberos keytab -#export KRB5_KTNAME=/etc/libvirt/libvirt.keytab - diff --git a/elements/nova-kvm/install.d/default_libvirtd b/elements/nova-kvm/install.d/default_libvirtd deleted file mode 100644 index 382921e9e..000000000 --- a/elements/nova-kvm/install.d/default_libvirtd +++ /dev/null @@ -1,24 +0,0 @@ -# Override the default config file -# NOTE: This setting is no longer honoured if using -# systemd. Set '--config /etc/libvirt/libvirtd.conf' -# in LIBVIRTD_ARGS instead. -#LIBVIRTD_CONFIG=/etc/libvirt/libvirtd.conf - -# Listen for TCP/IP connections -# NB. must setup TLS/SSL keys prior to using this -LIBVIRTD_ARGS="--listen" - -# Override Kerberos service keytab for SASL/GSSAPI -#KRB5_KTNAME=/etc/libvirt/krb5.tab - -# Override the QEMU/SDL default audio driver probing when -# starting virtual machines using SDL graphics -# -# NB these have no effect for VMs using VNC, unless vnc_allow_host_audio -# is enabled in /etc/libvirt/qemu.conf -#QEMU_AUDIO_DRV=sdl -# -#SDL_AUDIODRIVER=pulse - -# Override the maximum number of opened files -#LIBVIRTD_NOFILES_LIMIT=2048 diff --git a/elements/nova-kvm/install.d/nova-package-install/80-nova-kvm b/elements/nova-kvm/install.d/nova-package-install/80-nova-kvm deleted file mode 100755 index 2769d1d48..000000000 --- a/elements/nova-kvm/install.d/nova-package-install/80-nova-kvm +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -set -eux - -if ! getent group libvirtd; then - groupadd libvirtd -fi - -usermod -a -G libvirtd nova diff --git a/elements/nova-kvm/install.d/nova-source-install/80-nova-kvm b/elements/nova-kvm/install.d/nova-source-install/80-nova-kvm deleted file mode 100755 index 405d31973..000000000 --- a/elements/nova-kvm/install.d/nova-source-install/80-nova-kvm +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -set -eux - -# Fedora don't always have the libvirtd group created -if ! grep ^libvirtd /etc/group > /dev/null 2>&1; then - groupadd -f libvirtd -fi - -usermod -a -G libvirtd nova - -# On Fedora configure polkit to allow nova to use libvirt -if [ -e /etc/polkit-1/rules.d ] ; then - cat - <<-EOF > /etc/polkit-1/rules.d/50-nova.rules -// openstack-nova libvirt management permissions -polkit.addRule(function(action, subject) { - if (action.id == "org.libvirt.unix.manage" && - subject.user == "nova") { - return polkit.Result.YES; - } -}); -EOF -fi diff --git a/elements/nova-kvm/install.d/nova-source-install/package-installs-nova-kvm b/elements/nova-kvm/install.d/nova-source-install/package-installs-nova-kvm deleted file mode 100644 index b87ba50e1..000000000 --- a/elements/nova-kvm/install.d/nova-source-install/package-installs-nova-kvm +++ /dev/null @@ -1,5 +0,0 @@ -kpartx -kvm -libvirt-bin -python-libvirt -pm-utils diff --git a/elements/nova-kvm/os-apply-config/etc/libvirt/libvirtd.conf b/elements/nova-kvm/os-apply-config/etc/libvirt/libvirtd.conf deleted file mode 100644 index 11b4fd443..000000000 --- a/elements/nova-kvm/os-apply-config/etc/libvirt/libvirtd.conf +++ /dev/null @@ -1,9 +0,0 @@ -# Minimal libvirtd config for kvm nova-compute nodes. - -unix_sock_group = "libvirtd" -unix_sock_rw_perms = "0770" -auth_unix_ro = "none" -auth_unix_rw = "none" -auth_tcp = "none" -listen_tls = 0 -listen_tcp = 1 diff --git a/elements/nova-kvm/os-refresh-config/configure.d/80-nova-kvm b/elements/nova-kvm/os-refresh-config/configure.d/80-nova-kvm deleted file mode 100755 index 7a99a0a25..000000000 --- a/elements/nova-kvm/os-refresh-config/configure.d/80-nova-kvm +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -eux - -mkdir -p /mnt/state/var/lib/nova/instances/_base -chown nova:kvm /mnt/state/var/lib/nova/instances -chown nova:kvm /mnt/state/var/lib/nova/instances/_base -chmod 750 /mnt/state/var/lib/nova/instances -chmod 750 /mnt/state/var/lib/nova/instances/_base diff --git a/elements/nova-kvm/os-refresh-config/post-configure.d/80-libvirt-bin b/elements/nova-kvm/os-refresh-config/post-configure.d/80-libvirt-bin deleted file mode 100755 index 8af4d36ef..000000000 --- a/elements/nova-kvm/os-refresh-config/post-configure.d/80-libvirt-bin +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -eux - -os-svc-restart -n libvirt-bin diff --git a/elements/nova-kvm/os-refresh-config/pre-configure.d/98-nova-iptables b/elements/nova-kvm/os-refresh-config/pre-configure.d/98-nova-iptables deleted file mode 100755 index 7de418391..000000000 --- a/elements/nova-kvm/os-refresh-config/pre-configure.d/98-nova-iptables +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -eu - -# nova live migration -add-rule INPUT -p tcp --dport 16509 -j ACCEPT diff --git a/elements/nova-novncproxy/README.md b/elements/nova-novncproxy/README.md deleted file mode 100644 index 910937355..000000000 --- a/elements/nova-novncproxy/README.md +++ /dev/null @@ -1,8 +0,0 @@ -Install nova-novncproxy along with the necessary components from noVNC. - -Configuration (via the nova element) -------------- - -When using VNC be sure to set nova.public_ip (providated via the nova element). -This is used to specify the novncproxy_base_url for external proxy connections -and is typically configured on controller nodes. diff --git a/elements/nova-novncproxy/cleanup.d/50-remove-source-novnc b/elements/nova-novncproxy/cleanup.d/50-remove-source-novnc deleted file mode 100755 index 395c9d6b3..000000000 --- a/elements/nova-novncproxy/cleanup.d/50-remove-source-novnc +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eu - -sudo rm -fr "${TMP_MOUNT_PATH}/opt/stack/novnc" diff --git a/elements/nova-novncproxy/element-deps b/elements/nova-novncproxy/element-deps deleted file mode 100644 index d492ce3ca..000000000 --- a/elements/nova-novncproxy/element-deps +++ /dev/null @@ -1,2 +0,0 @@ -nova -package-installs diff --git a/elements/nova-novncproxy/install.d/novnc-package-install/package-installs-nova-novncproxy b/elements/nova-novncproxy/install.d/novnc-package-install/package-installs-nova-novncproxy deleted file mode 100644 index 6830660ed..000000000 --- a/elements/nova-novncproxy/install.d/novnc-package-install/package-installs-nova-novncproxy +++ /dev/null @@ -1,2 +0,0 @@ -novnc -openstack-nova-novncproxy diff --git a/elements/nova-novncproxy/install.d/novnc-source-install/50-install-novnc b/elements/nova-novncproxy/install.d/novnc-source-install/50-install-novnc deleted file mode 100755 index 2195253bc..000000000 --- a/elements/nova-novncproxy/install.d/novnc-source-install/50-install-novnc +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -set -ex - -os-svc-daemon -i "$NOVA_VENV_DIR" nova-novncproxy nova nova-novncproxy "--config-dir /etc/nova" - -# nova-novncproxy looks in /usr/share/novnc by default -install -d -m 0755 -o root -g root /usr/share/novnc -install -m 0644 -o root -g root /opt/stack/novnc/favicon.ico /usr/share/novnc -install -m 0644 -o root -g root /opt/stack/novnc/*.html /usr/share/novnc -install -d -m 0755 -o root -g root /usr/share/novnc/include -install -m 0644 -o root -g root /opt/stack/novnc/include/*.css /usr/share/novnc/include -install -m 0644 -o root -g root /opt/stack/novnc/include/*.js /usr/share/novnc/include diff --git a/elements/nova-novncproxy/os-refresh-config/post-configure.d/81-nova-novncproxy b/elements/nova-novncproxy/os-refresh-config/post-configure.d/81-nova-novncproxy deleted file mode 100755 index 585664b65..000000000 --- a/elements/nova-novncproxy/os-refresh-config/post-configure.d/81-nova-novncproxy +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -eux - -os-svc-enable -n nova-novncproxy -os-svc-restart -n nova-novncproxy diff --git a/elements/nova-novncproxy/os-refresh-config/pre-configure.d/98-nova-novncproxy-fedora-iptables b/elements/nova-novncproxy/os-refresh-config/pre-configure.d/98-nova-novncproxy-fedora-iptables deleted file mode 100755 index c34d244bf..000000000 --- a/elements/nova-novncproxy/os-refresh-config/pre-configure.d/98-nova-novncproxy-fedora-iptables +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eu - -# open default port for nova-novncproxy connections -add-rule INPUT -p tcp -m multiport --dports 6080 -j ACCEPT -add-rule INPUT -p tcp -m multiport --dports 5900:5999 -j ACCEPT diff --git a/elements/nova-novncproxy/source-repository-novnc b/elements/nova-novncproxy/source-repository-novnc deleted file mode 100644 index 0e75ae410..000000000 --- a/elements/nova-novncproxy/source-repository-novnc +++ /dev/null @@ -1 +0,0 @@ -novnc git /opt/stack/novnc https://github.com/kanaka/noVNC.git diff --git a/elements/nova/README.md b/elements/nova/README.md deleted file mode 100644 index d37740ddd..000000000 --- a/elements/nova/README.md +++ /dev/null @@ -1,42 +0,0 @@ -Install and configure Nova. - -Configuration -------------- - - nova: - verbose: False - - Print more verbose output (set logging level to INFO instead of default WARNING level). - debug: False - - Print debugging output (set logging level to DEBUG instead of default WARNING level). - baremetal: - pxe_deploy_timeout: "1200" - - the duration in seconds for pxe deployment timeouts. - virtual_power: - type: "virsh" - - what virtual power driver to use. "virsh" or "vbox" - compute_libvirt_type: "qemu" - - what libvirt compute type. Unset will use the nova default. - image_cache_manager_interval: - - Number of seconds to wait between runs of the image cache manager. - resize_fs_using_block_device: BoolOpt - - Attempt to resize the filesystem by accessing the image over a block device. - resume_guests_state_on_host_boot: BoolOpt - - Whether to start guests that were running before the host rebooted. - running_deleted_instance_action: - - Action to take if a running deleted instance is detected. - Valid options are: 'noop', 'log', 'shutdown', or 'reap'. - Set to 'noop' to take no action. - virt_mkfs: - - Name of the mkfs commands for ephemeral device. - The format is = - e.g. 'linux-ext4=mkfs -t ext4 -F -L %(fs_label)s %(target)s' - compute_manager: "ironic.nova.compute.manager.ClusterComputeManager" - - set to override the compute manager class used by Nova-Compute. - scheduler_host_manager: "nova.scheduler.ironic_host_manager.IronicHostManager" - - set to override the scheduler host manager used by Nova. If no - scheduler_host_manager is configured it is automatically set to - the deprecated Nova baremetal and/or the old in-tree Ironic - compute driver for Nova. - public_ip: - - public IP address (if any) assigned to this node. Used for VNC proxy - connections so this is typically only required on controller nodes. diff --git a/elements/nova/cleanup.d/50-remove-source-nova b/elements/nova/cleanup.d/50-remove-source-nova deleted file mode 100755 index c9bd2ccbf..000000000 --- a/elements/nova/cleanup.d/50-remove-source-nova +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -eu - -sudo rm -fr "${TMP_MOUNT_PATH}/opt/stack/nova" -sudo rm -fr "${TMP_MOUNT_PATH}/opt/stack/python-glanceclient" diff --git a/elements/nova/element-deps b/elements/nova/element-deps deleted file mode 100644 index 0af028333..000000000 --- a/elements/nova/element-deps +++ /dev/null @@ -1,5 +0,0 @@ -os-apply-config -os-refresh-config -os-svc-install -selinux -source-repositories diff --git a/elements/nova/environment.d/10-nova-venv-dir.bash b/elements/nova/environment.d/10-nova-venv-dir.bash deleted file mode 100644 index f1005727a..000000000 --- a/elements/nova/environment.d/10-nova-venv-dir.bash +++ /dev/null @@ -1,7 +0,0 @@ -if [ -z "${NOVA_VENV_DIR:-}" ]; then - export NOVA_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/nova"} -fi -if [ -z "${NOVA_EXTRA_INSTALL_OPTS:-}" ]; then - # use -s to enable --system-site-packages in the virtualenv - export NOVA_EXTRA_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-"-s"} -fi diff --git a/elements/nova/install.d/nova-source-install/74-nova b/elements/nova/install.d/nova-source-install/74-nova deleted file mode 100755 index d7b8c8533..000000000 --- a/elements/nova/install.d/nova-source-install/74-nova +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -set -eux - -install-packages build-essential python-dev libssl-dev libxml2-dev libxslt-dev libffi-dev - -# -s enables system-site-packages explicitly for python-libvirt -os-svc-install $NOVA_EXTRA_INSTALL_OPTS -i "$NOVA_VENV_DIR" -u nova -r /opt/stack/nova - -cp /opt/stack/nova/etc/nova/policy.json /etc/nova/policy.json -cp /opt/stack/nova/etc/nova/api-paste.ini /etc/nova/api-paste.ini -cp -a /opt/stack/nova/etc/nova/rootwrap* /etc/nova -chown -R root.nova /etc/nova - -ln -sf $NOVA_VENV_DIR/bin/nova-rootwrap /usr/local/bin/nova-rootwrap - -echo "nova ALL=(root) NOPASSWD: /usr/local/bin/nova-rootwrap" > /etc/sudoers.d/nova -chmod 0440 /etc/sudoers.d/nova -visudo -c - -add-selinux-path-substitution /usr/bin $NOVA_VENV_DIR/bin diff --git a/elements/nova/os-apply-config/etc/nova/api/nova-api.conf b/elements/nova/os-apply-config/etc/nova/api/nova-api.conf deleted file mode 100644 index b79dbff6e..000000000 --- a/elements/nova/os-apply-config/etc/nova/api/nova-api.conf +++ /dev/null @@ -1,14 +0,0 @@ -{{#nova}} -{{#api_config}} -[{{{section}}}] -{{#values}} -{{#comment}} -# {{{.}}} -{{/comment}} -{{#option}} -{{{option}}}={{{value}}} -{{/option}} -{{/values}} - -{{/api_config}} -{{/nova}} diff --git a/elements/nova/os-apply-config/etc/nova/cert/nova-cert.conf b/elements/nova/os-apply-config/etc/nova/cert/nova-cert.conf deleted file mode 100644 index fc118e66a..000000000 --- a/elements/nova/os-apply-config/etc/nova/cert/nova-cert.conf +++ /dev/null @@ -1,14 +0,0 @@ -{{#nova}} -{{#cert_config}} -[{{{section}}}] -{{#values}} -{{#comment}} -# {{{.}}} -{{/comment}} -{{#option}} -{{{option}}}={{{value}}} -{{/option}} -{{/values}} - -{{/cert_config}} -{{/nova}} diff --git a/elements/nova/os-apply-config/etc/nova/compute/nova-compute.conf b/elements/nova/os-apply-config/etc/nova/compute/nova-compute.conf deleted file mode 100644 index 211dbea3f..000000000 --- a/elements/nova/os-apply-config/etc/nova/compute/nova-compute.conf +++ /dev/null @@ -1,14 +0,0 @@ -{{#nova}} -{{#compute_config}} -[{{{section}}}] -{{#values}} -{{#comment}} -# {{{.}}} -{{/comment}} -{{#option}} -{{{option}}}={{{value}}} -{{/option}} -{{/values}} - -{{/compute_config}} -{{/nova}} diff --git a/elements/nova/os-apply-config/etc/nova/conductor/nova-conductor.conf b/elements/nova/os-apply-config/etc/nova/conductor/nova-conductor.conf deleted file mode 100644 index 0a33df18d..000000000 --- a/elements/nova/os-apply-config/etc/nova/conductor/nova-conductor.conf +++ /dev/null @@ -1,14 +0,0 @@ -{{#nova}} -{{#conductor_config}} -[{{{section}}}] -{{#values}} -{{#comment}} -# {{{.}}} -{{/comment}} -{{#option}} -{{{option}}}={{{value}}} -{{/option}} -{{/values}} - -{{/conductor_config}} -{{/nova}} diff --git a/elements/nova/os-apply-config/etc/nova/consoleauth/nova-consoleauth.conf b/elements/nova/os-apply-config/etc/nova/consoleauth/nova-consoleauth.conf deleted file mode 100644 index e04e163c4..000000000 --- a/elements/nova/os-apply-config/etc/nova/consoleauth/nova-consoleauth.conf +++ /dev/null @@ -1,14 +0,0 @@ -{{#nova}} -{{#consoleauth_config}} -[{{{section}}}] -{{#values}} -{{#comment}} -# {{{.}}} -{{/comment}} -{{#option}} -{{{option}}}={{{value}}} -{{/option}} -{{/values}} - -{{/consoleauth_config}} -{{/nova}} diff --git a/elements/nova/os-apply-config/etc/nova/nova.conf b/elements/nova/os-apply-config/etc/nova/nova.conf deleted file mode 100644 index 598d6a841..000000000 --- a/elements/nova/os-apply-config/etc/nova/nova.conf +++ /dev/null @@ -1,253 +0,0 @@ -## NB: Unpolished config file -## This config file was taken directly from the upstream repo, and tweaked just enough to work. -## It has not been audited to ensure that everything present is either Heat controlled or a mandatory as-is setting. -## Please submit patches for any setting that should be deleted or Heat-configurable. -## https://git.openstack.org/cgit/openstack/tripleo-image-elements - - -[DEFAULT] -{{#nova.verbose}} -# Print more verbose output (set logging level to INFO instead -# of default WARNING level). (boolean value) -verbose={{nova.verbose}} -{{/nova.verbose}} -{{#nova.debug}} -# Print debugging output (set logging level to DEBUG instead -# of default WARNING level). (boolean value) -debug={{nova.debug}} -{{/nova.debug}} - -{{#nova.baremetal}} -# Scheduler will always pick node with less ram first. When we will have -# exact match, this will not be needed. -ram_weight_multiplier=-1.0 -{{/nova.baremetal}} - -s3_host={{keystone.host}} -ec2_dmz_host={{keystone.host}} -ec2_url=http://{{nova.host}}:8773/services/Cloud - -{{#local-ipv4}} -my_ip={{local-ipv4}} -{{/local-ipv4}} -{{#haproxy}} -{{#stunnel.connect_host}} -osapi_compute_listen={{stunnel.connect_host}} -ec2_listen={{stunnel.connect_host}} -metadata_listen={{stunnel.connect_host}} -{{/stunnel.connect_host}} -{{^stunnel.connect_host}} -osapi_compute_listen={{local-ipv4}} -ec2_listen={{local-ipv4}} -metadata_listen={{local-ipv4}} -{{/stunnel.connect_host}} -{{/haproxy}} - -{{#nova.default_ephemeral_format}} -default_ephemeral_format={{.}} -{{/nova.default_ephemeral_format}} - -state_path=/mnt/state/var/lib/nova -lock_path=/mnt/state/var/lib/nova -keys_path=/mnt/state/var/lib/nova/keys - -api_paste_config=/etc/nova/api-paste.ini - -# Auth -auth_strategy=keystone -keystone_ec2_url=http://{{keystone.host}}:5000/v2.0/ec2tokens - -# VNC configuration -{{#nova.public_ip}} -{{#stunnel.connect_host}} -novncproxy_base_url=https://{{nova.public_ip}}:6080/vnc_auto.html -{{/stunnel.connect_host}} -{{^stunnel.connect_host}} -novncproxy_base_url=http://{{nova.public_ip}}:6080/vnc_auto.html -{{/stunnel.connect_host}} -{{/nova.public_ip}} -novncproxy_port=6080 -{{#haproxy}} -{{#stunnel.connect_host}} -novncproxy_host={{stunnel.connect_host}} -{{/stunnel.connect_host}} -{{^stunnel.connect_host}} -novncproxy_host={{local-ipv4}} -{{/stunnel.connect_host}} -{{/haproxy}} -vncserver_proxyclient_address={{local-ipv4}} -vncserver_listen=0.0.0.0 - -# Networking # -{{#nova.default_floating_pool}} -default_floating_pool={{nova.default_floating_pool}} -{{/nova.default_floating_pool}} -network_api_class=nova.network.neutronv2.api.API -linuxnet_interface_driver=nova.network.linux_net.LinuxOVSInterfaceDriver -dhcp_domain= -dhcpbridge_flagfile=/etc/nova/nova.conf -dhcpbridge=/usr/bin/nova-dhcpbridge - -rootwrap_config=/etc/nova/rootwrap.conf -security_group_api=neutron -firewall_driver=nova.virt.firewall.NoopFirewallDriver - -# Cinder # -volume_api_class=nova.volume.cinder.API - -{{#rabbit}} -rabbit_password={{password}} -rpc_backend=nova.openstack.common.rpc.impl_kombu -{{#rabbit.host}} -rabbit_host={{.}} -{{/rabbit.host}} -{{^rabbit.host}} -rabbit_hosts={{rabbit.nodes}} -rabbit_ha_queues=true -{{/rabbit.host}} -{{/rabbit}} - -{{#qpid}} -qpid_hostname={{host}} -qpid_username={{username}} -qpid_password={{password}} -rpc_backend=nova.openstack.common.rpc.impl_qpid -{{/qpid}} - -enabled_apis = ec2,osapi_compute,metadata,openstack_compute_api_v2 - -compute_driver = {{nova.compute_driver}} - -{{#nova.compute_manager}} -compute_manager = {{.}} -{{/nova.compute_manager}} -{{#nova.image_cache_manager_interval}} -image_cache_manager_interval= {{nova.image_cache_manager_interval}} -{{/nova.image_cache_manager_interval}} -{{#nova.resize_fs_using_block_device}} -resize_fs_using_block_device = {{nova.resize_fs_using_block_device}} -{{/nova.resize_fs_using_block_device}} -{{#nova.resume_guests_state_on_host_boot}} -resume_guests_state_on_host_boot = {{nova.resume_guests_state_on_host_boot}} -{{/nova.resume_guests_state_on_host_boot}} -{{#nova.running_deleted_instance_action}} -running_deleted_instance_action = {{nova.running_deleted_instance_action}} -{{/nova.running_deleted_instance_action}} -{{#nova.virt_mkfs}} -virt_mkfs = {{nova.virt_mkfs}} -{{/nova.virt_mkfs}} - -# nova-compute configuration for ceilometer -{{#ceilometer.compute_agent}} -instance_usage_audit=True -instance_usage_audit_period=hour -notify_on_state_change=vm_and_task_state -notification_driver=nova.openstack.common.notifier.rpc_notifier -notification_driver=ceilometer.compute.nova_notifier -{{/ceilometer.compute_agent}} - -{{#nova.compute_hostname}} -# Override the service hostname - used for the seed node where no metadata -# source is supplying hostnames - see seed-stack-config's config.json. -host={{nova.compute_hostname}} -{{/nova.compute_hostname}} - -{{#nova.tuning}} -ram_allocation_ratio = {{ram_allocation_ratio}} -reserved_host_memory_mb = {{reserved_host_memory_mb}} -{{/nova.tuning}} - -{{#nova.scheduler_host_manager}} -scheduler_host_manager = {{.}} -{{/nova.scheduler_host_manager}} -{{^nova.scheduler_host_manager}} -# scheduler_host_manager isn't explicitly set so we set it accordingly -{{#ironic}} -scheduler_host_manager = ironic.nova.scheduler.ironic_host_manager.IronicHostManager -{{/ironic}} -{{#nova.baremetal}} -scheduler_host_manager = nova.scheduler.baremetal_host_manager.BaremetalHostManager -{{/nova.baremetal}} -{{/nova.scheduler_host_manager}} - -[database] -{{#nova.db}} -connection={{nova.db}} -{{/nova.db}} - -[neutron] -url=http://{{neutron.host}}:9696 -auth_strategy=keystone -admin_username=neutron -admin_tenant_name=service -admin_password={{neutron.service-password}} -admin_auth_url=http://{{keystone.host}}:35357/v2.0 -service_metadata_proxy={{nova.metadata-proxy}} -{{#neutron.metadata_proxy_shared_secret}} -metadata_proxy_shared_secret={{neutron.metadata_proxy_shared_secret}} -{{/neutron.metadata_proxy_shared_secret}} - -[glance] -api_servers={{glance.protocol}}://{{glance.host}}:{{glance.port}} - -{{#nova.baremetal}} -[baremetal] -sql_connection = {{db}} -tftp_root = /tftpboot -flavor_extra_specs = cpu_arch:{{arch}} - -driver = nova.virt.baremetal.pxe.PXE -pxe_network_config=True -pxe_deploy_timeout={{pxe_deploy_timeout}} -power_manager = {{power_manager}} -{{#virtual_power}} -virtual_power_host_user={{user}} -virtual_power_host_key=/mnt/state/var/lib/nova/virtual-power-key -virtual_power_ssh_host={{ssh_host}} -virtual_power_type={{type}} -{{/virtual_power}} -{{/nova.baremetal}} - -[osapi_v3] -enabled = True - -[keystone_authtoken] -admin_password = {{nova.service-password}} -admin_tenant_name = service -admin_user = nova -identity_uri=http://{{keystone.host}}:35357 -signing_dir = /tmp/keystone-signing-nova -auth_uri = http://{{keystone.host}}:5000/v2.0 -cafile = /etc/ssl/certs/ca-certificates.crt - -{{#ironic}} -[ironic] -admin_username = ironic -admin_password = {{ironic.service-password}} -admin_url = http://{{keystone.host}}:35357/v2.0 -admin_tenant_name = service -{{/ironic}} - -[libvirt] -{{#nova.compute_libvirt_type}} -virt_type={{nova.compute_libvirt_type}} -{{/nova.compute_libvirt_type}} -block_migration_flag=VIR_MIGRATE_LIVE,VIR_MIGRATE_TUNNELLED,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_NON_SHARED_INC,VIR_MIGRATE_UNDEFINE_SOURCE - -[ssl] -ca_file = /etc/ssl/certs/ca-certificates.crt - -{{#nova}} -{{#config}} -[{{{section}}}] -{{#values}} -{{#comment}} -# {{{.}}} -{{/comment}} -{{#option}} -{{{option}}}={{{value}}} -{{/option}} -{{/values}} - -{{/config}} -{{/nova}} diff --git a/elements/nova/os-apply-config/etc/nova/scheduler/nova-scheduler.conf b/elements/nova/os-apply-config/etc/nova/scheduler/nova-scheduler.conf deleted file mode 100644 index 7f32f5f19..000000000 --- a/elements/nova/os-apply-config/etc/nova/scheduler/nova-scheduler.conf +++ /dev/null @@ -1,14 +0,0 @@ -{{#nova}} -{{#scheduler_config}} -[{{{section}}}] -{{#values}} -{{#comment}} -# {{{.}}} -{{/comment}} -{{#option}} -{{{option}}}={{{value}}} -{{/option}} -{{/values}} - -{{/scheduler_config}} -{{/nova}} diff --git a/elements/nova/os-refresh-config/configure.d/10-nova-state b/elements/nova/os-refresh-config/configure.d/10-nova-state deleted file mode 100755 index 72a773546..000000000 --- a/elements/nova/os-refresh-config/configure.d/10-nova-state +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -ue - -[ -d /mnt/state/var/lib/nova ] && exit 0 -install -D -d -o nova -g nova -m 0775 /mnt/state/var/lib/nova -[ -d /mnt/state/var/log/nova ] && exit 0 -install -D -d -o nova -g nova -m 0775 /mnt/state/var/log/nova diff --git a/elements/nova/os-refresh-config/configure.d/20-nova-selinux b/elements/nova/os-refresh-config/configure.d/20-nova-selinux deleted file mode 100755 index 5eb322bbf..000000000 --- a/elements/nova/os-refresh-config/configure.d/20-nova-selinux +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -set -eu - -[ -x /usr/sbin/semanage ] || exit 0 - -semanage fcontext -a -t nova_var_lib_t "/mnt/state/var/lib/nova(/.*)?" -restorecon -Rv /mnt/state/var/lib/nova - -semanage fcontext -a -t nova_log_t "/mnt/state/var/log/nova(/.*)?" -restorecon -Rv /mnt/state/var/log/nova diff --git a/elements/nova/pre-install.d/00-nova-disable-requiretty b/elements/nova/pre-install.d/00-nova-disable-requiretty deleted file mode 100755 index fc199d836..000000000 --- a/elements/nova/pre-install.d/00-nova-disable-requiretty +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -e - -if [ -d /etc/sudoers.d ]; then - echo "Defaults:nova !requiretty" > /etc/sudoers.d/nova-notty - chmod 0440 /etc/sudoers.d/nova-notty - visudo -c -fi diff --git a/elements/nova/source-repository-nova b/elements/nova/source-repository-nova deleted file mode 100644 index 60ce3d32b..000000000 --- a/elements/nova/source-repository-nova +++ /dev/null @@ -1 +0,0 @@ -nova git /opt/stack/nova https://git.openstack.org/openstack/nova.git diff --git a/elements/nscd/README.md b/elements/nscd/README.md deleted file mode 100644 index e85e9be89..000000000 --- a/elements/nscd/README.md +++ /dev/null @@ -1,5 +0,0 @@ -Add nscd to built images -======================== - -This element adds nscd to the image. The nscd daemon caches name service -lookups (including NIS+ and DNS). diff --git a/elements/nscd/install.d/90-nscd b/elements/nscd/install.d/90-nscd deleted file mode 100755 index 69d40fe2d..000000000 --- a/elements/nscd/install.d/90-nscd +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# dib-lint: disable=setpipefail -# Copyright 2014 Hewlett-Packard Development Company, L.P. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -set -eux - -install-packages nscd - diff --git a/elements/openstack-clients/README.md b/elements/openstack-clients/README.md deleted file mode 100644 index 96910c97f..000000000 --- a/elements/openstack-clients/README.md +++ /dev/null @@ -1,12 +0,0 @@ -Pip install OpenStack python- client tools. - -The element will install OpenStack python-*clients. -This element is intended to to allow other elements who require client tools -access to installing them in a uniform way. - -Installed clients are: - python-glanceclient - python-heatclient - python-keystone - python-neutronclient - python-novaclient diff --git a/elements/openstack-clients/bin/install-openstack-client b/elements/openstack-clients/bin/install-openstack-client deleted file mode 100755 index c15c927d6..000000000 --- a/elements/openstack-clients/bin/install-openstack-client +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash - -set -eux - -function usage() { - echo "options:" - echo " -h show usage and exit" - echo " -c client bin name" - echo " -i Optional: installation directory for the virtualenv." - echo " If not specified defaults to /opt/stack/venv/python-client" - echo " -s enable --system-site-packages in the virtualenv." - exit $1 -} - -client="" -install_dir="" -system_site_packages="False" - - -nshift=0 -while getopts "hsi:c:" opt; do - case "$opt" in - c) client=$OPTARG;; - i) install_dir=$OPTARG;; - s) system_site_packages="True";; - h) usage 0;; - \?) usage 1;; - :) usage 1;; - esac -done - -if [[ -z "$client" ]]; then - echo "missing required 'client' parameter" - exit 1 -fi - -repo=python-${client}client -if [ -z "$install_dir" ]; then - install_dir="/opt/stack/venvs/$repo" -fi - -# We would like to use --system-site-packages here but if requirements.txt -# contains libraries that are installed globally with versions that don't -# satisfy our requirements.txt, we end up using the incorrect global library. -# Because the global site-packages appears first in sys.path -# TODO : Add this back in when we are using virtualenv >= 1.11 - -SITE_PCKGS="--no-site-packages" -if [ $system_site_packages == "True" ]; then - SITE_PCKGS="--system-site-packages" -fi - -virtualenv $SITE_PCKGS $install_dir -set +u -source $install_dir/bin/activate -set -u - -pushd /opt/stack/$repo -client_manifest=$(get-pip-manifest ${repo}) -if [ -n "$client_manifest" ]; then - use-pip-manifest $client_manifest -else - # Need setuptools>=1.0 to manage connections when - # downloading from pypi using http_proxy and https_proxy - pip install -U 'setuptools>=1.0' - - # bug #1293812 : Avoid easy_install triggering on pbr. - pip install -U 'pbr>=0.11,<2.0' - - if [ -e requirements.txt ]; then - pip install -r requirements.txt - elif [ -e tools/pip-requires ]; then - pip install -r tools/pip-requires - fi -fi - -# Always replay this, as we cannot use the entry this would generate in the manifest -pip install . - -# Write the manifest of what was installed -write-pip-manifest $repo - -ln -s $install_dir/bin/$client /usr/local/bin/$client -popd - -set +u -deactivate -set -u diff --git a/elements/openstack-clients/cleanup.d/50-remove-source-openstack-clients b/elements/openstack-clients/cleanup.d/50-remove-source-openstack-clients deleted file mode 100755 index 87867a715..000000000 --- a/elements/openstack-clients/cleanup.d/50-remove-source-openstack-clients +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -set -eu - -sudo rm -fr "${TMP_MOUNT_PATH}/opt/stack/python-openstackclient" -sudo rm -fr "${TMP_MOUNT_PATH}/opt/stack/python-ceilometerclient" -sudo rm -fr "${TMP_MOUNT_PATH}/opt/stack/python-cinderclient" -sudo rm -fr "${TMP_MOUNT_PATH}/opt/stack/python-glanceclient" -sudo rm -fr "${TMP_MOUNT_PATH}/opt/stack/python-heatclient" -sudo rm -fr "${TMP_MOUNT_PATH}/opt/stack/python-ironicclient" -sudo rm -fr "${TMP_MOUNT_PATH}/opt/stack/python-neutronclient" -sudo rm -fr "${TMP_MOUNT_PATH}/opt/stack/python-novaclient" -sudo rm -fr "${TMP_MOUNT_PATH}/opt/stack/python-swiftclient" diff --git a/elements/openstack-clients/element-deps b/elements/openstack-clients/element-deps deleted file mode 100644 index 2f9e5a525..000000000 --- a/elements/openstack-clients/element-deps +++ /dev/null @@ -1,4 +0,0 @@ -pip-and-virtualenv -pip-manifest -selinux -source-repositories diff --git a/elements/openstack-clients/environment.d/10-openstack-clients-venv-dir.bash b/elements/openstack-clients/environment.d/10-openstack-clients-venv-dir.bash deleted file mode 100755 index 741c9ba6f..000000000 --- a/elements/openstack-clients/environment.d/10-openstack-clients-venv-dir.bash +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/bash -set -ue - -# ceilometerclient -if [ -z "${CEILOMETERCLIENT_VENV_DIR:-}" ]; then - export CEILOMETERCLIENT_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/python-ceilometerclient"} -fi -if [ -z "${CEILOMETERCLIENT_EXTRA_INSTALL_OPTS:-}" ]; then - export CEILOMETERCLIENT_EXTRA_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-""} -fi - -# cinderclient -if [ -z "${CINDERCLIENT_VENV_DIR:-}" ]; then - export CINDERCLIENT_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/python-cinderclient"} -fi -if [ -z "${CINDERCLIENT_EXTRA_INSTALL_OPTS:-}" ]; then - export CINDERCLIENT_EXTRA_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-""} -fi - -# glanceclient -if [ -z "${GLANCECLIENT_VENV_DIR:-}" ]; then - export GLANCECLIENT_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/python-glanceclient"} -fi -if [ -z "${GLANCECLIENT_EXTRA_INSTALL_OPTS:-}" ]; then - export GLANCECLIENT_EXTRA_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-""} -fi - -# heatclient -if [ -z "${HEATCLIENT_VENV_DIR:-}" ]; then - export HEATCLIENT_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/python-heatclient"} -fi -if [ -z "${HEATCLIENT_EXTRA_INSTALL_OPTS:-}" ]; then - export HEATCLIENT_EXTRA_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-""} -fi - -# ironicclient -if [ -z "${IRONICCLIENT_VENV_DIR:-}" ]; then - export IRONICCLIENT_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/python-ironicclient"} -fi -if [ -z "${IRONICCLIENT_EXTRA_INSTALL_OPTS:-}" ]; then - export IRONICCLIENT_EXTRA_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-""} -fi - -# neutronclient -if [ -z "${NEUTRONCLIENT_VENV_DIR:-}" ]; then - export NEUTRONCLIENT_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/python-neutronclient"} -fi -if [ -z "${NEUTRONCLIENT_EXTRA_INSTALL_OPTS:-}" ]; then - export NEUTRONCLIENT_EXTRA_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-""} -fi - -# novaclient -if [ -z "${NOVACLIENT_VENV_DIR:-}" ]; then - export NOVACLIENT_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/python-novaclient"} -fi -if [ -z "${NOVACLIENT_EXTRA_INSTALL_OPTS:-}" ]; then - export NOVACLIENT_EXTRA_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-""} -fi - -# swiftclient -if [ -z "${SWIFTCLIENT_VENV_DIR:-}" ]; then - export SWIFTCLIENT_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/python-swiftclient"} -fi -if [ -z "${SWIFTCLIENT_EXTRA_INSTALL_OPTS:-}" ]; then - export SWIFTCLIENT_EXTRA_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-""} -fi - -# tuskarclient -if [ -z "${TUSKARCLIENT_VENV_DIR:-}" ]; then - export TUSKARCLIENT_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/python-tuskarclient"} -fi -if [ -z "${TUSKARCLIENT_EXTRA_INSTALL_OPTS:-}" ]; then - export TUSKARCLIENT_EXTRA_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-""} -fi - -# openstackclient -if [ -z "${OPENSTACKCLIENT_VENV_DIR:-}" ]; then - export OPENSTACKCLIENT_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/python-openstackclient"} -fi -if [ -z "${OPENSTACKCLIENT_EXTRA_INSTALL_OPTS:-}" ]; then - export OPENSTACKCLIENT_EXTRA_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-""} -fi diff --git a/elements/openstack-clients/install.d/50-openstack-clients b/elements/openstack-clients/install.d/50-openstack-clients deleted file mode 100755 index 8c25b34ee..000000000 --- a/elements/openstack-clients/install.d/50-openstack-clients +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages git build-essential python-dev libssl-dev libxml2-dev libxslt-dev libffi-dev diff --git a/elements/openstack-clients/install.d/python-ceilometerclient-package-install/51-ceilometerclient b/elements/openstack-clients/install.d/python-ceilometerclient-package-install/51-ceilometerclient deleted file mode 100755 index 214f3e148..000000000 --- a/elements/openstack-clients/install.d/python-ceilometerclient-package-install/51-ceilometerclient +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages python-ceilometerclient diff --git a/elements/openstack-clients/install.d/python-ceilometerclient-source-install/51-ceilometerclient b/elements/openstack-clients/install.d/python-ceilometerclient-source-install/51-ceilometerclient deleted file mode 100755 index 5133f6030..000000000 --- a/elements/openstack-clients/install.d/python-ceilometerclient-source-install/51-ceilometerclient +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -set -eux - -install-openstack-client $CEILOMETERCLIENT_EXTRA_INSTALL_OPTS -c ceilometer -i $CEILOMETERCLIENT_VENV_DIR - -add-selinux-path-substitution /usr/bin $CEILOMETERCLIENT_VENV_DIR/bin diff --git a/elements/openstack-clients/install.d/python-cinderclient-package-install/51-cinderclient b/elements/openstack-clients/install.d/python-cinderclient-package-install/51-cinderclient deleted file mode 100755 index a392b07ae..000000000 --- a/elements/openstack-clients/install.d/python-cinderclient-package-install/51-cinderclient +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages python-cinderclient diff --git a/elements/openstack-clients/install.d/python-cinderclient-source-install/51-cinderclient b/elements/openstack-clients/install.d/python-cinderclient-source-install/51-cinderclient deleted file mode 100755 index 028844482..000000000 --- a/elements/openstack-clients/install.d/python-cinderclient-source-install/51-cinderclient +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -set -eux - -install-openstack-client $CINDERCLIENT_EXTRA_INSTALL_OPTS -c cinder -i $CINDERCLIENT_VENV_DIR - -add-selinux-path-substitution /usr/bin $CINDERCLIENT_VENV_DIR/bin diff --git a/elements/openstack-clients/install.d/python-glanceclient-package-install/51-glanceclient b/elements/openstack-clients/install.d/python-glanceclient-package-install/51-glanceclient deleted file mode 100755 index 571716e0d..000000000 --- a/elements/openstack-clients/install.d/python-glanceclient-package-install/51-glanceclient +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages python-glanceclient diff --git a/elements/openstack-clients/install.d/python-glanceclient-source-install/51-glanceclient b/elements/openstack-clients/install.d/python-glanceclient-source-install/51-glanceclient deleted file mode 100755 index 38a2fe991..000000000 --- a/elements/openstack-clients/install.d/python-glanceclient-source-install/51-glanceclient +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -set -eux - -install-openstack-client $GLANCECLIENT_EXTRA_INSTALL_OPTS -c glance -i $GLANCECLIENT_VENV_DIR - -add-selinux-path-substitution /usr/bin $GLANCECLIENT_VENV_DIR/bin diff --git a/elements/openstack-clients/install.d/python-heatclient-package-install/51-heatclient b/elements/openstack-clients/install.d/python-heatclient-package-install/51-heatclient deleted file mode 100755 index a5f37525f..000000000 --- a/elements/openstack-clients/install.d/python-heatclient-package-install/51-heatclient +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages python-heatclient diff --git a/elements/openstack-clients/install.d/python-heatclient-source-install/51-heatclient b/elements/openstack-clients/install.d/python-heatclient-source-install/51-heatclient deleted file mode 100755 index 38d42ec8f..000000000 --- a/elements/openstack-clients/install.d/python-heatclient-source-install/51-heatclient +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -set -eux - -install-openstack-client $HEATCLIENT_EXTRA_INSTALL_OPTS -c heat -i $HEATCLIENT_VENV_DIR - -add-selinux-path-substitution /usr/bin $HEATCLIENT_VENV_DIR/bin diff --git a/elements/openstack-clients/install.d/python-ironicclient-package-install/51-ironicclient b/elements/openstack-clients/install.d/python-ironicclient-package-install/51-ironicclient deleted file mode 100755 index e20e86216..000000000 --- a/elements/openstack-clients/install.d/python-ironicclient-package-install/51-ironicclient +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages python-ironicclient diff --git a/elements/openstack-clients/install.d/python-ironicclient-source-install/51-ironicclient b/elements/openstack-clients/install.d/python-ironicclient-source-install/51-ironicclient deleted file mode 100755 index 7f28c4ff0..000000000 --- a/elements/openstack-clients/install.d/python-ironicclient-source-install/51-ironicclient +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -set -eux - -install-openstack-client $IRONICCLIENT_EXTRA_INSTALL_OPTS -c ironic -i $IRONICCLIENT_VENV_DIR - -add-selinux-path-substitution /usr/bin $IRONICCLIENT_VENV_DIR/bin diff --git a/elements/openstack-clients/install.d/python-neutronclient-package-install/51-neutronclient b/elements/openstack-clients/install.d/python-neutronclient-package-install/51-neutronclient deleted file mode 100755 index a2569b836..000000000 --- a/elements/openstack-clients/install.d/python-neutronclient-package-install/51-neutronclient +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages python-neutronclient diff --git a/elements/openstack-clients/install.d/python-neutronclient-source-install/51-neutronclient b/elements/openstack-clients/install.d/python-neutronclient-source-install/51-neutronclient deleted file mode 100755 index 7c833a404..000000000 --- a/elements/openstack-clients/install.d/python-neutronclient-source-install/51-neutronclient +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eux - -install-openstack-client $NEUTRONCLIENT_EXTRA_INSTALL_OPTS -c neutron -i $NEUTRONCLIENT_VENV_DIR diff --git a/elements/openstack-clients/install.d/python-novaclient-package-install/51-novaclient b/elements/openstack-clients/install.d/python-novaclient-package-install/51-novaclient deleted file mode 100755 index ef129ba24..000000000 --- a/elements/openstack-clients/install.d/python-novaclient-package-install/51-novaclient +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages python-novaclient diff --git a/elements/openstack-clients/install.d/python-novaclient-source-install/51-novaclient b/elements/openstack-clients/install.d/python-novaclient-source-install/51-novaclient deleted file mode 100755 index b5673de07..000000000 --- a/elements/openstack-clients/install.d/python-novaclient-source-install/51-novaclient +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -set -eux - -install-openstack-client $NOVACLIENT_EXTRA_INSTALL_OPTS -c nova -i $NOVACLIENT_VENV_DIR - -add-selinux-path-substitution /usr/bin $NOVACLIENT_VENV_DIR/bin diff --git a/elements/openstack-clients/install.d/python-openstackclient-package-install/51-openstackclient b/elements/openstack-clients/install.d/python-openstackclient-package-install/51-openstackclient deleted file mode 100755 index dc6a4df47..000000000 --- a/elements/openstack-clients/install.d/python-openstackclient-package-install/51-openstackclient +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages python-openstackclient diff --git a/elements/openstack-clients/install.d/python-openstackclient-source-install/51-openstackclient b/elements/openstack-clients/install.d/python-openstackclient-source-install/51-openstackclient deleted file mode 100755 index df088f683..000000000 --- a/elements/openstack-clients/install.d/python-openstackclient-source-install/51-openstackclient +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -set -eux - -install-openstack-client $OPENSTACKCLIENT_EXTRA_INSTALL_OPTS -c openstack -i $OPENSTACKCLIENT_VENV_DIR - -add-selinux-path-substitution /usr/bin $OPENSTACKCLIENT_VENV_DIR/bin diff --git a/elements/openstack-clients/install.d/python-swiftclient-package-install/51-swiftclient b/elements/openstack-clients/install.d/python-swiftclient-package-install/51-swiftclient deleted file mode 100755 index 33ffeddf5..000000000 --- a/elements/openstack-clients/install.d/python-swiftclient-package-install/51-swiftclient +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages python-swiftclient diff --git a/elements/openstack-clients/install.d/python-swiftclient-source-install/51-swiftclient b/elements/openstack-clients/install.d/python-swiftclient-source-install/51-swiftclient deleted file mode 100755 index 519f34699..000000000 --- a/elements/openstack-clients/install.d/python-swiftclient-source-install/51-swiftclient +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -set -eux - -install-openstack-client $SWIFTCLIENT_EXTRA_INSTALL_OPTS -c swift -i $SWIFTCLIENT_VENV_DIR - -# the swift client doesn't have keystoneclient as a dependency, tripleo is -# using keystone auth so we need to explicitly install it. Bug 1085740. -$SWIFTCLIENT_VENV_DIR/bin/pip install python-keystoneclient - -add-selinux-path-substitution /usr/bin $SWIFTCLIENT_VENV_DIR/bin diff --git a/elements/openstack-clients/install.d/python-tuskarclient-package-install/51-tuskarclient b/elements/openstack-clients/install.d/python-tuskarclient-package-install/51-tuskarclient deleted file mode 100755 index e81749c07..000000000 --- a/elements/openstack-clients/install.d/python-tuskarclient-package-install/51-tuskarclient +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages python-tuskarclient diff --git a/elements/openstack-clients/install.d/python-tuskarclient-source-install/51-tuskarclient b/elements/openstack-clients/install.d/python-tuskarclient-source-install/51-tuskarclient deleted file mode 100644 index b1c09c291..000000000 --- a/elements/openstack-clients/install.d/python-tuskarclient-source-install/51-tuskarclient +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -set -eux - -install-openstack-client $TUSKARCLIENT_EXTRA_INSTALL_OPTS -c tuskar -i $TUSKARCLIENT_VENV_DIR - -add-selinux-path-substitution /usr/bin "$TUSKARCLIENT_VENV_DIR/bin" diff --git a/elements/openstack-clients/source-repository-clients b/elements/openstack-clients/source-repository-clients deleted file mode 100644 index a12939c8e..000000000 --- a/elements/openstack-clients/source-repository-clients +++ /dev/null @@ -1,10 +0,0 @@ -python-ceilometerclient git /opt/stack/python-ceilometerclient https://git.openstack.org/openstack/python-ceilometerclient.git -python-cinderclient git /opt/stack/python-cinderclient https://git.openstack.org/openstack/python-cinderclient.git -python-glanceclient git /opt/stack/python-glanceclient https://git.openstack.org/openstack/python-glanceclient.git -python-heatclient git /opt/stack/python-heatclient https://git.openstack.org/openstack/python-heatclient.git -python-ironicclient git /opt/stack/python-ironicclient https://git.openstack.org/openstack/python-ironicclient.git -python-neutronclient git /opt/stack/python-neutronclient https://git.openstack.org/openstack/python-neutronclient.git -python-novaclient git /opt/stack/python-novaclient https://git.openstack.org/openstack/python-novaclient.git -python-swiftclient git /opt/stack/python-swiftclient https://git.openstack.org/openstack/python-swiftclient.git -python-openstackclient git /opt/stack/python-openstackclient https://git.openstack.org/openstack/python-openstackclient.git -python-tuskarclient git /opt/stack/python-tuskarclient https://git.openstack.org/openstack/python-tuskarclient.git diff --git a/elements/openstack-db/README.md b/elements/openstack-db/README.md deleted file mode 100644 index 9f6763f40..000000000 --- a/elements/openstack-db/README.md +++ /dev/null @@ -1,2 +0,0 @@ -Installs all openstack sql databases on a single server, -for the purpose of building a bootstrap image. diff --git a/elements/openstack-db/element-deps b/elements/openstack-db/element-deps deleted file mode 100644 index f5a85e717..000000000 --- a/elements/openstack-db/element-deps +++ /dev/null @@ -1,2 +0,0 @@ -os-svc-install -source-repositories diff --git a/elements/openstack-db/install.d/50-openstack-db b/elements/openstack-db/install.d/50-openstack-db deleted file mode 100755 index c44fdd4d7..000000000 --- a/elements/openstack-db/install.d/50-openstack-db +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -set -eu - -install-packages mysql-server python-mysqldb - -my_cnf= -if [ -f /etc/mysql/my.cnf ]; then - my_cnf=/etc/mysql/my.cnf # Ubuntu -elif [ -f /etc/my.cnf ]; then - my_cnf=/etc/my.cnf # Fedora/RHEL -fi - -sed -i 's/127.0.0.1/0.0.0.0/g' $my_cnf - -os-svc-install -u keystone -r /opt/stack/keystone -os-svc-install -u cinder -r /opt/stack/cinder -os-svc-install -u nova -r /opt/stack/nova -os-svc-install -u glance -r /opt/stack/glance -os-svc-install -u neutron -r /opt/stack/neutron diff --git a/elements/openstack-db/source-repository-openstack b/elements/openstack-db/source-repository-openstack deleted file mode 100644 index cdb92c42b..000000000 --- a/elements/openstack-db/source-repository-openstack +++ /dev/null @@ -1,5 +0,0 @@ -keystone git /opt/stack/keystone https://git.openstack.org/openstack/keystone.git -cinder git /opt/stack/cinder https://git.openstack.org/openstack/cinder.git -nova git /opt/stack/nova https://git.openstack.org/openstack/nova.git -glance git /opt/stack/glance https://git.openstack.org/openstack/glance.git -neutron git /opt/stack/neutron https://git.openstack.org/openstack/neutron.git diff --git a/elements/openstack-ssl/README.md b/elements/openstack-ssl/README.md deleted file mode 100644 index 539ac20a6..000000000 --- a/elements/openstack-ssl/README.md +++ /dev/null @@ -1,42 +0,0 @@ -Configure stunnel4 for local services. - -Configuration -------------- - -stunnel: - cert: certdata - key: keydata - ports: - - name: 'ec2' - accept: 13773 - connect: 8773 - - name: 'image' - accept: 13292 - connect: 9292 - - name: 'identity' - accept: 13000 - connect: 5000 - - name: 'network' - accept: 13696 - connect: 9696 - - name: 'compute' - accept: 13774 - connect: 8774 - - name: 'swift-proxy' - accept: 13080 - connect: 8080 - - name: 'cinder' - accept: 13776 - connect: 8776 - connect_host: localhost - -The certificate and key data will be written to /etc/ssl/from-heat.{crt,key}. - -The certificate and key will be held persistently by Heat, so only use this with -an SSL enabled heat, and as soon as bug 1269999 is fixed, we will migrate away -from this implementation. - -Note that the public API endpoints in keystone need to be registered with https -urls, which is outside the scope of the local machine configuration process. - -See the stunnel man page for documentation on crt and key formats etc. diff --git a/elements/openstack-ssl/element-deps b/elements/openstack-ssl/element-deps deleted file mode 100644 index 6196c327a..000000000 --- a/elements/openstack-ssl/element-deps +++ /dev/null @@ -1 +0,0 @@ -stunnel diff --git a/elements/openstack-ssl/os-apply-config/etc/ssl/from-heat.crt b/elements/openstack-ssl/os-apply-config/etc/ssl/from-heat.crt deleted file mode 100644 index fb73265cb..000000000 --- a/elements/openstack-ssl/os-apply-config/etc/ssl/from-heat.crt +++ /dev/null @@ -1 +0,0 @@ -{{stunnel.cert}} diff --git a/elements/openstack-ssl/os-apply-config/etc/ssl/from-heat.key b/elements/openstack-ssl/os-apply-config/etc/ssl/from-heat.key deleted file mode 100644 index 62467216d..000000000 --- a/elements/openstack-ssl/os-apply-config/etc/ssl/from-heat.key +++ /dev/null @@ -1 +0,0 @@ -{{stunnel.key}} diff --git a/elements/openstack-ssl/os-apply-config/etc/stunnel/from-heat.conf b/elements/openstack-ssl/os-apply-config/etc/stunnel/from-heat.conf deleted file mode 100644 index e4988b2eb..000000000 --- a/elements/openstack-ssl/os-apply-config/etc/stunnel/from-heat.conf +++ /dev/null @@ -1,13 +0,0 @@ -pid = /var/run/stunnel4/from-heat.pid -cert = /etc/ssl/from-heat.crt -key = /etc/ssl/from-heat.key -options = NO_SSLv2 -options = NO_SSLv3 - -{{#stunnel}}{{#ports}} -{{#connect_host}} -[{{name}}] -accept = {{accept}} -connect = {{connect_host}}:{{connect}} -{{/connect_host}} -{{/ports}}{{/stunnel}} diff --git a/elements/openstack-ssl/os-refresh-config/pre-configure.d/70-stunnel-permissions b/elements/openstack-ssl/os-refresh-config/pre-configure.d/70-stunnel-permissions deleted file mode 100755 index 4a5b0e8ec..000000000 --- a/elements/openstack-ssl/os-refresh-config/pre-configure.d/70-stunnel-permissions +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -# Copyright 2014 Hewlett-Packard Development Company, L.P. -# -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -set -eux -set -o pipefail - -touch /etc/ssl/from-heat.crt -touch /etc/ssl/from-heat.key -chmod 0600 /etc/ssl/from-heat.crt -chmod 0600 /etc/ssl/from-heat.key diff --git a/elements/openvswitch-datapath/README.md b/elements/openvswitch-datapath/README.md deleted file mode 100644 index f9c4e2ccf..000000000 --- a/elements/openvswitch-datapath/README.md +++ /dev/null @@ -1,4 +0,0 @@ -Install openvswitch datapath from packages. - -Note: For kernels >= 3.12 there is no need to install -the dkms datapath to get GRE and VXLAN support. diff --git a/elements/openvswitch-datapath/element-deps b/elements/openvswitch-datapath/element-deps deleted file mode 100644 index 4ce07fabb..000000000 --- a/elements/openvswitch-datapath/element-deps +++ /dev/null @@ -1,2 +0,0 @@ -openvswitch -select-boot-kernel-initrd diff --git a/elements/openvswitch-datapath/install.d/75-openvswitch-datapath b/elements/openvswitch-datapath/install.d/75-openvswitch-datapath deleted file mode 100755 index 46f872208..000000000 --- a/elements/openvswitch-datapath/install.d/75-openvswitch-datapath +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -eux - -RET=$(select-boot-kernel-initrd) -KERNEL_VERSION=`echo ${RET%:*} | sed 's/vmlinuz-//g' | cut -f-2 -d'.'` -maj=$(printf "%02d" ${KERNEL_VERSION%.*}) -min=$(printf "%02d" ${KERNEL_VERSION#*.}) - -# Open vSwitch GRE tunneling included in kernel 3.11 and -# VXLAN tunneling in kernel 3.12 -if [[ $((10#$maj$min)) -lt 312 ]]; then - install-packages -m openvswitch-datapath openvswitch-datapath-dkms_package -fi diff --git a/elements/openvswitch-datapath/pkg-map b/elements/openvswitch-datapath/pkg-map deleted file mode 100644 index fac918a97..000000000 --- a/elements/openvswitch-datapath/pkg-map +++ /dev/null @@ -1,14 +0,0 @@ -{ - "family": { - "debian": { - "openvswitch-datapath-dkms_package": "openvswitch-datapath-dkms" - }, - "suse": { - "openvswitch-switch-dkms_package": "openvswitch-kmp-default", - "openvswitch-datapath-dkms_package": "openvswitch-kmp-default" - }, - "redhat": { - "openvswitch-datapath-dkms_package": "" - } - } -} diff --git a/elements/os-is-bootstrap-host/README.md b/elements/os-is-bootstrap-host/README.md deleted file mode 100644 index 8af951115..000000000 --- a/elements/os-is-bootstrap-host/README.md +++ /dev/null @@ -1,23 +0,0 @@ -A pre-determined master for initial bootstrapping - -Configuration -------------- - -For initial master election, `bootstrap_nodeid` and `node_id` should be set -to the ID string of the node which will be used as initial master and the id -string of the current node. - -A host where os-is-bootstrap-host is true (has exit value and output of 0) - - bootstrap_host: - bootstrap_nodeid: "SomeNode1" - nodeid: "SomeNode1" - -A host where os-is-bootstrap-host is false (has exit value and output of 1) - - bootstrap_host: - bootstrap_nodeid: "SomeNode1" - nodeid: "SomeNode2" - -If either of these values is undefined, the exit value and output of the script -will be 255. diff --git a/elements/os-is-bootstrap-host/bin/os-is-bootstrap-host b/elements/os-is-bootstrap-host/bin/os-is-bootstrap-host deleted file mode 100755 index f3407dbac..000000000 --- a/elements/os-is-bootstrap-host/bin/os-is-bootstrap-host +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -set -eu -set -o pipefail - -# Used to determine if this host is the "bootstrap host" -# -# This is our very temporary method for master election - there should only be -# one bootstrap host throughout the cluster. - -BOOTSTRAP_NODE=$(os-apply-config --key bootstrap_host.bootstrap_nodeid --type netaddress --key-default '') -MY_HOST=$(os-apply-config --key bootstrap_host.nodeid --type netaddress --key-default '') - -# Signal we are not bootstrap now but we could be in future -if [ -z "$BOOTSTRAP_NODE" -o -z "$MY_HOST" ]; then - exit 255 -elif [ "$BOOTSTRAP_NODE" != "$MY_HOST" ]; then - exit 1 -fi diff --git a/elements/pacemaker/README.md b/elements/pacemaker/README.md deleted file mode 100644 index 767eae54f..000000000 --- a/elements/pacemaker/README.md +++ /dev/null @@ -1,11 +0,0 @@ -Installs and configures pacemaker. - -Configuration is optional. - -Configuration --------------- - - pacemaker: - stonith_enabled : false - recheck_interval : 5 - quorum_policy : ignore diff --git a/elements/pacemaker/bin/pcmk-service-create b/elements/pacemaker/bin/pcmk-service-create deleted file mode 100755 index ba4bc57cb..000000000 --- a/elements/pacemaker/bin/pcmk-service-create +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash -# -# Copyright 2014 Red Hat, Inc. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -set -eu - -usage() { - echo "Usage: pcmk-resource-create [-c] -n SERVICENAME" - echo "" - echo " -h Show help and exit" - echo " -n SERVICENAME Name of job/service file." - echo " -c Clone this service (service is active on multiple nodes)." - echo "" - exit $1 -} - -SERVICENAME=${SERVICENAME:-""} -CLONE=0 - -nshift=0 -while getopts "chn:" opt; do - case "$opt" in - n) SERVICENAME=$OPTARG;; - c) CLONE=1;; - h) usage 0;; - \?) usage 1;; - :) usage 1;; - esac -done - -shift $(($OPTIND-1)) -if [ -z "$SERVICENAME" ] ; then - usage 1 -fi - -MAPPED_SERVICE=$(map-services $SERVICENAME) - -# get resource class (systemd, upstart, lsb). It should be possible -# to use 'service' class which is a wrapper for others but this doesn't work -# as expected on Fedora - lrmd process segfaults if 'service' resource class -# is used: https://bugzilla.redhat.com/show_bug.cgi?id=1117151 -CLASS=$(dib-init-system) -if [ "$CLASS" = "sysv" ]; then - CLASS=lsb -fi - -if [ "$CLASS" = "upstart" ]; then - # unfortunately, os-svc-enable means two things on Upstart - # a) it means start automatically - # b) it means allow to start at all - w/o it the job will refuse to start - # On other init systems it just means (a) - # This is recorded as https://bugs.launchpad.net/tripleo/+bug/1356579 - override_file=/etc/init/${MAPPED_SERVICE}.override - if ! ([ -e $override_file ] && grep -q manual $override_file) ; then - echo manual >> $override_file - fi -fi - -XML=$(cat < - - - - - -EOT -) - -if [ "$CLONE" = 1 ] ; then - XML=$(cat < - $XML - - -EOT -) -fi - - -if ! cibadmin --query --xpath "//primitive[@id=\"$MAPPED_SERVICE\"]"; then - /usr/sbin/cibadmin -o resources -C -X "$XML" -fi diff --git a/elements/pacemaker/element-deps b/elements/pacemaker/element-deps deleted file mode 100644 index 059231047..000000000 --- a/elements/pacemaker/element-deps +++ /dev/null @@ -1,6 +0,0 @@ -corosync -os-apply-config -os-is-bootstrap-host -os-refresh-config -os-svc-install -package-installs diff --git a/elements/pacemaker/install.d/package-installs-pacemaker b/elements/pacemaker/install.d/package-installs-pacemaker deleted file mode 100644 index 73aa0aada..000000000 --- a/elements/pacemaker/install.d/package-installs-pacemaker +++ /dev/null @@ -1 +0,0 @@ -pacemaker diff --git a/elements/pacemaker/os-apply-config/etc/corosync/service.d/pacemaker b/elements/pacemaker/os-apply-config/etc/corosync/service.d/pacemaker deleted file mode 100644 index 00b949fb6..000000000 --- a/elements/pacemaker/os-apply-config/etc/corosync/service.d/pacemaker +++ /dev/null @@ -1,4 +0,0 @@ -service { - name: pacemaker - ver: 0 -} diff --git a/elements/pacemaker/os-refresh-config/post-configure.d/15-pacemaker b/elements/pacemaker/os-refresh-config/post-configure.d/15-pacemaker deleted file mode 100755 index a5f3531e5..000000000 --- a/elements/pacemaker/os-refresh-config/post-configure.d/15-pacemaker +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -set -eux - -os-svc-enable -n pacemaker - -os-svc-restart -n pacemaker - -# Give pacemaker some time to boot up, otherwise configuration commands -# time out. The issue is tracked here: -# https://bugzilla.redhat.com/show_bug.cgi?id=1111747 -# This workaround can be removed once the issue above is fixed. -sleep 30 diff --git a/elements/pacemaker/os-refresh-config/post-configure.d/16-base-opts-pacemaker b/elements/pacemaker/os-refresh-config/post-configure.d/16-base-opts-pacemaker deleted file mode 100755 index ec697c25d..000000000 --- a/elements/pacemaker/os-refresh-config/post-configure.d/16-base-opts-pacemaker +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -set -eu - -if os-is-bootstrap-host; then - QUORUM_POLICY=$(os-apply-config --key pacemaker.quorum_policy --type raw --key-default stop) - RECHECK_INTERVAL=$(os-apply-config --key pacemaker.recheck_interval --type raw --key-default 5) - STONITH_ENABLED=$(os-apply-config --key pacemaker.stonith_enabled --type raw --key-default false) - - crm_attribute -t crm_config -n stonith-enabled -v $STONITH_ENABLED - crm_attribute -t crm_config -n no-quorum-policy -v $QUORUM_POLICY - crm_attribute -t crm_config -n cluster-recheck-interval -v "${RECHECK_INTERVAL}min" -fi diff --git a/elements/postfix/README.md b/elements/postfix/README.md deleted file mode 100644 index f230c6933..000000000 --- a/elements/postfix/README.md +++ /dev/null @@ -1,23 +0,0 @@ -Install postfix from packages. - -Currently this element is valid only for Debian and Debian derived systems. - -Sets default install type to local-only so we dont spam anyone. This can be -overwritten with the DIB_POSTFIX_INSTALL_TYPE environmental variable. - -Valid options for DIB_POSTFIX_INSTALL_TYPE are: -* Local only -* Internet Site -* Internet with smarthost -* Satellite system - -Set postfix hostname and domain via heat: - - postfix: - mailhostname: mail - maildomain: example.com - delay_warning_time: 4h - relayhost: smtp.example.com - -**NOTE**: mailhostname and maildomain must match the system hostname in order to -ensure local mail delivery will work. diff --git a/elements/postfix/element-deps b/elements/postfix/element-deps deleted file mode 100644 index d339fa5eb..000000000 --- a/elements/postfix/element-deps +++ /dev/null @@ -1,3 +0,0 @@ -os-apply-config -os-refresh-config -package-installs diff --git a/elements/postfix/install.d/package-installs-postfix b/elements/postfix/install.d/package-installs-postfix deleted file mode 100644 index f6dc9c5c9..000000000 --- a/elements/postfix/install.d/package-installs-postfix +++ /dev/null @@ -1 +0,0 @@ -postfix diff --git a/elements/postfix/os-apply-config/etc/mailname b/elements/postfix/os-apply-config/etc/mailname deleted file mode 100644 index 45f0b7a49..000000000 --- a/elements/postfix/os-apply-config/etc/mailname +++ /dev/null @@ -1 +0,0 @@ -{{postfix.mailhostname}}.{{postfix.maildomain}} \ No newline at end of file diff --git a/elements/postfix/os-apply-config/etc/postfix/main.cf b/elements/postfix/os-apply-config/etc/postfix/main.cf deleted file mode 100644 index f8748ee71..000000000 --- a/elements/postfix/os-apply-config/etc/postfix/main.cf +++ /dev/null @@ -1,34 +0,0 @@ -# See /usr/share/postfix/main.cf.dist for a commented, more complete version - - -smtpd_banner = $myhostname ESMTP $mail_name (Ubuntu) -biff = no - -# appending .domain is the MUA's job. -append_dot_mydomain = no - -# Uncomment the next line to generate "delayed mail" warnings -delay_warning_time = {{postfix.delay_warning_time}} - -readme_directory = no - -# TLS parameters -smtpd_tls_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem -smtpd_tls_key_file=/etc/ssl/private/ssl-cert-snakeoil.key -smtpd_use_tls=yes -smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache -smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache - -# See /usr/share/doc/postfix/TLS_README.gz in the postfix-doc package for -# information on enabling SSL in the smtp client. - -myhostname = {{postfix.mailhostname}}.{{postfix.maildomain}} -alias_maps = hash:/etc/aliases -alias_database = hash:/etc/aliases -myorigin = /etc/mailname -mydestination = {{postfix.mailhostname}}.{{postfix.maildomain}}, localhost.{{postfix.maildomain}}, localhost -relayhost = {{postfix.relayhost}} -mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 -mailbox_size_limit = 0 -recipient_delimiter = + -inet_interfaces = all diff --git a/elements/postfix/os-refresh-config/configure.d/59-postfix b/elements/postfix/os-refresh-config/configure.d/59-postfix deleted file mode 100755 index 900f6426f..000000000 --- a/elements/postfix/os-refresh-config/configure.d/59-postfix +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -set -uex - -system_hostname=$(hostname -f) - -if [ -f /etc/debian_version ]; then - mailname_file="/etc/mailname" - if [ -f $mailname_file ]; then - mailname_data=$(cat $mailname_file) - if [ "$mailname_data" != "$system_hostname" ]; then - echo "Provided hostname and domain do not match system's. Local mail may not be delivered." - fi - fi -fi diff --git a/elements/postfix/os-refresh-config/post-configure.d/59-postfix b/elements/postfix/os-refresh-config/post-configure.d/59-postfix deleted file mode 100755 index f2136b84d..000000000 --- a/elements/postfix/os-refresh-config/post-configure.d/59-postfix +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -uex - -service postfix reload diff --git a/elements/postfix/pre-install.d/59-postfix b/elements/postfix/pre-install.d/59-postfix deleted file mode 100755 index d01a84373..000000000 --- a/elements/postfix/pre-install.d/59-postfix +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -set -eux - -# set some defaults for Debian based installs -if [ -f /etc/debian_version ]; then - debconf-set-selections <<< "postfix postfix/main_mailer_type string '${DIB_POSTFIX_INSTALL_TYPE:-Local Only}'" -else - echo "Postfix element currently supports Debian based environments only." - exit 1 -fi diff --git a/elements/pypi-mirror/README.md b/elements/pypi-mirror/README.md deleted file mode 100644 index f57979a2a..000000000 --- a/elements/pypi-mirror/README.md +++ /dev/null @@ -1,2 +0,0 @@ -Creates and hosts a local pypi mirror suitable for use with the pypi -element from diskimage-builder. diff --git a/elements/pypi-mirror/element-deps b/elements/pypi-mirror/element-deps deleted file mode 100644 index 7ecaecb25..000000000 --- a/elements/pypi-mirror/element-deps +++ /dev/null @@ -1,2 +0,0 @@ -pip-and-virtualenv -source-repositories diff --git a/elements/pypi-mirror/install.d/50-pypi-mirror b/elements/pypi-mirror/install.d/50-pypi-mirror deleted file mode 100755 index 802c1dfdf..000000000 --- a/elements/pypi-mirror/install.d/50-pypi-mirror +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash -# Copyright 2013 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -set -eux - -install-packages libyaml-dev pkg-config python-dev build-essential libmysqlclient-dev \ - libffi-dev libpq-dev libxslt-dev libsqlite3-dev libldap2-dev libsasl2-dev - -mkdir -p /opt/stack/venvs -virtualenv /opt/stack/venvs/pypi-mirror -/opt/stack/venvs/pypi-mirror/bin/pip install -U /opt/stack/pypi-mirror -ln -sf /opt/stack/venvs/pypi-mirror/bin/run-mirror /usr/local/bin/run-mirror - -useradd pypi-mirror --system -d /var/run/pypi-mirror -s /bin/false - -mkdir -p /etc/pypi-mirror -cat < /etc/pypi-mirror/mirror.yaml -cache-root: /var/cache/pypi-mirror/pypi/download - -mirrors: - - name: openstack - projects: - - https://git.openstack.org/openstack/requirements - output: /var/cache/pypi-mirror/pypi/mirror -EOF - -mkdir -p /var/cache/pypi-mirror/pypi/download -mkdir -p /var/cache/pypi-mirror/pypi/mirror - -chown -R pypi-mirror.pypi-mirror /var/cache/pypi-mirror -chmod a+rx /var/cache/pypi-mirror - -cat < /etc/cron.d/pypi-mirror-update -SHELL=/bin/sh -PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -15 * * * * pypi-mirror run-mirror -b remotes/origin/master --verbose -c /etc/pypi-mirror/mirror.yaml 2>&1 | logger -t pypi-mirror -EOF diff --git a/elements/pypi-mirror/source-repository-pypi-mirror b/elements/pypi-mirror/source-repository-pypi-mirror deleted file mode 100644 index bf1aac41f..000000000 --- a/elements/pypi-mirror/source-repository-pypi-mirror +++ /dev/null @@ -1 +0,0 @@ -pypi-mirror git /opt/stack/pypi-mirror https://git.openstack.org/openstack-infra/pypi-mirror diff --git a/elements/pypi-openstack/README.md b/elements/pypi-openstack/README.md deleted file mode 100644 index cf3f497e8..000000000 --- a/elements/pypi-openstack/README.md +++ /dev/null @@ -1,17 +0,0 @@ -Configure the OpenStack PyPI mirror globally -============================================ - -Temporarily overwrites /root/.pip.conf and .pydistutils.cfg to use -http://pypi.openstack.org. - -By policy all tests in the OpenStack CI/CD environment need to use just the -OpenStack PyPI mirror and thus should include this element. - -Note that when building images with this element, pip uses HTTP, and the -OpenStack mirror does not provide a way to verify the contents of the -downloaded packages, and thus is vulnerable to a man-in-the-middle attack. - -In order to have a secure local mirror which is built in the same way -pypi-openstack is, see the diskimage-builder element 'pypi'. If you would -like to build an image which hosts such a mirror, see the pypi-mirror -element. diff --git a/elements/pypi-openstack/post-install.d/00-unconfigure-openstack-pypi-mirror b/elements/pypi-openstack/post-install.d/00-unconfigure-openstack-pypi-mirror deleted file mode 100755 index 100543831..000000000 --- a/elements/pypi-openstack/post-install.d/00-unconfigure-openstack-pypi-mirror +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -set -eu - -if [ -e ~/.pip/pip.conf.orig ]; then - mv ~/.pip/pip.conf{.orig,} -else - rm ~/.pip/pip.conf -fi - - -if [ -e ~/.pydistutils.cfg.orig ]; then - mv ~/.pydistutils.cfg{.orig,} -else - rm ~/.pydistutils.cfg -fi diff --git a/elements/pypi-openstack/pre-install.d/00-configure-openstack-pypi-mirror b/elements/pypi-openstack/pre-install.d/00-configure-openstack-pypi-mirror deleted file mode 100755 index 336c357cb..000000000 --- a/elements/pypi-openstack/pre-install.d/00-configure-openstack-pypi-mirror +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -set -eu - -PYPIURL=http://pypi.openstack.org/simple/ -mkdir -p ~/.pip - -if [ -e ~/.pip/pip.conf ]; then - mv ~/.pip/pip.conf{,.orig} -fi - -if [ -e ~/.pydistutils.cfg ]; then - mv ~/.pydistutils.cfg{,.orig} -fi - -cat < ~/.pip/pip.conf -[global] -index-url = $PYPIURL -log = $HOME/pip.log -EOF - -cat < ~/.pydistutils.cfg -[easy_install] -index_url = $PYPIURL -EOF diff --git a/elements/qpidd/README.md b/elements/qpidd/README.md deleted file mode 100644 index dfc3dee6a..000000000 --- a/elements/qpidd/README.md +++ /dev/null @@ -1,60 +0,0 @@ -Installs Qpid as a substitute for RabbitMQ as the rpc_backend for -various OpenStack services. - -To use Qpid, when building an image, add the qpid element and -remove the rabbitmq-server element. At the moment, rabbitmq-server -is listed as default in boot-stack/element-deps. - - sed -i "s/rabbitmq-server/qpidd/" $TRIPLEO_ROOT/tripleo-image-elements/elements/boot-stack/element-deps - -The configuration files of other services like Heat, Neutron, Nova, -Cinder, and Glance are updated by os-apply-config and os-apply-config -will place the correct configurations for either RabbitMQ or Qpid -depending on what is present in the Heat metadata. - -The Heat metadata/templates should be updated to use qpid instead -of rabbitmq. In addition to the password which rabbitmq lists by -default, the username should also be specified for qpid. - - -For the seed image the default metadata on the file system needs -to be updated. Substitute "rabbit" with "qpid". - - sed -i "s/rabbit/qpid/" $TRIPLEO_ROOT/tripleo-image-elements/elements/seed-stack-config/config.json - -After including the username, the qpid section should look like - - "qpid": { - "host": "127.0.0.1", - "username": "guest", - "password": "guest" - } - - -For the undercloud, update the Heat template by substituting "rabbit:" -with "qpid:". - - sed -i "s/rabbit:/qpid:/" $TRIPLEO_ROOT/tripleo-heat-templates/undercloud-vm.yaml - -After including the username, the qpid section should look like - - qpid: - host: 127.0.0.1 - username: guest - password: guest - - -For the overcloud, update the Heat template by substituting "rabbit:" -with "qpid:". - - sed -i "s/rabbit:/qpid:/" $TRIPLEO_ROOT/tripleo-heat-templates/overcloud.yaml - -After including the username, the qpid section(s) should look like - - qpid: - host: - Fn::GetAtt: - - notcompute - - PrivateIp - username: guest - password: guest diff --git a/elements/qpidd/element-deps b/elements/qpidd/element-deps deleted file mode 100644 index 9d8b6b7a5..000000000 --- a/elements/qpidd/element-deps +++ /dev/null @@ -1,2 +0,0 @@ -os-apply-config -os-refresh-config diff --git a/elements/qpidd/install.d/20-qpidd b/elements/qpidd/install.d/20-qpidd deleted file mode 100755 index e3dfe32ae..000000000 --- a/elements/qpidd/install.d/20-qpidd +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -set -ue - -install-packages qpidd qpid-tools qpid-client - -function install_qpidd_upstart() { - cat > /etc/init/qpidd.conf << eof -start on runlevel [2345] -stop on runlevel [016] - -respawn -respawn limit 2 5 - -script - exec qpidd --config=/etc/qpid/qpidd.conf -end script -post-start exec sleep 1 -eof -} - -if [ "$DIB_INIT_SYSTEM" == "upstart" ]; then - install_qpidd_upstart -fi diff --git a/elements/qpidd/os-apply-config/etc/qpid/qpidd.acl b/elements/qpidd/os-apply-config/etc/qpid/qpidd.acl deleted file mode 100644 index 1f69a1e9e..000000000 --- a/elements/qpidd/os-apply-config/etc/qpid/qpidd.acl +++ /dev/null @@ -1,40 +0,0 @@ -# QPID policy file -# -# User definition: -# user = [@domain[/realm]] -# -# User/Group lists: -# user-list = user1 user2 user3 ... -# group-name-list = group1 group2 group3 ... -# -# Group definition: -# group = [user-list] [group-name-list] -# -# ACL definition: -# permission = [allow|allow-log|deny|deny-log] -# action = [consume|publish|create|access|bind|unbind|delete|purge|update] -# object = [virtualhost|queue|exchange|broker|link|route|method] -# property = [name|durable|owner|routingkey|passive|autodelete|exclusive|type|alternate|queuename|schemapackage|schemaclass] -# -# acl permission {||"all"} {action|"all"} [object|"all"] [property=] -# -# Example: -# -# group client = user1@QPID user2@QPID -# acl allow client publish routingkey=exampleQueue exchange=amq.direct -# -# Will allow the group "client" containing of "user1" and "user2" be able to -# make use of the routing key "exampleQueue" on the "amq.direct" exchange. - -# Group definitions -group admin admin@QPID - -# Admin is allowed to do everything -acl allow admin all - -{{#qpid}} -acl allow {{username}}@QPID all all -{{/qpid}} - -# Deny everything else by default -acl deny all all diff --git a/elements/qpidd/os-refresh-config/post-configure.d/73-qpidd b/elements/qpidd/os-refresh-config/post-configure.d/73-qpidd deleted file mode 100755 index 1980e86c1..000000000 --- a/elements/qpidd/os-refresh-config/post-configure.d/73-qpidd +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -set -eu - -username=$(os-apply-config --key qpid.username) -password=$(os-apply-config --key qpid.password) - -sasldb_file=$(grep sasldb_path /etc/sasl2/qpidd.conf | cut -d \: -f 2 | cut -d " " -f 2) -echo "$password" | saslpasswd2 -c -p -f $sasldb_file -u QPID $username -chown qpidd.qpidd $sasldb_file - -service qpidd restart diff --git a/elements/rabbitmq-server/README.md b/elements/rabbitmq-server/README.md deleted file mode 100644 index 1c3a2c7a9..000000000 --- a/elements/rabbitmq-server/README.md +++ /dev/null @@ -1,98 +0,0 @@ -Install RabbitMQ server package and optionally configure it using Heat -metadata. - -Heat ----- - -We will create a random password and feed it to a Heat wait condition -if directed by Metadata. The relevant Metadata would look something like -this in Heat: - - Metadata: - rabbit: - users: - clean_users: True - guest: - username: guest - tags: administrator - nova: - username: nova - password: SuperSecret - tags: - - administrator - - monitoring - permissions: - conf: .* - write: .* - read: .* - password_handle: {Ref: RabbitMQPasswordHandle} - keepalive_disabled: true/false - - Enable/Disable TCP keepalive on rabbitmq sockets (default is - for keepalive to be enabled). - -Using cfn-signal, we will feed back a generated password into the handle -for use by other resources. - - -RabbitMQ Cluster ----------------- - -Additional parameters in heat template are required for each clustered node: - - Metadata: - rabbit: - cookie: some_cookie - - make sure same cookie is set for all nodes in cluster - nodes: - node0,node1 - -'rabbit.nodes' contains short hostnames of all nodes in RabbitMq cluster. - -If a node has 'rabbit.nodes' set to true, this node is added into -cluster with other nodes listed in 'rabbit.nodes'. - -RabbitMQ inter-node communication is restricted to port 61000 only in config file -(otherwise random ports would be used) to make sure this port can be enabled in -firewall. - -Due to bug http://bugzilla.redhat.com/show_bug.cgi?id=1105850, we must use a port -within the ephemeral port range (32768-61000). - -Port 61000 is reserved by using sysctl to set net.ipv4.ip_local_reserved_ports -to 61000. - -Sample 2-node cluster definition: - - node0: - rabbit: - cookie: some_cookie - nodes: - Fn::Join: - - ',' - - - Fn::Select: - - name - - Fn::GetAtt: - - node0 - - show - - Fn::Select: - - name - - Fn::GetAtt: - - node1 - - show - - node1: - rabbit: - cookie: some_cookie - nodes: - Fn::Join: - - ',' - - - Fn::Select: - - name - - Fn::GetAtt: - - node0 - - show - - Fn::Select: - - name - - Fn::GetAtt: - - node1 - - show diff --git a/elements/rabbitmq-server/bin/rabbitmq_is_in_cluster b/elements/rabbitmq-server/bin/rabbitmq_is_in_cluster deleted file mode 100755 index ae5504e67..000000000 --- a/elements/rabbitmq-server/bin/rabbitmq_is_in_cluster +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -set -eu -set -o pipefail - -SCRIPT_NAME="$(basename $0)" - -function show_options () { - echo "Usage: ${SCRIPT_NAME} [options]" - echo "Queries to see if RabbitMQ is in a cluster." - echo "Options:" - echo " --check-node - Node to check is in the cluster." - echo " Defaults to rabbit." - echo " --check-host - Host to check is in the cluster." - echo " Defaults to none." - echo " --remote-node - The Rabbit remote node name to use." - echo " Defaults to rabbit." - echo " --remote-host - The Rabbit remote host name to use." - echo " If not set, the local machine is tested." - exit ${1} -} - -# RabbitMQ database is tied to the system hostname. -REMOTE_HOST="$(hostname)" -REMOTE_NODE="rabbit" -CHECK_HOST="" -CHECK_NODE="rabbit" - -TEMP=$(getopt -o h -l help,check-node:,check-host:,remote-node:,remote-host: -n "${SCRIPT_NAME}" -- "${@}") -[ ${?} -ne 0 ] && { echo "Terminating..." >&2; exit 1; }; - -# Note the quotes around "$TEMP": they are essential! -eval set -- "${TEMP}" - -while true ; do - case "${1}" in - -h | --help) show_options 0;; - --check-node) CHECK_NODE="${2}"; shift 2 ;; - --check-host) CHECK_HOST="${2}"; shift 2 ;; - --remote-node) REMOTE_NODE="${2}"; shift 2 ;; - --remote-host) REMOTE_HOST="${2}"; shift 2 ;; - --) shift ; break ;; - *) echo "Error: unsupported option ${1}." >&2 ; exit 1 ;; - esac -done - - -function running_cluster_nodes() { - local remote_node="${1}" - local remote_host="${2}" - # Returns true if the list following "running_nodes" in rabbitmqctl - # cluster_status contains at least two nodes. - rabbitmqctl -n "${remote_node}@${remote_host}" cluster_status 2>/dev/null | - awk '/running_nodes,\[[^]]+,/,/]},/' | - sed 's/,\([^[]\)/,\n\1/g' -} - -RUNNING_NODES="$(running_cluster_nodes "${REMOTE_NODE}" "${REMOTE_HOST}")" - -# Cluster is not formed. -[ -z "${RUNNING_NODES}" ] && exit 1 -# Cluster is formed and we are not checking for a particular host. -[ -z "${CHECK_HOST}" ] && exit 0 -# Cluster is formed and we are checking for a particular host. -grep -q "${CHECK_NODE}@${CHECK_HOST}" <<< "${RUNNING_NODES}" diff --git a/elements/rabbitmq-server/bin/rabbitmq_join_cluster b/elements/rabbitmq-server/bin/rabbitmq_join_cluster deleted file mode 100755 index 87065f519..000000000 --- a/elements/rabbitmq-server/bin/rabbitmq_join_cluster +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/bash -set -eu -set -o pipefail - -SCRIPT_NAME="$(basename $0)" - -function show_options () { - echo "Usage: ${SCRIPT_NAME} [options]" - echo "Tells the local RabbitMQ to join the remote node's cluster." - echo "Options:" - echo " --clean-on-error - Attempts to clear down the local" - echo " Mnesia database on failure to join" - echo " a cluster, cleaning all persistent" - echo " messages." - echo " --remote-node - The Rabbit remote node name to use." - echo " Defaults to rabbit." - echo " --remote-host - The Rabbit remote host name to use." - exit ${1} -} - -# RabbitMQ database is tied to the system hostname. -LOCAL_HOST="$(hostname)" -CLEAN_ON_ERROR="0" -REMOTE_NODE="rabbit" -REMOTE_HOST="" - -TEMP=$(getopt -o h -l help,remote-node:,remote-host:,clean-on-error -n "${SCRIPT_NAME}" -- "${@}") -[ ${?} -ne 0 ] && { echo "Terminating..." >&2; exit 1; }; - -# Note the quotes around "$TEMP": they are essential! -eval set -- "${TEMP}" - -while true ; do - case "${1}" in - --clean-on-error) CLEAN_ON_ERROR="1"; shift ;; - --remote-node) REMOTE_NODE="${2}"; shift 2 ;; - --remote-host) REMOTE_HOST="${2}"; shift 2 ;; - -h | --help) show_options 0 ;; - --) shift ; break ;; - *) echo "Error: unsupported option ${1}." >&2 ; exit 1 ;; - esac -done - - -function join_cluster_with() { - local remote_node="${1}" - local remote_host="${2}" - rabbitmqctl stop_app - # If we are in the cluster already or have just joined we may need to - # update our status to become running. In all error case we return true - # so we can test the node cluster status later. - { rabbitmqctl join_cluster "${remote_node}@${remote_host}" && - rabbitmqctl update_cluster_nodes "${remote_node}@${remote_host}"; } || - true - rabbitmqctl start_app -} - -[ -z "${REMOTE_HOST}" ] && { echo "Failed: A remote host must be given" >&2; exit 255; } - -# Check not already clustered with the remote host. -if ! rabbitmq_is_in_cluster --check-host "${REMOTE_HOST}"; then - { join_cluster_with "${REMOTE_NODE}" "${REMOTE_HOST}" && - rabbitmq_is_in_cluster --check-host "${REMOTE_HOST}"; } || - RET_VAL=${?} - - if [ ${RET_VAL:-0} -ne 0 ]; then - echo "Failed to join host [${LOCAL_HOST}] with [${REMOTE_NODE}@${REMOTE_HOST}]..." >&2 - if [ ${CLEAN_ON_ERROR} -eq 1 ]; then - # Try to leave the cluster gracefully and unregister with - # REMOTE_HOST. This reset will try to inform the peers that we are - # leaving. Even if this succeeds, we might be holding messages - # from a corrupt remote node. - rabbitmq_reset_node || true - # Now we've at least tried to sync our messages out to the cluster, - # simply wipe the DB. --force-reset does not communicate with the - # peers about the node exiting cluster. - rabbitmq_reset_node --force-reset || true - fi - exit ${RET_VAL} - fi -fi diff --git a/elements/rabbitmq-server/bin/rabbitmq_reset_node b/elements/rabbitmq-server/bin/rabbitmq_reset_node deleted file mode 100755 index ef89286bc..000000000 --- a/elements/rabbitmq-server/bin/rabbitmq_reset_node +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash -set -eu -set -o pipefail - -SCRIPT_NAME="$(basename $0)" - -function show_options () { - echo "Usage: ${SCRIPT_NAME} [options]" - echo "Let the local RabbitMQ node gracefully exit any cluster" - echo "and clear down the local mnesia database. At the end of" - echo "the process an attempt is made to restart the RabbitMQ" - echo "Erlang pocesses even if a failure was encounted." - echo "Options:" - echo " --force-reset - Forcefully return the node to" - echo " its virgin state." - exit ${1} -} - -RESET_OPTION="reset" - -TEMP=$(getopt -o h -l help,force-reset -n "${SCRIPT_NAME}" -- "${@}") -[ $? -ne 0 ] && { echo "Terminating..." >&2; exit 1; }; - -# Note the quotes around "$TEMP": they are essential! -eval set -- "${TEMP}" - -while true ; do - case "${1}" in - --force-reset) RESET_OPTION="force_reset"; shift ;; - -h | --help) show_options 0 ;; - --) shift ; break ;; - *) echo "Error: unsupported option ${1}." >&2 ; exit 1 ;; - esac -done - - -function reset_node() { - local reset_option="${1}" - rabbitmqctl stop_app - # This syncs all data into the cluster, then removes this node, cleaning local mnesia. - rabbitmqctl "${reset_option}" -} - -if ! reset_node "${RESET_OPTION}"; then - RET_VAL=${?} - echo "Failed: Node has failed to correctly exit cluster" >&2 - rabbitmqctl start_app || - echo "Failed: Node has failed to start RabbitMQ app" >&2 - exit ${RET_VAL} -fi diff --git a/elements/rabbitmq-server/bin/rabbitmq_size_of_cluster b/elements/rabbitmq-server/bin/rabbitmq_size_of_cluster deleted file mode 100755 index ee43d6118..000000000 --- a/elements/rabbitmq-server/bin/rabbitmq_size_of_cluster +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash -set -eu -set -o pipefail - -SCRIPT_NAME="$(basename $0)" - -function show_options () { - echo "Usage: ${SCRIPT_NAME} [options]" - echo "Prints the size of the RabbitMQ cluster the remote-host" - echo "is a member of, if any. If the node is not clustered or" - echo "is in a cluster by itself, prints 0." - echo "Options:" - echo " --remote-node - The Rabbit remote node name to use." - echo " Defaults to rabbit." - echo " --remote-host - The Rabbit remote host name to use." - echo " If not set, the local machine is inspected." - exit ${1} -} - -# RabbitMQ database is tied to the system hostname. -REMOTE_HOST="$(hostname)" -REMOTE_NODE="rabbit" - -TEMP=$(getopt -o h -l help,remote_node:,remote-host: -n "${SCRIPT_NAME}" -- "${@}") -[ ${?} -ne 0 ] && { echo "Terminating..." >&2; exit 1; }; - -# Note the quotes around "$TEMP": they are essential! -eval set -- "${TEMP}" - -while true ; do - case "${1}" in - -h | --help) show_options 0;; - --remote-node) REMOTE_NODE="${2}"; shift 2;; - --remote-host) REMOTE_HOST="${2}"; shift 2;; - --) shift ; break ;; - *) echo "Error: unsupported option ${1}." >&2 ; exit 1 ;; - esac -done - - -# Number of nodes in the cluster according to remote host $2. -# If $2 isn't in a cluster or it's in a cluster by itself, then this will -# print 0. -function cluster_size() { - local remote_node="${1}" - local remote_host="${2}" - echo "$(rabbitmqctl -n "${remote_node}@${remote_host}" cluster_status 2>/dev/null | - awk '/running_nodes,\[[^]]+,/,/]},/' | - sed 's/,\([^[]\)/,\n\1/g' | - wc -l)" -} - -cluster_size "${REMOTE_NODE}" "${REMOTE_HOST}" diff --git a/elements/rabbitmq-server/element-deps b/elements/rabbitmq-server/element-deps deleted file mode 100644 index f729f5401..000000000 --- a/elements/rabbitmq-server/element-deps +++ /dev/null @@ -1,9 +0,0 @@ -iptables -os-apply-config -os-is-bootstrap-host -os-refresh-config -os-svc-install -package-installs -sysctl -use-ephemeral -ntp diff --git a/elements/rabbitmq-server/files/etc/init/rabbitmq-server.conf b/elements/rabbitmq-server/files/etc/init/rabbitmq-server.conf deleted file mode 100644 index 3d419001c..000000000 --- a/elements/rabbitmq-server/files/etc/init/rabbitmq-server.conf +++ /dev/null @@ -1,27 +0,0 @@ -start on runlevel [2345] -stop on runlevel [016] -respawn -# The default post-start of 1 second sleep delays respawning enough to -# not hit the default of 10 times in 5 seconds. Make it 2 times in 5s. -respawn limit 2 5 - -# Process will exit from SIGTERM due to post-stop pkill, prevent this -# causing a respawn -normal exit 0 TERM - -env RUN_DIR=/var/run/rabbitmq -env PID_FILE=$RUN_DIR/pid -env OS_SVC_ENABLE_CONTROL=1 -export OS_SVC_ENABLE_CONTROL - -pre-start script - [ -d "$RUN_DIR" ] || install -d -D -m 0755 -o rabbitmq -g rabbitmq $RUN_DIR -end script -exec /usr/sbin/rabbitmq-server > /var/log/rabbitmq/startup_log \ - 2> /var/log/rabbitmq/startup_err - -post-start exec /usr/sbin/rabbitmqctl wait $PID_FILE >/dev/null 2>&1 -pre-stop exec /usr/sbin/rabbitmqctl stop $PID_FILE >/dev/null 2>&1 - -# Get the Erlang nameserver too. -post-stop exec /usr/bin/pkill -u rabbitmq >/dev/null 2>&1 diff --git a/elements/rabbitmq-server/files/etc/rabbitmq/rabbitmq-env.conf b/elements/rabbitmq-server/files/etc/rabbitmq/rabbitmq-env.conf deleted file mode 100644 index ef118b0d9..000000000 --- a/elements/rabbitmq-server/files/etc/rabbitmq/rabbitmq-env.conf +++ /dev/null @@ -1,7 +0,0 @@ -HOME=/var/lib/rabbitmq -LOG_BASE=/var/log/rabbitmq -MNESIA_BASE=/var/lib/rabbitmq/mnesia -PID_FILE=/var/run/rabbitmq/pid -# We need to customize log file names so that they do not have @s -RABBITMQ_LOGS=$LOG_BASE/$(hostname -s).log -RABBITMQ_SASL_LOGS=$LOG_BASE/$(hostname -s)-sasl.log diff --git a/elements/rabbitmq-server/install.d/20-rabbitmq-server b/elements/rabbitmq-server/install.d/20-rabbitmq-server deleted file mode 100755 index 43ea72ba5..000000000 --- a/elements/rabbitmq-server/install.d/20-rabbitmq-server +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages rabbitmq-server - -# Ensure we leave symlinks in place for RabbitMQ state paths -register-state-path --leave-symlink /var/lib/rabbitmq -register-state-path --leave-symlink /var/log/rabbitmq - -FILES="$(dirname $0)/../files" - -# Note(jang): the rabbitmq-server service is installed, but not started, since -# the first run of os-collect-config is required to configure it properly. - -# In Ubuntu rabbit's default init.d script is broken. -if [ "$DISTRO_NAME" = "ubuntu" ] || [ "$DISTRO_NAME" = "debian" -a "$DIB_INIT_SYSTEM" = "upstart" ]; then - sed -i 's,/etc/init.d/rabbitmq-server rotate-logs,/usr/sbin/rabbitmqctl -q rotate_logs,g' /etc/logrotate.d/rabbitmq-server - update-rc.d -f rabbitmq-server remove - rm /etc/init.d/rabbitmq-server - - # Note(jang) The os-svc-daemon script has too many assumptions baked into it - # that it'll be running a venv-based service to use directly. Install an upstart - # configuration that's compatible with os-svc-enable and os-svc-restart - - FILE=/etc/init/rabbitmq-server.conf - install -g root -o root -m 0755 "${FILES}${FILE}" "${FILE}" -fi - -if [ "$DIB_INIT_SYSTEM" = "systemd" ]; then - # Delay the rc-local.service start-up until rabbitmq-server.service is started up - sed -i 's/\[Unit\]/\[Unit\]\nBefore=rc-local.service/g' /lib/systemd/system/rabbitmq-server.service - - # Respawn rabbitmq-server in case the process exits with an nonzero exit code - sed -i 's/\[Service\]/\[Service\]\nRestart=on-failure/g' /lib/systemd/system/rabbitmq-server.service -fi - -FILE=/etc/rabbitmq/rabbitmq-env.conf -install -g root -o root -m 0755 "${FILES}${FILE}" "${FILE}" - -# Enable ulimits in pam if needed -PAM_FILE=/etc/pam.d/su -sed -i '/# session.*pam_limits\.so/s/# //' ${PAM_FILE} - -# Reserve the cluster port (61000) from the ephemeral port range. -sysctl-append-value net.ipv4.ip_local_reserved_ports 61000 diff --git a/elements/rabbitmq-server/install.d/package-installs-rabbitmq-server b/elements/rabbitmq-server/install.d/package-installs-rabbitmq-server deleted file mode 100644 index f8d6ed52a..000000000 --- a/elements/rabbitmq-server/install.d/package-installs-rabbitmq-server +++ /dev/null @@ -1 +0,0 @@ -rabbitmq-server diff --git a/elements/rabbitmq-server/os-apply-config/etc/rabbitmq/heat_password_handle b/elements/rabbitmq-server/os-apply-config/etc/rabbitmq/heat_password_handle deleted file mode 100644 index 053182d84..000000000 --- a/elements/rabbitmq-server/os-apply-config/etc/rabbitmq/heat_password_handle +++ /dev/null @@ -1 +0,0 @@ -{{rabbit.password_handle}} diff --git a/elements/rabbitmq-server/os-apply-config/etc/rabbitmq/heat_users.json b/elements/rabbitmq-server/os-apply-config/etc/rabbitmq/heat_users.json deleted file mode 100644 index 5d676a569..000000000 --- a/elements/rabbitmq-server/os-apply-config/etc/rabbitmq/heat_users.json +++ /dev/null @@ -1 +0,0 @@ -{{rabbit.users}} diff --git a/elements/rabbitmq-server/os-apply-config/etc/rabbitmq/rabbitmq.config b/elements/rabbitmq-server/os-apply-config/etc/rabbitmq/rabbitmq.config deleted file mode 100644 index 288858fd1..000000000 --- a/elements/rabbitmq-server/os-apply-config/etc/rabbitmq/rabbitmq.config +++ /dev/null @@ -1,23 +0,0 @@ -[ - {kernel, - [ - {inet_dist_listen_min, 61000}, - {inet_dist_listen_max, 61000}, - {inet_default_listen_options, - [{nodelay,true} - ,{sndbuf,65535} - ,{recbuf,65535} - ,{{#rabbit.keepalive_disabled}}{keepalive, false}{{/rabbit.keepalive_disabled}}{{^rabbit.keepalive_disabled}}{keepalive, true}{{/rabbit.keepalive_disabled}} - ]}, - {inet_default_connect_options, - [{nodelay,true} - ,{{#rabbit.keepalive_disabled}}{keepalive, false}{{/rabbit.keepalive_disabled}}{{^rabbit.keepalive_disabled}}{keepalive, true}{{/rabbit.keepalive_disabled}} - ]} - ] - }, - {rabbit, [ - {cluster_partition_handling, {{#rabbit.cluster_partition_handling}}{{rabbit.cluster_partition_handling}}{{/rabbit.cluster_partition_handling}}{{^rabbit.cluster_partition_handling}}pause_minority{{/rabbit.cluster_partition_handling}} }, - {loopback_users, []}, - {tcp_listeners, [{"127.0.0.1", 5672}, {"{{local-ipv4}}", 5672}]} - ]} -]. diff --git a/elements/rabbitmq-server/os-apply-config/etc/security/limits.d/rabbitmq_limits.conf b/elements/rabbitmq-server/os-apply-config/etc/security/limits.d/rabbitmq_limits.conf deleted file mode 100644 index 54e937982..000000000 --- a/elements/rabbitmq-server/os-apply-config/etc/security/limits.d/rabbitmq_limits.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Set number of file descriptors -{{#rabbit.nofile}} -rabbitmq hard nofile {{.}} -rabbitmq soft nofile {{.}} -{{/rabbit.nofile}} diff --git a/elements/rabbitmq-server/os-apply-config/var/lib/rabbitmq/.erlang.cookie b/elements/rabbitmq-server/os-apply-config/var/lib/rabbitmq/.erlang.cookie deleted file mode 100644 index 8f4d176d1..000000000 --- a/elements/rabbitmq-server/os-apply-config/var/lib/rabbitmq/.erlang.cookie +++ /dev/null @@ -1 +0,0 @@ -{{rabbit.cookie}} diff --git a/elements/rabbitmq-server/os-apply-config/var/lib/rabbitmq/.erlang.cookie.oac b/elements/rabbitmq-server/os-apply-config/var/lib/rabbitmq/.erlang.cookie.oac deleted file mode 100644 index a44a0ec49..000000000 --- a/elements/rabbitmq-server/os-apply-config/var/lib/rabbitmq/.erlang.cookie.oac +++ /dev/null @@ -1,3 +0,0 @@ -mode: 0600 -owner: rabbitmq -group: rabbitmq diff --git a/elements/rabbitmq-server/os-refresh-config/configure.d/20-rabbitmq-server-selinux b/elements/rabbitmq-server/os-refresh-config/configure.d/20-rabbitmq-server-selinux deleted file mode 100755 index 97083ab0d..000000000 --- a/elements/rabbitmq-server/os-refresh-config/configure.d/20-rabbitmq-server-selinux +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -eu - -[ -x /usr/sbin/semanage ] || exit 0 - -RABBIT_LIB_DIR="$(readlink -f /var/lib/rabbitmq)" -RABBIT_LOG_DIR="$(readlink -f /var/log/rabbitmq)" - -semanage fcontext -a -t rabbitmq_var_lib_t "$RABBIT_LIB_DIR(/.*)?" -restorecon -Rv $RABBIT_LIB_DIR - -semanage fcontext -a -t rabbitmq_var_log_t "$RABBIT_LOG_DIR(/.*)?" -restorecon -Rv $RABBIT_LOG_DIR diff --git a/elements/rabbitmq-server/os-refresh-config/post-configure.d/51-rabbitmq b/elements/rabbitmq-server/os-refresh-config/post-configure.d/51-rabbitmq deleted file mode 100755 index dfdf040ac..000000000 --- a/elements/rabbitmq-server/os-refresh-config/post-configure.d/51-rabbitmq +++ /dev/null @@ -1,136 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -BOOTSTRAP_NODE="$(os-apply-config --key bootstrap_host.bootstrap_nodeid --type netaddress --key-default '')" -LOCAL_RABBIT_HOST="$(os-apply-config --key bootstrap_host.nodeid --type netaddress --key-default '')" -NODES=$(os-apply-config --key rabbit.nodes --type raw --key-default '' | sed 's/,/\n/g' | sort) -# convert nodes to lowercase because rabbitmq uses hostname locally, hostname -# is lowercased by cloud-init. If uppercase is used for node names then -# there would be mismatch. -BOOTSTRAP_NODE=${BOOTSTRAP_NODE,,} -LOCAL_RABBIT_HOST=${LOCAL_RABBIT_HOST,,} -NODES=(${NODES,,}) -TOTAL_NODES=${#NODES[@]} - -# Insufficient meta-data to attempt to start-up RabbitMQ. -if [ -z "${LOCAL_RABBIT_HOST}" -o -z "${BOOTSTRAP_NODE}" ]; then - echo "RabbitMQ bootstrap_host details are not fully defined in heat meta-data, aborting." - exit 255 -fi - -os-svc-enable -n rabbitmq-server - -## Non-cluster configuration set-up. ## -if [ ${TOTAL_NODES} -le 1 -a \ - "${BOOTSTRAP_NODE}" == "${LOCAL_RABBIT_HOST}" ] && - ! rabbitmq_is_in_cluster; then - os-svc-restart -n rabbitmq-server - echo "RabbitMQ non-cluster configuration complete..." - exit 0 -fi - -NODE_INDEX="" -# Find the nodes being worked on in the NODES array. -for (( index = 0; index < ${TOTAL_NODES}; index++ )); do - if [ "${NODES[$index]}" == "${LOCAL_RABBIT_HOST}" ]; then - NODE_INDEX=${index} - fi -done - -if [ ${TOTAL_NODES} -lt 3 -o -z "${NODE_INDEX}" ]; then - # We do not have sufficient nodes to support HA so lets abort. - # -OR- we did not find our node in the array and hence did not set node_indexs. - echo "TOTAL_NODES: ${TOTAL_NODES}, NODE_INDEX: ${NODE_INDEX}" - echo "RabbitMQ cluster configuration prerequisites not met, aborting." - exit 255 -fi - -for (( index = 0; index < ${TOTAL_NODES}; index++ )); do - if ! ping -c1 "${NODES[$index]}"; then - echo "RabbitMQ host unreachable: ${NODES[$index]}" - HOST_UNREACHABLE=1 - fi -done -[ -z "${HOST_UNREACHABLE:-}" ] || exit 1 - -# Refuse to stop unless all nodes are running, this avoids pause_minority. -# From the RabbitMQ docs: pause_minority -# Your network is maybe less reliable. You have clustered across 3 AZs -# in EC2, and you assume that only one AZ will fail at once. In that -# scenario you want the remaining two AZs to continue working and the -# nodes from the failed AZ to rejoin automatically and without fuss when -# the AZ comes back. -# (See: os-apply-config/etc/rabbitmq/rabbitmq.config) -# -# We want to orchestrate nodes leaving the cluster. We'll do this using a -# metronome. For example, if we have 3 nodes, there will be six periods. -# The first node may leave in period 0. The second node may leave in period -# 1. The third node may leave in period 2. -# -# Metronome: 0 .. 1 .. 2 .. 3 .. 4 .. 5 .. -# Node leaves: 0 ....... 1 ....... 2 ....... -# -# The dead periods in between allow for $PERIOD seconds of clock -# desynchronization. PERIOD should be about the half the length of time it -# takes for a node to join the cluster. -PERIOD=10 -NODE_LEAVES_AT=$(( ${NODE_INDEX} * 2 )) -while rabbitmq_is_in_cluster; do - NODES_IN_CLUSTER=$(rabbitmq_size_of_cluster --remote-host "${BOOTSTRAP_NODE}") - if [ ${NODES_IN_CLUSTER} -gt ${TOTAL_NODES} ]; then - echo "A node we don't know about appears to have joined the cluster, aborting." - exit 255 - fi - - METRONOME=$(( ($(date +%s) / ${PERIOD}) % (${TOTAL_NODES} * 2) )) - if [ ${NODES_IN_CLUSTER} -eq ${TOTAL_NODES} -a \ - ${METRONOME} -eq ${NODE_LEAVES_AT} ]; then - # All other nodes are in the cluster and it's our allotted time, - # safe to leave. Tell other nodes we're about to leave the cluster. - echo "Leaving cluster..." - timeout 300 rabbitmq_reset_node || exit 1 - else - echo "Refusing to allow node to leave cluster..." - fi - sleep 2 -done - -# Restart RabbitMQ. We need to have left the cluster first or we risk data loss. -os-svc-restart -n rabbitmq-server - -# We're the bootstrap node -if [ "${LOCAL_RABBIT_HOST}" == "${BOOTSTRAP_NODE}" ]; then - # If we are not in a cluster keep trying to join a node. - # Note: This loop is required as the BOOTSTRAP_NODE may have left a running - # cluster and it therefore must re-join. - while ! rabbitmq_is_in_cluster; do - # Try to join with each node in turn. - COUNT=$(( (${COUNT:-0} + 1) % ${TOTAL_NODES} )) - if [ ${COUNT} -ne ${NODE_INDEX} ]; then - rabbitmq_join_cluster --remote-host "${NODES[${COUNT}]}" --clean-on-error || true - fi - done - - # Check that we have not got a partition i.e. The case where we do not have - # synced clocks and hence we can get split in the clustering A+B C. If we - # get this we will wait as this is more favourable than a bad/broken - # cluster set-up. - while [[ $(rabbitmq_size_of_cluster) -ne ${TOTAL_NODES} ]]; do - echo "Waiting for nodes to join [${BOOTSTRAP_NODE}]..." - sleep 10 - done -else - # Wait until the BOOTSTRAP_NODE has at least formed a cluster with one node. - while [[ $(rabbitmq_size_of_cluster --remote-host "${BOOTSTRAP_NODE}") -lt 2 ]]; do - echo "Waiting for bootstrap node to initialise the cluster..." - sleep 10 - done - rabbitmq_join_cluster --remote-host "${BOOTSTRAP_NODE}" --clean-on-error -fi - -# Make sure that all queues (except those with auto-generated names) are -# mirrored across all nodes in the cluster running: -rabbitmqctl set_policy HA '^(?!amq\.).*' '{"ha-mode": "all"}' - -echo "RabbitMQ cluster configuration complete..." diff --git a/elements/rabbitmq-server/os-refresh-config/post-configure.d/52-rabbitmq-passwords b/elements/rabbitmq-server/os-refresh-config/post-configure.d/52-rabbitmq-passwords deleted file mode 100755 index 387689e56..000000000 --- a/elements/rabbitmq-server/os-refresh-config/post-configure.d/52-rabbitmq-passwords +++ /dev/null @@ -1,126 +0,0 @@ -#!/usr/bin/env python -# Copyright 2013 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# - -from __future__ import print_function - -import base64 -import json -import logging -import os -import subprocess -import sys - -logging.basicConfig( - level='INFO', - format='[%(asctime)s] (%(name)s) [%(levelname)s] %(message)s') -LOG = logging.getLogger(os.path.basename(sys.argv[0])) - -USERS_FILE = '/etc/rabbitmq/heat_users.json' -HANDLE_FILE = '/etc/rabbitmq/heat_password_handle' - -# USERS_FILE can exist without any content, in which case it will just be an -# empty line. -if not os.path.exists(USERS_FILE) or os.path.getsize(USERS_FILE) < 2: - sys.exit(0) - -PASSWORD_HANDLE = None -if os.path.exists(HANDLE_FILE): - with open(HANDLE_FILE) as hf: - PASSWORD_HANDLE = hf.read().rstrip() - - -def get_existing_users(): - list_users = subprocess.check_output(['rabbitmqctl', 'list_users'], - stderr=subprocess.STDOUT) - users = {} - for line in list_users.splitlines(): - if line.startswith('Listing users'): - continue - if line.startswith('...'): - continue - try: - user, tags = line.split(None, 1) - tags = tags.split('[')[1].split(']')[0].split(',') - except ValueError as e: - LOG.warning('{%s} did not have expected format.' % (line)) - LOG.exception(e) - continue - users[user] = {'username': user, 'tags': tags} - return users - -with open(USERS_FILE) as uf: - user_map = json.loads(uf.read()) - -have_map = get_existing_users() - -want = set(user_map.keys()) -have = set(have_map.keys()) -need = want - have - -LOG.info("want = %s" % want) -LOG.info("have = %s" % have) -LOG.info("need = %s" % need) - -for need_user in need: - detail = user_map[need_user] - username = detail['username'] - if username not in have: - password = detail.get('password', base64.b64encode(os.urandom(40))) - subprocess.check_call(['rabbitmqctl', 'add_user', username, password], - stdout=sys.stderr) - if PASSWORD_HANDLE: - subprocess.check_call(['cfn-signal', - '-s', 'true', - '-i', username, - '--data', password, - PASSWORD_HANDLE]) - else: - print('%s:%s' % (username, password)) - elif 'password' in detail: - args = ['rabbitmqctl', 'change_password', username, detail['password']] - subprocess.check_call(args, stdout=sys.stderr) - # no "else", we have a user that exists, and no assertion about passwords. - # we don't want to generate a new password if this is just a user that - # we're setting user tags on. - if 'permissions' in detail: - args = ['rabbitmqctl', 'set_permissions', username] - args.append(detail['permissions']['conf']) - args.append(detail['permissions']['write']) - args.append(detail['permissions']['read']) - subprocess.check_call(args, stdout=sys.stderr) - if 'tags' in detail: - tags = detail['tags'] - args = ['rabbitmqctl', 'set_user_tags', username] - args.extend(tags) - subprocess.check_call(args, stdout=sys.stderr) - -have = set(get_existing_users().keys()) -if want - have: - LOG.error('Desired users missing: want=%s have=%s', want, have) - sys.exit(1) - -CLEAN_USERS = subprocess.Popen(['os-apply-config', '--key', - 'rabbit.clean_users', - '--key-default', 'False'], - stdout=subprocess.PIPE).stdout.read() - -if 'True' in CLEAN_USERS: - to_delete = have - want - for username in to_delete: - subprocess.check_call(['rabbitmqctl', 'delete_user', username], - stdout=sys.stderr) - LOG.debug("Deleted user %s" % username) diff --git a/elements/rabbitmq-server/os-refresh-config/pre-configure.d/97-rabbitmq-server-fedora-iptables b/elements/rabbitmq-server/os-refresh-config/pre-configure.d/97-rabbitmq-server-fedora-iptables deleted file mode 100755 index 000c69d42..000000000 --- a/elements/rabbitmq-server/os-refresh-config/pre-configure.d/97-rabbitmq-server-fedora-iptables +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -eu - -# AMQP -add-rule INPUT -p tcp --dport 5672 -j ACCEPT diff --git a/elements/rabbitmq-server/os-refresh-config/pre-configure.d/98-rabbitmq-iptables b/elements/rabbitmq-server/os-refresh-config/pre-configure.d/98-rabbitmq-iptables deleted file mode 100755 index fca51fe55..000000000 --- a/elements/rabbitmq-server/os-refresh-config/pre-configure.d/98-rabbitmq-iptables +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -eu - -add-rule INPUT -p tcp -m multiport --dports 4369,61000 -j ACCEPT diff --git a/elements/rally/README.md b/elements/rally/README.md deleted file mode 100644 index 0d958ee32..000000000 --- a/elements/rally/README.md +++ /dev/null @@ -1,11 +0,0 @@ -Installs Rally OpenStack benchmarking and profiling tool. - -Overview --------- - -[Rally] (https://wiki.openstack.org/wiki/Rally) is a CLI tool (and optional API -service) that allows you to test how your OpenStack installation performs at -scale and find bottlenecks using the integrated profiler. - -Wiki [HowTo page] (https://wiki.openstack.org/wiki/Rally/HowTo) provides examples -how to use Rally. diff --git a/elements/rally/element-deps b/elements/rally/element-deps deleted file mode 100644 index f5a85e717..000000000 --- a/elements/rally/element-deps +++ /dev/null @@ -1,2 +0,0 @@ -os-svc-install -source-repositories diff --git a/elements/rally/environment.d/10-rally-venv-dir.bash b/elements/rally/environment.d/10-rally-venv-dir.bash deleted file mode 100644 index 95b07a8e6..000000000 --- a/elements/rally/environment.d/10-rally-venv-dir.bash +++ /dev/null @@ -1,3 +0,0 @@ -if [ -z "${RALLY_VENV_DIR:-}" ]; then - export RALLY_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/rally"} -fi diff --git a/elements/rally/install.d/rally-source-install/51-rally b/elements/rally/install.d/rally-source-install/51-rally deleted file mode 100755 index efc29e3df..000000000 --- a/elements/rally/install.d/rally-source-install/51-rally +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -set -eux - -install-packages libpq-dev python-dev libevent-dev libssl-dev libffi-dev - -os-svc-install -u rally -r /opt/stack/rally - -ln -sf $RALLY_VENV_DIR/bin/rally /usr/local/bin/rally -ln -sf $RALLY_VENV_DIR/bin/rally-manage /usr/local/bin/rally-manage - -$RALLY_VENV_DIR/bin/rally-manage db recreate diff --git a/elements/rally/source-repository-rally b/elements/rally/source-repository-rally deleted file mode 100644 index fdf6e831a..000000000 --- a/elements/rally/source-repository-rally +++ /dev/null @@ -1 +0,0 @@ -rally git /opt/stack/rally https://git.openstack.org/stackforge/rally diff --git a/elements/rdo-release/README.md b/elements/rdo-release/README.md deleted file mode 100644 index 0d5971c92..000000000 --- a/elements/rdo-release/README.md +++ /dev/null @@ -1,5 +0,0 @@ -Enables the RDO yum repository for a released version of OpenStack on Red Hat -based operating systems. $RDO_RELEASE is set by default to the latest openstack -release. It can be overridden to select the version of RDO to install. -Set the environment variable to 'juno' to set the default version to -install to 'juno'. diff --git a/elements/rdo-release/environment.d/10-rdo-release-name.bash b/elements/rdo-release/environment.d/10-rdo-release-name.bash deleted file mode 100644 index ce07fba0f..000000000 --- a/elements/rdo-release/environment.d/10-rdo-release-name.bash +++ /dev/null @@ -1 +0,0 @@ -export RDO_RELEASE=${RDO_RELEASE:-kilo} diff --git a/elements/rdo-release/pre-install.d/10-rdo-release-repo b/elements/rdo-release/pre-install.d/10-rdo-release-repo deleted file mode 100755 index 8defa81e8..000000000 --- a/elements/rdo-release/pre-install.d/10-rdo-release-repo +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eux - -rpm -q rdo-release || install-packages http://rdo.fedorapeople.org/openstack-$RDO_RELEASE/rdo-release-$RDO_RELEASE.rpm diff --git a/elements/remove-serial-console/README.md b/elements/remove-serial-console/README.md deleted file mode 100644 index 7f9dcf59f..000000000 --- a/elements/remove-serial-console/README.md +++ /dev/null @@ -1,9 +0,0 @@ -Remove any serial console configuration from grub. - -This element removes serial console configuration from grub. Typically this -configuration is already present in the upstream cloud images, since it is -necessary for useful console output being captured by the cloud provider. -However, for local testing, this means that upstart messages are typically -not present on tty1, making manual debugging efforts very hard. -Including this element in a build, will cause "console=ttyS0" to be removed -from the kernel command line and the grub configurations. diff --git a/elements/remove-serial-console/finalise.d/60-purge-serial-console b/elements/remove-serial-console/finalise.d/60-purge-serial-console deleted file mode 100755 index b6d64524e..000000000 --- a/elements/remove-serial-console/finalise.d/60-purge-serial-console +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -sed -i -e 's/ console=ttyS0//' /etc/default/grub - -GRUB_CONFIG_FILE="" - -if [ -e /boot/grub/grub.cfg ] ; then - # Ubuntu and Debian are using /boot/grub/grub.cfg for the grub2 - # configuration - GRUB_CONFIG_FILE=/boot/grub/grub.cfg -elif [ -e /boot/grub2/grub.cfg ]; then - # On openSUSE and recent Fedora releases the grub2 config resides - # in /boot/grub2/grub.cfg - GRUB_CONFIG_FILE=/boot/grub2/grub.cfg -fi - -if [ "$GRUB_CONFIG_FILE" ]; then - sed -i -e 's/ console=ttyS0//' $GRUB_CONFIG_FILE -fi diff --git a/elements/restore-ssh-host-keys/README.md b/elements/restore-ssh-host-keys/README.md deleted file mode 100644 index 588083fe3..000000000 --- a/elements/restore-ssh-host-keys/README.md +++ /dev/null @@ -1,16 +0,0 @@ -Because of poor interactions with cloud-init and nova rebuilds, we -have a timing problem when trying to store SSH host keys on the state -drive. Basically cloud-init checks for them before it mounts the state -drive. - -So we're going to back them up to the state drive when we intend to do -a rebuild, and then restore them if they are present. Note that there -is not currently a standard place to do such a backup in TripleO. The -operator would need to do this before any rebuilds are issued, or expect -that machines will get new SSH host keys after rebuild. -This element will restore host keys from /mnt/state/\_ssh\_host\_keys, if -they are found. - -To allow external services to determine when the ssh host key has been -restored we are appending a string to the sshd version information when a host -key is restored. diff --git a/elements/restore-ssh-host-keys/element-deps b/elements/restore-ssh-host-keys/element-deps deleted file mode 100644 index 5a1dcb6dd..000000000 --- a/elements/restore-ssh-host-keys/element-deps +++ /dev/null @@ -1 +0,0 @@ -disable-os-collect-config diff --git a/elements/restore-ssh-host-keys/os-refresh-config/pre-configure.d/10-restore-ssh-host-keys b/elements/restore-ssh-host-keys/os-refresh-config/pre-configure.d/10-restore-ssh-host-keys deleted file mode 100755 index d13a4147d..000000000 --- a/elements/restore-ssh-host-keys/os-refresh-config/pre-configure.d/10-restore-ssh-host-keys +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -set -eux -set -o pipefail - -CLOUD_DIR="/var/lib/cloud" -KEYS_DIR="/mnt/state/_ssh_host_keys" -if [ -d "$KEYS_DIR" ]; then - # Block this element from proceeding forward until cloud-init has written - # out new SSH keys in order to prevent the restored keys from being - # overwritten. - while [[ ! -f "$CLOUD_DIR/instances/$(cat $CLOUD_DIR/data/instance-id)/sem/config_ssh" ]]; do - echo "Waiting until cloud-init has completed SSH configuration." - sleep 1 - done - mv -f ${KEYS_DIR}/ssh_host_* /etc/ssh/ && rm -rf "$KEYS_DIR" - grep -q -F 'VersionAddendum TRIPLEO_HK_RESTORED' /etc/ssh/sshd_config || echo 'VersionAddendum TRIPLEO_HK_RESTORED' >> /etc/ssh/sshd_config - os-svc-restart -n ssh -fi diff --git a/elements/salt-master/README.md b/elements/salt-master/README.md deleted file mode 100644 index 326b91f65..000000000 --- a/elements/salt-master/README.md +++ /dev/null @@ -1 +0,0 @@ -Adds salt-master, a config-management tool, to the image. diff --git a/elements/salt-master/install.d/10-salt-master b/elements/salt-master/install.d/10-salt-master deleted file mode 100755 index b16d93449..000000000 --- a/elements/salt-master/install.d/10-salt-master +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -set -e -set -o xtrace - -install-packages salt-master - diff --git a/elements/salt-master/pre-install.d/10-salt-master b/elements/salt-master/pre-install.d/10-salt-master deleted file mode 100755 index dd1389a73..000000000 --- a/elements/salt-master/pre-install.d/10-salt-master +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -# Add the salt PPA - -set -e -set -o xtrace - -add-apt-repository -y ppa:saltstack/salt - diff --git a/elements/salt-minion/README.md b/elements/salt-minion/README.md deleted file mode 100644 index 14508ec2f..000000000 --- a/elements/salt-minion/README.md +++ /dev/null @@ -1 +0,0 @@ -Adds salt-minion, a config-management tool, to the image. diff --git a/elements/salt-minion/install.d/10-salt-minion b/elements/salt-minion/install.d/10-salt-minion deleted file mode 100755 index 15d5ee4df..000000000 --- a/elements/salt-minion/install.d/10-salt-minion +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -set -e -set -o xtrace - -install-packages salt-minion - diff --git a/elements/salt-minion/pre-install.d/10-salt-minion b/elements/salt-minion/pre-install.d/10-salt-minion deleted file mode 100755 index dd1389a73..000000000 --- a/elements/salt-minion/pre-install.d/10-salt-minion +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -# Add the salt PPA - -set -e -set -o xtrace - -add-apt-repository -y ppa:saltstack/salt - diff --git a/elements/seed-debug-logging/README.md b/elements/seed-debug-logging/README.md deleted file mode 100644 index e5ff47cfe..000000000 --- a/elements/seed-debug-logging/README.md +++ /dev/null @@ -1,3 +0,0 @@ -Enable debug logging on the seed - -Adding this element will turn on debug for the openstack services. diff --git a/elements/seed-debug-logging/debug.json b/elements/seed-debug-logging/debug.json deleted file mode 100644 index 74335a349..000000000 --- a/elements/seed-debug-logging/debug.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "ceilometer": { - "debug": true - }, - "cinder": { - "debug": true - }, - "glance": { - "debug": true - }, - "heat": { - "debug": true - }, - "ironic": { - "debug": true - }, - "neutron": { - "debug": true - }, - "nova": { - "debug": true - } -} diff --git a/elements/seed-debug-logging/element-deps b/elements/seed-debug-logging/element-deps deleted file mode 100644 index bae0c9b06..000000000 --- a/elements/seed-debug-logging/element-deps +++ /dev/null @@ -1 +0,0 @@ -seed-stack-config diff --git a/elements/seed-debug-logging/install.d/02-seed-debug-logging b/elements/seed-debug-logging/install.d/02-seed-debug-logging deleted file mode 100755 index ac3113dda..000000000 --- a/elements/seed-debug-logging/install.d/02-seed-debug-logging +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -eux -set -o pipefail - -install -D -m 0755 -o root -g root "$(dirname $0)/../debug.json" /var/lib/os-collect-config/local-data/debug.json diff --git a/elements/seed-stack-config/README.md b/elements/seed-stack-config/README.md deleted file mode 100644 index 2148be0b3..000000000 --- a/elements/seed-stack-config/README.md +++ /dev/null @@ -1,32 +0,0 @@ -Provide configuration for seed clouds -------------------------------------- - -Seed clouds are booted without any cloud infrastructure. The seed-stack-config -element stubs out enough infrastructure to permit the rest of boot-stack to -work either when booted by a cloud, or booted without. - -In particular, it sets up resolv.conf, a hosts file, and delivers a Heat -metadata file with static data into the image (rather than that being delivered -at boot-time by Heat itself). - -Usage ------ - -Copy config.json (our basic schema) to local.json and customise it for your -deployment environment. The default is mostly configured for nova-baremetal -operation in a seed VM (just add SSH key). The configuration options are -documented in the actual elements that use the configuration - e.g. nova, -neutron etc. If local.json does not exist, config.json will be used, but -this is for backwards compatibility and will be removed in a future release. - -Configuration keys ------------------- - - bootstack: - public\_interface\_ip: 192.0.2.1/24 - - What IP address to place on the ovs public interface. Only intended for - use when the interface will not be otherwise configured. - masquerade\_networks: [192.0.2.0] - - What networks, if any, to masquerade. When set, all traffic being - output from each network to other networks is masqueraded. Traffic - to 192.168.122.1 is never masqueraded. diff --git a/elements/seed-stack-config/config.json b/elements/seed-stack-config/config.json deleted file mode 100644 index d1357d449..000000000 --- a/elements/seed-stack-config/config.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "OpenStack::Heat::Stack": { - }, - "admin-password": "unset", - "admin-token": "unset", - "db-password": "unset", - "local-ipv4": "192.0.2.1", - "keystone": { - "host": "127.0.0.1", - "db": "mysql://keystone:unset@localhost/keystone" - }, - "mysql": { - "root-password" : "unset", - "bind_address" : "127.0.0.1" - }, - "rabbit": { - "host": "127.0.0.1", - "username": "guest", - "password": "guest", - "cookie": "unset" - }, - "glance": { - "host": "127.0.0.1", - "port": "9292", - "protocol": "http", - "db": "mysql://glance:unset@localhost/glance", - "service-password": "unset", - "api": { - "backend": "file" - } - }, - "nova": { - "compute_hostname": "seed", - "host": "127.0.0.1", - "db": "mysql://nova:unset@localhost/nova", - "compute_driver": "baremetal.driver.BareMetalDriver", - "default_ephemeral_format": "ext4", - "tuning": { - "ram_allocation_ratio": "1.0", - "reserved_host_memory_mb": "0" - }, - "baremetal": { - "arch": "i386", - "db": "mysql://nova:unset@localhost/nova_bm", - "power_manager": "nova.virt.baremetal.virtual_power_driver.VirtualPowerManager", - "pxe_deploy_timeout": "2400", - "virtual_power": { - "user": "stack", - "ssh_key": "PUTAPRIVATEKEYHERE", - "ssh_host": "192.168.122.1", - "type": "virsh" - } - }, - "metadata-proxy": "false", - "service-password": "unset" - }, - "bootstack": { - "public_interface_ip": "192.0.2.1/24", - "masquerade_networks": ["192.0.2.0/24"] - }, - "bootstrap_host": { - "bootstrap_nodeid": "seed", - "nodeid": "seed" - }, - "neutron": { - "host": "127.0.0.1", - "ovs_db": "mysql://neutron:unset@localhost/ovs_neutron?charset=utf8", - "ovs": { - "bridge_mappings": "ctlplane:br-ctlplane", - "enable_tunneling": "False", - "local_ip": "192.0.2.1", - "network_vlan_ranges": "ctlplane", - "physical_bridge": "br-ctlplane", - "public_interface": "eth1", - "tenant_network_type": "vlan" - }, - "service-password": "unset" - }, - "heat": { - "db": "mysql://heat:unset@localhost/heat", - "auth_encryption_key": "unset___________", - "watch_server_url": "http://192.0.2.1:8003", - "waitcondition_server_url": "http://192.0.2.1:8000/v1/waitcondition", - "metadata_server_url": "http://192.0.2.1:8000", - "admin_tenant_name": "service", - "admin_user": "heat", - "admin_password": "unset" - }, - "horizon": { - "secret_key": "unset___________" - }, - "ironic": { - "db": "mysql://ironic:unset@localhost/ironic", - "service-password": "unset", - "virtual_power_ssh_key": "PRIVATE KEY GOES HERE" - }, - "os-collect-config": { - "collectors": "heat_local" - } -} diff --git a/elements/seed-stack-config/element-deps b/elements/seed-stack-config/element-deps deleted file mode 100644 index 9d8b6b7a5..000000000 --- a/elements/seed-stack-config/element-deps +++ /dev/null @@ -1,2 +0,0 @@ -os-apply-config -os-refresh-config diff --git a/elements/seed-stack-config/install.d/01-seed-stack-heat-metadata b/elements/seed-stack-config/install.d/01-seed-stack-heat-metadata deleted file mode 100755 index a6880b2bb..000000000 --- a/elements/seed-stack-config/install.d/01-seed-stack-heat-metadata +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -eux - -mkdir -p /var/lib/cloud/data - -CONFIG_DIR="$(dirname $0)/../" -if [ -e "$CONFIG_DIR/local.json" ]; then - CONFIG_FILE="$CONFIG_DIR/local.json" -else - echo "Deprecated: Using config.json rather than local.json" >&2 - CONFIG_FILE="$CONFIG_DIR/config.json" -fi -install -D -m 0755 -o root -g root "$CONFIG_FILE" /var/lib/heat-cfntools/cfn-init-data diff --git a/elements/seed-stack-config/install.d/11-seed-stack-heat-metadata b/elements/seed-stack-config/install.d/11-seed-stack-heat-metadata deleted file mode 100755 index 31bf1efc9..000000000 --- a/elements/seed-stack-config/install.d/11-seed-stack-heat-metadata +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -set -eux - -# Run only the heat_local collector when first booting -cat > /etc/os-collect-config.conf < . - -- bin/add-selinux-path-substitution - -Adds a path substitution from a source to a target path. Can be used to -indicate the SELinux rules that normally apply to the packaged version -of nova at /usr/bin/nova (source path) should also be applied to the -source version at /opt/stack/venvs/nova/bin/nova (target path). - -- bin/restore-selinux-file-context - -Recursively restores the file context on a file or directory. It is a -wrapper script around restorecon -Rv . diff --git a/elements/selinux/bin/add-selinux-file-context b/elements/selinux/bin/add-selinux-file-context deleted file mode 100755 index 1a2177ecf..000000000 --- a/elements/selinux/bin/add-selinux-file-context +++ /dev/null @@ -1,50 +0,0 @@ -#! /bin/bash -# -# Copyright 2014 Red Hat -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -set -eux -set -o pipefail - -function show_options() { - echo "Usage: $0 TYPE TARGET_PATH" - echo - echo "Adds SELinux TYPE for TARGET_PATH" - echo - echo "TARGET_PATH can be a specific file or directory" - echo "Or an expression that includes everything under a" - echo "specific directory." - echo - echo "Example:" - echo - echo "add-selinux-file-context nova_var_run_t /var/run/nova(/.*)" - echo - echo "Applies the type nova_var_run_type to /var/run/nova and" - echo "every file and directory under that directory." -} - -TYPE=${1:-""} -TARGET_PATH=${2:-""} - -if [ -z "$TYPE" -o -z "$TARGET_PATH" ]; then - show_options -fi - -if [ ! -x /usr/sbin/semanage ]; then - echo "SELinux not available" - exit 0 -fi - -semanage fcontext -a -t $TYPE $TARGET_PATH diff --git a/elements/selinux/bin/add-selinux-path-substitution b/elements/selinux/bin/add-selinux-path-substitution deleted file mode 100755 index 540a3a7c4..000000000 --- a/elements/selinux/bin/add-selinux-path-substitution +++ /dev/null @@ -1,53 +0,0 @@ -#! /bin/bash -# -# Copyright 2014 Red Hat -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -set -eux -set -o pipefail - -function show_options() { - echo "Usage: $0 SOURCE_PATH TARGET_PATH" - echo - echo "Context labeling for the TARGET_PATH is made equivalent" - echo "to the SOURCE_PATH" - echo - echo "Can be used to relabel file contexts for files installed" - echo "in non-standard locations. For example when nova is installed" - echo "under /opt/stack/venvs/nova/bin (target) instead of /usr/bin/" - echo "(source). Adding a path subsitution would correct the file" - echo "contexts for files in /opt/stack/venvs/nova/bin. They would" - echo "be labeled with the same contexts as if they had been installed" - echo "at /usr/bin by a rpm package." -} - -SOURCE_PATH=${1:-""} -TARGET_PATH=${2:-""} - -if [ -z "$SOURCE_PATH" -o -z "$TARGET_PATH" ]; then - show_options -fi - -if [ ! -x /usr/sbin/semanage ]; then - echo "SELinux not available" - exit 0 -fi - -# Add the path if it doesn't already exist -if [ "`semanage fcontext -l | grep $TARGET_PATH`" == "" ]; then - semanage fcontext -N -a -e $SOURCE_PATH $TARGET_PATH -fi - -restorecon -Rv $TARGET_PATH diff --git a/elements/selinux/bin/restore-selinux-file-context b/elements/selinux/bin/restore-selinux-file-context deleted file mode 100755 index 79b0191d2..000000000 --- a/elements/selinux/bin/restore-selinux-file-context +++ /dev/null @@ -1,39 +0,0 @@ -#! /bin/bash -# -# Copyright 2014 Red Hat -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -set -eux -set -o pipefail - -function show_options() { - echo "Usage: $0 TARGET_PATH" - echo - echo "Restores file(s) default SELinux security context in" - echo "TARGET_PATH" -} - -TARGET_PATH=${1:-""} - -if [ -z "$TARGET_PATH" ]; then - show_options -fi - -if [ ! -x /usr/sbin/semanage ]; then - echo "SELinux not available" - exit 0 -fi - -restorecon -Rv $TARGET_PATH diff --git a/elements/selinux/custom-policies/tripleo-selinux-keepalived.te b/elements/selinux/custom-policies/tripleo-selinux-keepalived.te deleted file mode 100644 index 423d47929..000000000 --- a/elements/selinux/custom-policies/tripleo-selinux-keepalived.te +++ /dev/null @@ -1,35 +0,0 @@ - -module tripleo-selinux-keepalived 1.0; - -gen_require(` - type haproxy_t; - type keepalived_t; - type var_log_t; - type cloud_var_lib_t; - type ifconfig_exec_t; - type init_var_lib_t; - type var_lib_t; - class process signull; - class capability kill; - class dir { getattr search open read lock ioctl }; - class file { open getattr read ioctl lock execute execute_no_trans }; - class lnk_file { getattr read }; -') - -#============= keepalived_t ============== -# killall denials -# https://bugs.launchpad.net/tripleo/+bug/1379079 -# https://bugzilla.redhat.com/show_bug.cgi?id=1145886 -# https://bugzilla.redhat.com/show_bug.cgi?id=1151647 - -domain_read_all_domains_state(keepalived_t) -allow keepalived_t haproxy_t:process signull; -allow keepalived_t self:capability kill; - -# https://bugs.launchpad.net/tripleo/+bug/1416056 -# https://bugzilla.redhat.com/show_bug.cgi?id=1187348 -allow keepalived_t cloud_var_lib_t:file { read getattr open }; -allow keepalived_t ifconfig_exec_t:file { read getattr open execute execute_no_trans }; -allow keepalived_t init_var_lib_t:file { read getattr open }; -allow keepalived_t var_lib_t:file { read getattr open }; -allow keepalived_t var_log_t:file open; diff --git a/elements/selinux/custom-policies/tripleo-selinux-keystone.te b/elements/selinux/custom-policies/tripleo-selinux-keystone.te deleted file mode 100644 index a3846a100..000000000 --- a/elements/selinux/custom-policies/tripleo-selinux-keystone.te +++ /dev/null @@ -1,15 +0,0 @@ - -module tripleo-selinux-keystone 1.0; - -require { - type var_run_t; - type keystone_t; - class dir { write add_name }; - class file { write getattr setattr read create open }; -} - -#============= keystone_t ============== -# https://bugzilla.redhat.com/show_bug.cgi?id=1144158 -# https://bugs.launchpad.net/tripleo/+bug/1376038 -allow keystone_t var_run_t:dir { write add_name }; -allow keystone_t var_run_t:file { write getattr setattr read create open }; diff --git a/elements/selinux/custom-policies/tripleo-selinux-mariadb.te b/elements/selinux/custom-policies/tripleo-selinux-mariadb.te deleted file mode 100644 index f0a93496b..000000000 --- a/elements/selinux/custom-policies/tripleo-selinux-mariadb.te +++ /dev/null @@ -1,92 +0,0 @@ - -module tripleo-selinux-mariadb 1.0; - -require { - type haproxy_t; - type init_t; - type auditd_t; - type mysqld_t; - type syslogd_t; - type initrc_t; - type system_dbusd_t; - type system_dbusd_var_run_t; - type memcached_t; - type rpcbind_var_run_t; - type systemd_hostnamed_t; - type dhcpc_t; - type openvswitch_var_run_t; - type openvswitch_t; - type udev_var_run_t; - type kernel_t; - type lvm_t; - type rsync_exec_t; - type sshd_t; - type udev_t; - type systemd_logind_t; - type kerberos_port_t; - type init_var_run_t; - type mysqld_safe_t; - type mysqld_safe_exec_t; - type crond_t; - type getty_t; - type keepalived_t; - class sock_file getattr; - class tcp_socket name_bind; - class lnk_file { read getattr }; - class dir { getattr read open search }; - class file { execute read execute_no_trans getattr open }; -} - -#============= mysqld_t ============== -# https://bugs.launchpad.net/tripleo/+bug/1373150 -# https://bugzilla.redhat.com/show_bug.cgi?id=1145619 -allow mysqld_t auditd_t:dir { getattr search }; -allow mysqld_t auditd_t:file { read open }; -allow mysqld_t crond_t:dir { getattr search }; -allow mysqld_t crond_t:file { read open }; -allow mysqld_t dhcpc_t:dir { getattr search }; -allow mysqld_t dhcpc_t:file { read open }; -allow mysqld_t getty_t:dir { getattr search }; -allow mysqld_t getty_t:file { read open }; -allow mysqld_t haproxy_t:dir { getattr search }; -allow mysqld_t haproxy_t:file { read open }; -allow mysqld_t init_t:dir read; -allow mysqld_t init_t:file { read getattr open }; -allow mysqld_t init_t:lnk_file { read getattr }; -allow mysqld_t init_var_run_t:sock_file getattr; -allow mysqld_t initrc_t:dir { getattr search }; -allow mysqld_t initrc_t:file { read open }; -allow mysqld_t keepalived_t:dir { getattr search }; -allow mysqld_t keepalived_t:file { read open }; -allow mysqld_t kerberos_port_t:tcp_socket name_bind; -allow mysqld_t kernel_t:dir { getattr search }; -allow mysqld_t kernel_t:file { read open }; -allow mysqld_t lvm_t:dir { getattr search }; -allow mysqld_t lvm_t:file { read open }; -allow mysqld_t memcached_t:dir { getattr search }; -allow mysqld_t memcached_t:file { read open }; -allow mysqld_t mysqld_safe_exec_t:file getattr; -allow mysqld_t mysqld_safe_t:dir { read getattr open search }; -allow mysqld_t mysqld_safe_t:file { read getattr open }; -allow mysqld_t mysqld_safe_t:lnk_file { read getattr }; -allow mysqld_t openvswitch_t:dir { getattr search }; -allow mysqld_t openvswitch_t:file { read open }; -allow mysqld_t openvswitch_var_run_t:dir search; -allow mysqld_t openvswitch_var_run_t:sock_file getattr; -allow mysqld_t rpcbind_var_run_t:sock_file getattr; -allow mysqld_t rsync_exec_t:file { read getattr open execute execute_no_trans }; -allow mysqld_t sshd_t:dir { getattr search }; -allow mysqld_t sshd_t:file { read open }; -allow mysqld_t syslogd_t:dir { getattr search }; -allow mysqld_t syslogd_t:file { read open }; -allow mysqld_t system_dbusd_t:dir { getattr search }; -allow mysqld_t system_dbusd_t:file { read open }; -allow mysqld_t system_dbusd_var_run_t:dir search; -allow mysqld_t system_dbusd_var_run_t:sock_file getattr; -allow mysqld_t systemd_hostnamed_t:dir { getattr search }; -allow mysqld_t systemd_hostnamed_t:file { read open }; -allow mysqld_t systemd_logind_t:dir { getattr search }; -allow mysqld_t systemd_logind_t:file { read open }; -allow mysqld_t udev_t:dir { getattr search }; -allow mysqld_t udev_t:file { read open }; -allow mysqld_t udev_var_run_t:sock_file getattr; diff --git a/elements/selinux/custom-policies/tripleo-selinux-neutron.te b/elements/selinux/custom-policies/tripleo-selinux-neutron.te deleted file mode 100644 index 548c0d4e1..000000000 --- a/elements/selinux/custom-policies/tripleo-selinux-neutron.te +++ /dev/null @@ -1,13 +0,0 @@ - -module tripleo-selinux-neutron 1.0; - -require { - type neutron_t; - type init_t; - class unix_stream_socket connectto; -} - -#============= neutron_t ============== -# https://bugs.launchpad.net/tripleo/+bug/1375534 -# https://bugzilla.redhat.com/show_bug.cgi?id=1147104 -allow neutron_t init_t:unix_stream_socket connectto; diff --git a/elements/selinux/custom-policies/tripleo-selinux-nova.te b/elements/selinux/custom-policies/tripleo-selinux-nova.te deleted file mode 100644 index 316df9fb6..000000000 --- a/elements/selinux/custom-policies/tripleo-selinux-nova.te +++ /dev/null @@ -1,18 +0,0 @@ - -module tripleo-selinux-nova 1.0; - -require { - type tmpfs_t; - type nova_api_t; - class dir { write remove_name search add_name }; - class file { write getattr link read create unlink open }; - class filesystem getattr; -} - -#============= nova_api_t ============== -# https://bugs.launchpad.net/tripleo/+bug/1344452 -# https://bugzilla.redhat.com/show_bug.cgi?id=1125458 -allow nova_api_t tmpfs_t:dir { write remove_name search add_name }; -allow nova_api_t tmpfs_t:file { getattr unlink }; -allow nova_api_t tmpfs_t:file { read write create open link }; -allow nova_api_t tmpfs_t:filesystem getattr; diff --git a/elements/selinux/custom-policies/tripleo-selinux-openvswitch.te b/elements/selinux/custom-policies/tripleo-selinux-openvswitch.te deleted file mode 100644 index 5da9acd6f..000000000 --- a/elements/selinux/custom-policies/tripleo-selinux-openvswitch.te +++ /dev/null @@ -1,14 +0,0 @@ -module tripleo-selinux-openvswitch 1.0; - -require { - type sysctl_net_t; - type openvswitch_t; - class dir search; - class file { read getattr open }; -} - -# https://bugs.launchpad.net/tripleo/+bug/1405021 -# https://bugzilla.redhat.com/show_bug.cgi?id=1176730 -#============= openvswitch_t ============== -allow openvswitch_t sysctl_net_t:dir search; -allow openvswitch_t sysctl_net_t:file { read getattr open }; \ No newline at end of file diff --git a/elements/selinux/custom-policies/tripleo-selinux-rabbitmq.te b/elements/selinux/custom-policies/tripleo-selinux-rabbitmq.te deleted file mode 100644 index b026c4b3f..000000000 --- a/elements/selinux/custom-policies/tripleo-selinux-rabbitmq.te +++ /dev/null @@ -1,20 +0,0 @@ - -module tripleo-selinux-rabbitmq 1.0; - -require { - type rabbitmq_var_lib_t; - type rabbitmq_beam_t; - type rabbitmq_var_log_t; - type rabbitmq_t; - type hostname_exec_t; - class lnk_file read; - class file { read getattr open execute execute_no_trans }; -} - -#============= rabbitmq_beam_t ============== -# https://bugs.launchpad.net/tripleo/+bug/1373145 -allow rabbitmq_beam_t rabbitmq_var_lib_t:lnk_file read; - -# https://bugs.launchpad.net/tripleo/+bug/1396417 -allow rabbitmq_t hostname_exec_t:file { read getattr open execute execute_no_trans }; -allow rabbitmq_t rabbitmq_var_log_t:lnk_file read; diff --git a/elements/selinux/custom-policies/tripleo-selinux-rhsmcertd.te b/elements/selinux/custom-policies/tripleo-selinux-rhsmcertd.te deleted file mode 100644 index 456c76b6f..000000000 --- a/elements/selinux/custom-policies/tripleo-selinux-rhsmcertd.te +++ /dev/null @@ -1,19 +0,0 @@ - -module tripleo-selinux-rhsmcertd 1.0; - -require { - type rhsmcertd_t; - type user_home_t; - type rpm_var_lib_t; - class capability dac_override; - class file create; - class dir { write getattr add_name }; -} - -#============= rhsmcertd_t ============== -# https://bugzilla.redhat.com/show_bug.cgi?id=1144165 -# https://bugs.launchpad.net/tripleo/+bug/1375532 -allow rhsmcertd_t rpm_var_lib_t:dir { write add_name }; -allow rhsmcertd_t rpm_var_lib_t:file create; -allow rhsmcertd_t self:capability dac_override; -allow rhsmcertd_t user_home_t:dir getattr; diff --git a/elements/selinux/custom-policies/tripleo-selinux-ssh.te b/elements/selinux/custom-policies/tripleo-selinux-ssh.te deleted file mode 100644 index 6d10587f3..000000000 --- a/elements/selinux/custom-policies/tripleo-selinux-ssh.te +++ /dev/null @@ -1,13 +0,0 @@ - -module tripleo-selinux-ssh 1.0; - -require { - type ssh_keygen_t; - type init_tmp_t; - class file open; -} - -#============= ssh_keygen_t ============== -# https://bugs.launchpad.net/tripleo/+bug/1284485 -# https://bugzilla.redhat.com/show_bug.cgi?id=1125442 -allow ssh_keygen_t init_tmp_t:file open; diff --git a/elements/selinux/custom-policies/tripleo-selinux-swift.te b/elements/selinux/custom-policies/tripleo-selinux-swift.te deleted file mode 100644 index 97882e3c3..000000000 --- a/elements/selinux/custom-policies/tripleo-selinux-swift.te +++ /dev/null @@ -1,14 +0,0 @@ - -module tripleo-selinux-swift 1.0; - -require { - type init_var_lib_t; - type swift_t; - class dir search; -} - -#============= swift_t ============== -# swift services denied /var/lib/swift/.local -# https://bugs.launchpad.net/tripleo/+bug/1379081 -# https://bugzilla.redhat.com/show_bug.cgi?id=1150798 -allow swift_t init_var_lib_t:dir search; diff --git a/elements/selinux/install.d/100-install-custom-selinux-policies b/elements/selinux/install.d/100-install-custom-selinux-policies deleted file mode 100755 index a0b3d1ddc..000000000 --- a/elements/selinux/install.d/100-install-custom-selinux-policies +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# -# Copies the custom policies in selinux/custom-policies to -# /opt/stack/selinux-policies. An o-r-c configure.d script -# will compile and load the policy during boot. -# -set -eux -set -o pipefail - -install-packages checkpolicy - -DISTRO=`lsb_release -si` || true - -if [[ "RedHatEnterpriseServer CentOS Fedora" =~ "$DISTRO" ]]; then - install-packages selinux-policy-devel -fi - -mkdir -p /opt/stack/selinux-policy - -for file in $(ls $(dirname $0)/../custom-policies/*.te); do - cp $file /opt/stack/selinux-policy -done diff --git a/elements/selinux/os-refresh-config/configure.d/20-compile-and-install-selinux-policies b/elements/selinux/os-refresh-config/configure.d/20-compile-and-install-selinux-policies deleted file mode 100755 index 07ea09b96..000000000 --- a/elements/selinux/os-refresh-config/configure.d/20-compile-and-install-selinux-policies +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# -# Compiles and installs the policies under /opt/stack/selinux-policy. -# -set -eux -set -o pipefail - -TMPDIR=$(mktemp -d) -if [ -x /usr/sbin/semanage ]; then - cd $TMPDIR - for file in $(ls /opt/stack/selinux-policy/*.te); do - filename=$(basename $file) - filename_no_ext=${filename%.*} - # compile policy - cp $file $TMPDIR - make -f /usr/share/selinux/devel/Makefile $filename_no_ext.pp - done - # install policies - semodule -i $TMPDIR/*.pp - rm -rf $TMPDIR -fi diff --git a/elements/snmpd/README.md b/elements/snmpd/README.md deleted file mode 100644 index ad0d5167b..000000000 --- a/elements/snmpd/README.md +++ /dev/null @@ -1,23 +0,0 @@ -Simple Network Management Protocol (SNMP) daemon. - -Installs packaged snmpd, snmp-mibs-downloader, lm-sensors and -nagios-plugins-basic. - -nagios-plugins-basic is installed to provide a basic frame work for the initial -check. - -Nagios style check for open file limits, per process is provided. - -Creates a read only user with password for snmp v3 authentication. -exposes OoOEnabled and CheckProcOpenFiles via the NET-SNMP-EXTEND-MIB OID -block. - -Grants snmp user password-less sudo access to lsof, so that the per process -check works correctly. - -Options should be provided via heat. For example: - - snmpd: - export_MIB: UCD-SNMP-MIB - readonly_user_name: RoUser - readonly_user_password: password diff --git a/elements/snmpd/element-deps b/elements/snmpd/element-deps deleted file mode 100644 index 3675865b2..000000000 --- a/elements/snmpd/element-deps +++ /dev/null @@ -1,3 +0,0 @@ -os-apply-config -os-refresh-config -os-svc-install diff --git a/elements/snmpd/files/check_proc_open_files.py b/elements/snmpd/files/check_proc_open_files.py deleted file mode 100755 index 56f4207f3..000000000 --- a/elements/snmpd/files/check_proc_open_files.py +++ /dev/null @@ -1,93 +0,0 @@ -#! /usr/bin/env python -# Copyright 2013 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import itertools -import shlex -import subprocess -import sys - -warn_limit = 90 -crit_limit = 95 -crit_msg = '' -warn_msg = '' -output_msg = '' -status = {'OK': 0, 'WARNING': 1, 'CRITICAL': 2, 'UNKNOWN': 3} - - -def _get_open_file_limits(file_handle): - limit = 0 - for line in file_handle: - if line.startswith('Max open files'): - limit = line.split()[3] - return limit - - -# Define an in-line generator, no temporary lists -def _split_lines(lines): - for line in lines: - yield line[0:19].strip().split() - - -def _get_lsof_pid_list(): - # get open files limit per PID exclude any line with a TID. - lsof_cmd = shlex.split("sudo lsof -n") - lsof_proc = subprocess.Popen(lsof_cmd, stdout=subprocess.PIPE) - filtered_lines = itertools.ifilterfalse(lambda line: line[1] == 'PID', - _split_lines(lsof_proc.stdout)) - filtered_by_len = itertools.ifilter(lambda line: len(line) == 2, - filtered_lines) - for cmd, pid in itertools.groupby(filtered_by_len, lambda line: line[:2]): - yield cmd, pid - - -for (pid_cmd, pid_number), count in _get_lsof_pid_list(): - pid_count = len(list(count)) - pid_limit_file = "/proc/%s/limits" % pid_number - try: - with open(pid_limit_file, 'rb') as limit_file_handle: - pid_limit = _get_open_file_limits(limit_file_handle) - except IOError: - # no limit file skip - continue - - pid_usage_pct = pid_count * 100 / int(pid_limit) - if pid_usage_pct >= crit_limit: - crit_msg += ": %s/%s/%s %s" % (pid_number, - pid_count, - pid_limit, - pid_cmd) - elif pid_usage_pct >= warn_limit and pid_usage_pct < crit_limit: - warn_msg += ": %s/%s/%s %s" % (pid_number, - pid_count, - pid_limit, - pid_cmd) - -# if any critical services then exit critical (include warnings) -if crit_msg: - output_msg = "Critical: pid/files/limit Proc%s\n%s" % (crit_msg, - warn_msg) - exit_code = status['CRITICAL'] -# if not critical and warn not empty exit warning -if warn_msg: - output_msg = "Warning: pid/files/limit Proc%s" % warn_msg - exit_code = status['WARNING'] -# All ok here -if not output_msg: - output_msg = "OK - All processes open files with in limits." - exit_code = status['OK'] - -print(output_msg) -sys.exit(exit_code) diff --git a/elements/snmpd/files/snmp b/elements/snmpd/files/snmp deleted file mode 100644 index a8bdf1beb..000000000 --- a/elements/snmpd/files/snmp +++ /dev/null @@ -1 +0,0 @@ -snmp ALL=(root) NOPASSWD: /usr/bin/lsof diff --git a/elements/snmpd/install.d/67-snmpd b/elements/snmpd/install.d/67-snmpd deleted file mode 100755 index 0a4f71579..000000000 --- a/elements/snmpd/install.d/67-snmpd +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -set -eux - -install-packages -m snmpd nagios_plugins_package snmpd_package snmp-mibs-downloader_package lm-sensors_package - -# install our snmp check script -DEST_DIR="/usr/lib64/nagios/plugins" -if [ ! 'amd64' = "$ARCH" ] || [ ! -d $DEST_DIR ]; then - DEST_DIR="/usr/lib/nagios/plugins" -fi -install -m 0755 -o root -g root $(dirname $0)/../files/check_proc_open_files.py $DEST_DIR/check_proc_open_files.py -install -m 0440 -o root -g root $(dirname $0)/../files/snmp /etc/sudoers.d/snmp diff --git a/elements/snmpd/os-apply-config/etc/default/snmpd b/elements/snmpd/os-apply-config/etc/default/snmpd deleted file mode 100644 index 02395ed70..000000000 --- a/elements/snmpd/os-apply-config/etc/default/snmpd +++ /dev/null @@ -1,20 +0,0 @@ -# This file controls the activity of snmpd and snmptrapd -# enable a default MIB -export MIBS={{snmpd.export_MIB}} - -# snmpd control (yes means start daemon). -SNMPDRUN=yes - -# snmpd options (use syslog, close stdin/out/err). -SNMPDOPTS='-Lsd -Lf /dev/null -u snmp -g snmp -I -smux -p /var/run/snmpd.pid' - -# snmptrapd control (yes means start daemon). As of net-snmp version -# 5.0, master agentx support must be enabled in snmpd before snmptrapd -# can be run. See snmpd.conf(5) for how to do this. -TRAPDRUN=no - -# snmptrapd options (use syslog). -TRAPDOPTS='-Lsd -p /var/run/snmptrapd.pid' - -# create symlink on Debian legacy location to official RFC path -SNMPDCOMPAT=yes diff --git a/elements/snmpd/os-apply-config/etc/snmp/snmpd.conf b/elements/snmpd/os-apply-config/etc/snmp/snmpd.conf deleted file mode 100644 index 954a8e789..000000000 --- a/elements/snmpd/os-apply-config/etc/snmp/snmpd.conf +++ /dev/null @@ -1,39 +0,0 @@ -# Listen for connections on all interfaces (both IPv4 *and* IPv6) -agentAddress udp:161,udp6:[::1]:161 -createUser {{snmpd.readonly_user_name}} MD5 "{{snmpd.readonly_user_password}}" -view systemonly included .1.3.6.1.2.1.1 -view systemonly included .1.3.6.1.2.1.25.1 -rouser {{snmpd.readonly_user_name}} -sysLocation Sitting on top of the cloud -sysContact Me - -sysServices 72 - -# Process Monitoring -proc cron - -# Disk Monitoring -# 10MBs required on root disk, 5% free on /var, 10% free on all other disks -includeAllDisks 10% - -# ACTIVE MONITORING -# send SNMPv1 traps -trapsink localhost public -iquerySecName internalUser -rouser internalUser -# generate traps on UCD error conditions -defaultMonitors yes -# generate traps on linkUp/Down -linkUpDownNotifications yes - -# Arbitrary extension commands -extend OoOEnabled /bin/echo Yes -extend CheckProcOpenFiles /bin/bash /usr/lib/nagios/plugins/check_proc_open_files.py - -# "Pass-through" MIB extension command -#pass .1.3.6.1.4.1.8072.2.255 /bin/sh PREFIX/local/passtest -#pass .1.3.6.1.4.1.8072.2.255 /usr/bin/perl PREFIX/local/passtest.pl - -# AgentX Sub-agents -# Run as an AgentX master agent -master agentx diff --git a/elements/snmpd/os-refresh-config/post-configure.d/67-snmpd b/elements/snmpd/os-refresh-config/post-configure.d/67-snmpd deleted file mode 100755 index a325b36c7..000000000 --- a/elements/snmpd/os-refresh-config/post-configure.d/67-snmpd +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -os-svc-enable -n snmpd - -os-svc-restart -n snmpd diff --git a/elements/snmpd/pkg-map b/elements/snmpd/pkg-map deleted file mode 100644 index eb9aca2b0..000000000 --- a/elements/snmpd/pkg-map +++ /dev/null @@ -1,15 +0,0 @@ -{ - "family": { - "redhat": { - "nagios_plugins_package": "nagios-common", - "snmpd_package": "net-snmp", - "lm-sensors_package": "lm_sensors" - } - }, - "default": { - "nagios_plugins_package": "nagios-plugins-basic", - "snmpd_package": "snmpd", - "snmp-mibs-downloader_package": "snmp-mibs-downloader", - "lm-sensors_package": "lm-sensors" - } -} diff --git a/elements/sosreport/README.md b/elements/sosreport/README.md deleted file mode 100644 index f70183ba2..000000000 --- a/elements/sosreport/README.md +++ /dev/null @@ -1,10 +0,0 @@ -Add sosreport to built images -============================= - -This element adds sosreport to the image, for use as a log retrieval tool. - -See [sosreport](https://github.com/sosreport/sos) on github for more information. - -It provides the ability for plugins to be provided by other elements through the -use of sos.d in the element. All "\*.py" files found in the sos.d directory will be added -to the plugins directory for use by sosreport. diff --git a/elements/sosreport/cleanup.d/90-sos-tmp-plugins b/elements/sosreport/cleanup.d/90-sos-tmp-plugins deleted file mode 100755 index 05c690a43..000000000 --- a/elements/sosreport/cleanup.d/90-sos-tmp-plugins +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -# Copyright 2014 Hewlett-Packard Development Company, L.P. -# -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -set -eux -set -o pipefail - -# Remove the temporary plugins directory - they've been installed now -[ -z "$DIB_SOS_PLUGINS" ] || sudo rm -rf $TMP_MOUNT_PATH/$DIB_SOS_PLUGINS - diff --git a/elements/sosreport/environment.d/90-sos-plugins-env b/elements/sosreport/environment.d/90-sos-plugins-env deleted file mode 100755 index c8725c7cf..000000000 --- a/elements/sosreport/environment.d/90-sos-plugins-env +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# -# Copyright 2014 Hewlett-Packard Development Company, L.P. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -export DIB_SOS_HOOKS_PATH=$TMP_HOOKS_PATH/sos.d -export DIB_SOS_PLUGINS=/tmp/sos.d -export DIB_SOSREPORT_PLUGINS_DIR=/usr/share/sosreport/sos/plugins diff --git a/elements/sosreport/extra-data.d/90-sos-plugins b/elements/sosreport/extra-data.d/90-sos-plugins deleted file mode 100755 index e76246f52..000000000 --- a/elements/sosreport/extra-data.d/90-sos-plugins +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -# -# Copyright 2014 Hewlett-Packard Development Company, L.P. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -set -eu -set -o pipefail - -[ -d $DIB_SOS_HOOKS_PATH ] || exit 0 - -sudo mkdir -p $TMP_MOUNT_PATH/$DIB_SOS_PLUGINS -sudo cp -L -f $DIB_SOS_HOOKS_PATH/* $TMP_MOUNT_PATH/$DIB_SOS_PLUGINS/ diff --git a/elements/sosreport/install.d/65-sosreport b/elements/sosreport/install.d/65-sosreport deleted file mode 100755 index 32e38ee8f..000000000 --- a/elements/sosreport/install.d/65-sosreport +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -# Copyright 2014 Hewlett-Packard Development Company, L.P. -# -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -set -eux - -install-packages -m sosreport sosreport_package - -# Install the sos plugins from the appropriate directory -install -m 0644 -o root -g root $DIB_SOS_PLUGINS/*.py $DIB_SOSREPORT_PLUGINS_DIR diff --git a/elements/sosreport/pkg-map b/elements/sosreport/pkg-map deleted file mode 100644 index 6733fe0e9..000000000 --- a/elements/sosreport/pkg-map +++ /dev/null @@ -1,10 +0,0 @@ -{ - "family": { - "redhat": { - "sosreport_package": "sos" - } - }, - "default": { - "sosreport_package": "sosreport" - } -} diff --git a/elements/squid/README.md b/elements/squid/README.md deleted file mode 100644 index 03e4ce5b2..000000000 --- a/elements/squid/README.md +++ /dev/null @@ -1,5 +0,0 @@ -Element to install and configure squid. - -The Squid accepts connections on all local (internal) networks. - -Remote requests for local destinations (127.0.0.1) are denied. diff --git a/elements/squid/element-deps b/elements/squid/element-deps deleted file mode 100644 index a35cfdb7c..000000000 --- a/elements/squid/element-deps +++ /dev/null @@ -1,4 +0,0 @@ -iptables -os-apply-config -os-refresh-config -os-svc-install diff --git a/elements/squid/install.d/30-squid b/elements/squid/install.d/30-squid deleted file mode 100755 index 2ac170700..000000000 --- a/elements/squid/install.d/30-squid +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -eux - -install-packages squid -os-svc-enable -n squid diff --git a/elements/squid/os-apply-config/etc/squid/squid.conf b/elements/squid/os-apply-config/etc/squid/squid.conf deleted file mode 100644 index 3d9389d4c..000000000 --- a/elements/squid/os-apply-config/etc/squid/squid.conf +++ /dev/null @@ -1,65 +0,0 @@ -# Example rule allowing access from your local networks. -# Adapt to list your (internal) IP networks from where browsing -# should be allowed -acl localnet src 10.0.0.0/8 # RFC1918 possible internal network -acl localnet src 172.16.0.0/12 # RFC1918 possible internal network -acl localnet src 192.168.0.0/16 # RFC1918 possible internal network -acl localnet src fc00::/7 # RFC 4193 local private network range -acl localnet src fe80::/10 # RFC 4291 link-local (directly plugged) machines - -# deny localhost destination requests -acl dstlocalhost dst 127.0.0.1 -acl dstlocalhost dst ::1 -http_access deny dstlocalhost - -acl SSL_ports port 443 -acl Safe_ports port 80 # http -acl Safe_ports port 21 # ftp -acl Safe_ports port 443 # https -acl Safe_ports port 70 # gopher -acl Safe_ports port 210 # wais -acl Safe_ports port 1025-65535 # unregistered ports -acl Safe_ports port 280 # http-mgmt -acl Safe_ports port 488 # gss-http -acl Safe_ports port 591 # filemaker -acl Safe_ports port 777 # multiling http -acl CONNECT method CONNECT - -# Deny requests to certain unsafe ports -http_access deny !Safe_ports - -# Deny CONNECT to other than secure SSL ports -http_access deny CONNECT !SSL_ports - -# Only allow cachemgr access from localhost -http_access allow localhost manager -http_access deny manager - - -# Example rule allowing access from your local networks. -# Adapt localnet in the ACL section to list your (internal) IP networks -# from where browsing should be allowed -http_access allow localnet -http_access allow localhost - -# And finally deny all other access to this proxy -http_access deny all - -# Squid normally listens to port 3128 -http_port 3128 - -# maximum_object_size must come before cache_dir to be active -maximum_object_size 1024 MB -cache_dir aufs /var/spool/squid 8192 16 256 - -# Leave coredumps in the first cache dir -coredump_dir /var/spool/squid - -# -# Add any of your own refresh_pattern entries above these. -# -refresh_pattern ^ftp: 1440 20% 10080 -refresh_pattern ^gopher: 1440 0% 1440 -refresh_pattern -i repomd.xml$ 0 0% 0 -refresh_pattern -i (/cgi-bin/|\?) 0 0% 0 -refresh_pattern . 0 20% 1440 diff --git a/elements/squid/os-refresh-config/post-configure.d/80-squid b/elements/squid/os-refresh-config/post-configure.d/80-squid deleted file mode 100755 index c5208840b..000000000 --- a/elements/squid/os-refresh-config/post-configure.d/80-squid +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -eux - -os-svc-enable -n squid -os-svc-restart -n squid diff --git a/elements/squid/os-refresh-config/pre-configure.d/97-squid-iptables b/elements/squid/os-refresh-config/pre-configure.d/97-squid-iptables deleted file mode 100755 index 821ce2b6e..000000000 --- a/elements/squid/os-refresh-config/pre-configure.d/97-squid-iptables +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -eu - -# Squid server -add-rule INPUT -p tcp --dport 3128 -j ACCEPT diff --git a/elements/ssl-ca/README.md b/elements/ssl-ca/README.md deleted file mode 100644 index cfc4abedd..000000000 --- a/elements/ssl-ca/README.md +++ /dev/null @@ -1,18 +0,0 @@ -Install and trust a CA at the operating system level, making it available for use by -OpenStack services and other network clients authenticating SSL-secured connections. - -Configuration -------------- - - ssl: - ca_certificate: certdata - -The CA certificate will be written to /etc/ssl/from-heat-ca.crt and installed using -update-ca-certificates (apt-based distros) or update-ca-trusts (yum-based distros). - -This may be used in conjunction with openstack-ssl to enable SSL-secure connections -between OpenStack services, or independently to enable secure integration with -external resources such as Keystone -> LDAP server or Cinder -> external backend. - -If multiple CA certificates are to be trusted, they should be concatenated in PEM -format within the single ca_certificate property defining the trust store. diff --git a/elements/ssl-ca/os-apply-config/etc/ssl/from-heat-ca.crt b/elements/ssl-ca/os-apply-config/etc/ssl/from-heat-ca.crt deleted file mode 100644 index 30a5b0d38..000000000 --- a/elements/ssl-ca/os-apply-config/etc/ssl/from-heat-ca.crt +++ /dev/null @@ -1 +0,0 @@ -{{ssl.ca_certificate}} diff --git a/elements/ssl-ca/os-refresh-config/configure.d/51-ssl-load-ca-certs b/elements/ssl-ca/os-refresh-config/configure.d/51-ssl-load-ca-certs deleted file mode 100755 index 15e017b93..000000000 --- a/elements/ssl-ca/os-refresh-config/configure.d/51-ssl-load-ca-certs +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -# Copyright 2014 Hewlett-Packard Development Company, L.P. -# -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -set -eux -set -o pipefail - -CA_CERT=/etc/ssl/from-heat-ca.crt -CA_CERT_SIZE=$(stat -c '%s' "$CA_CERT") -DISTRO=`lsb_release -si` || true - -# A PEM encoded SSL Cert will have at least 54 characters for the START/END -# markers. -if [ $CA_CERT_SIZE -gt 54 ]; then - if [[ "Ubuntu Debian" =~ "${DISTRO}" ]]; then - # On Debian, place the CA certificate where 'update-ca-certificates' will find it - cp ${CA_CERT} /usr/local/share/ca-certificates/from-heat-ca.crt - update-ca-certificates - else - # On RPM-based distros, place the CA certificate where 'update-ca-trust' will find it - cp ${CA_CERT} /etc/pki/ca-trust/source/anchors/from-heat-ca.crt - update-ca-trust - fi -fi diff --git a/elements/stackuser/README.md b/elements/stackuser/README.md deleted file mode 100644 index 7f053bd63..000000000 --- a/elements/stackuser/README.md +++ /dev/null @@ -1,4 +0,0 @@ -Creates a user 'stack' with password 'stack'. - -This user can be customised with an SSH key and proxy details if the -local-config element is also used. diff --git a/elements/stackuser/install.d/50-user b/elements/stackuser/install.d/50-user deleted file mode 100755 index 7d118e870..000000000 --- a/elements/stackuser/install.d/50-user +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -# Add the stack user we recommend folk use. - -set -eu -set -o xtrace - -useradd -m stack -s /bin/bash - -passwd stack < /etc/sudoers.d/stack <> /home/stack/.ssh/authorized_keys - chown -R stack:stack /home/stack/.ssh -fi diff --git a/elements/stunnel/README.md b/elements/stunnel/README.md deleted file mode 100644 index a17d5c93d..000000000 --- a/elements/stunnel/README.md +++ /dev/null @@ -1,27 +0,0 @@ -Install stunnel4 - -Configuration -------------- - -None, this is a low-level element. Elements which intend using -stunnel4 should depend on this and provide their own configuration -files. By default any file matching /etc/stunnel4/\*.conf will be -picked up by stunnel. - -See the stunnel man page for documentation on configuration etc. - -As an example, an element which wanted stunnel to bind to port 443 -externally, and forward traffic to port 80 internally would use a -config like: - - cert = /etc/ssl/certs/overcloud-servercert.pem - key = /etc/ssl/private/overcloud-serverkey.key - - options = NO_SSLv2 - - # Clients must have valid certs, according to our CA cert - verify = 2 - - [rmq-server] - accept = {{local-ipv4}}:443 - connect = 127.0.0.1:80 diff --git a/elements/stunnel/files/usr/lib/systemd/system/stunnel4.service b/elements/stunnel/files/usr/lib/systemd/system/stunnel4.service deleted file mode 100644 index 411604d2a..000000000 --- a/elements/stunnel/files/usr/lib/systemd/system/stunnel4.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Stunnel Service -Wants=network.service -After=network.service - -[Service] -Type=oneshot -ExecStart=/usr/bin/stunnel /etc/stunnel/from-heat.conf -User=root -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/elements/stunnel/install.d/70-install-stunnel b/elements/stunnel/install.d/70-install-stunnel deleted file mode 100755 index 695a76b87..000000000 --- a/elements/stunnel/install.d/70-install-stunnel +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -# Copyright 2014 Hewlett-Packard Development Company, L.P. -# -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -set -eux -set -o pipefail - -install-packages stunnel4 - -# Debian/Ubuntu don't install stunnel4 in a working configuration. -if [ -e /etc/default/stunnel4 ]; then - cat > /etc/default/stunnel4 << EOF -ENABLED=1 -FILES="/etc/stunnel/*.conf" -OPTIONS="" -PPP_RESTART=0 -EOF -fi - -FILES=$(dirname $0)/../files -FILE=/usr/lib/systemd/system/stunnel4.service -if [ "$(dib-init-system)" == "systemd" ]; then - install -D -g root -o root -m 0755 "${FILES}${FILE}" "${FILE}" -fi - diff --git a/elements/stunnel/os-refresh-config/configure.d/21-restart-stunnel b/elements/stunnel/os-refresh-config/configure.d/21-restart-stunnel deleted file mode 100755 index 49171f70a..000000000 --- a/elements/stunnel/os-refresh-config/configure.d/21-restart-stunnel +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# Copyright 2014 Hewlett-Packard Development Company, L.P. -# -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -set -eux -set -o pipefail - -mkdir -p /var/run/stunnel4 -service stunnel4 restart diff --git a/elements/swift-proxy/README.md b/elements/swift-proxy/README.md deleted file mode 100644 index 8ab132b70..000000000 --- a/elements/swift-proxy/README.md +++ /dev/null @@ -1,13 +0,0 @@ -Swift element for installing a swift proxy server - -Configuration -------------- - - swift: - service-password: PASSWORD - - The service password for the swift user - keystone: - host: 127.0.0.1 - - The IP of the keystone host to authenticate against - proxy-memcache: - Comma-separated list of proxy servers in memcache ring diff --git a/elements/swift-proxy/check_mk_checks/swift_proxy_healthcheck.py b/elements/swift-proxy/check_mk_checks/swift_proxy_healthcheck.py deleted file mode 100755 index 2a4077c99..000000000 --- a/elements/swift-proxy/check_mk_checks/swift_proxy_healthcheck.py +++ /dev/null @@ -1,66 +0,0 @@ -#!/usr/bin/python -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Check_mk script that checks if swift-proxy-server is responding to -# http requests. -# -# The healthcheck middleware in the swift-proxy-server pipeline normally -# responds to a GET /healthcheck with 200 status and "OK" in response body. -# -# Output is in the check_mk format: -# -# status test_name perf_data output -# -# For example: (using - for perf_data) -# -# 0 swift_proxy_healthcheck - Connection Ok - - -import ConfigParser - -import requests - - -def main(): - - # Read port value from conf file - conf_parser = ConfigParser.ConfigParser() - conf_parser.read("/etc/swift/proxy-server.conf") - config = dict(conf_parser.items("DEFAULT")) - port = config.get("bind_port", "8080") - ip = config.get("bind_ip", "localhost") - - status = 2 # Assume error - try: - url = "http://" + ip + ":" + port + "/healthcheck" - resp = requests.get(url, timeout=5.0) - if resp.status_code == 200 and resp.text == "OK": - msg = "Ok" - status = 0 # Good status - elif resp.status_code == 503 and "DISABLED" in resp.text: - msg = "disabled by file" - status = 1 # Warning status - else: - msg = "unexpected response (status: {0}".format(resp.status_code) - except requests.exceptions.Timeout: - msg = "timeout ({0}:{1})".format(ip, port) - except requests.exceptions.ConnectionError: - msg = "connection error ({0}:{1})".format(ip, port) - except Exception as error: - msg = "{0} ({1}:{2})".format(str(error), ip, port) - print("{0} swift_proxy_healthcheck - {1}".format(status, msg)) - - -if __name__ == '__main__': - main() diff --git a/elements/swift-proxy/element-deps b/elements/swift-proxy/element-deps deleted file mode 100644 index 1a4869905..000000000 --- a/elements/swift-proxy/element-deps +++ /dev/null @@ -1,2 +0,0 @@ -memcached -swift diff --git a/elements/swift-proxy/install.d/swift-package-install/76-swift-proxy b/elements/swift-proxy/install.d/swift-package-install/76-swift-proxy deleted file mode 100755 index 2bf16dcd8..000000000 --- a/elements/swift-proxy/install.d/swift-package-install/76-swift-proxy +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages openstack-swift-proxy diff --git a/elements/swift-proxy/install.d/swift-source-install/76-swift-proxy b/elements/swift-proxy/install.d/swift-source-install/76-swift-proxy deleted file mode 100755 index 29a93d58f..000000000 --- a/elements/swift-proxy/install.d/swift-source-install/76-swift-proxy +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -set -eux - -# bug #1293812 : Avoid easy_install triggering on pbr. -$SWIFT_VENV_DIR/bin/pip install -U 'pbr>=0.11,<2.0' - -# These are only needed if using keystone auth, so are not in requirements.txt -$SWIFT_VENV_DIR/bin/pip install keystonemiddleware -$SWIFT_VENV_DIR/bin/pip install python-swiftclient -$SWIFT_VENV_DIR/bin/pip install pycrypto - -os-svc-daemon -l -i "$SWIFT_VENV_DIR" swift-proxy swift swift-proxy-server "/etc/swift/proxy-server.conf" - -ln -s $SWIFT_VENV_DIR/bin/swift-recon /usr/local/bin/swift-recon diff --git a/elements/swift-proxy/os-apply-config/etc/swift/proxy-server.conf b/elements/swift-proxy/os-apply-config/etc/swift/proxy-server.conf deleted file mode 100644 index 42348f819..000000000 --- a/elements/swift-proxy/os-apply-config/etc/swift/proxy-server.conf +++ /dev/null @@ -1,91 +0,0 @@ -[DEFAULT] -bind_port = 8080 -{{#haproxy}} -{{#stunnel.connect_host}} -bind_ip = {{stunnel.connect_host}} -{{/stunnel.connect_host}} -{{^stunnel.connect_host}} -bind_ip = {{local-ipv4}} -{{/stunnel.connect_host}} -{{/haproxy}} - -[pipeline:main] -pipeline = catch_errors healthcheck proxy-logging cache bulk crossdomain tempurl formpost authtoken keystoneauth staticweb container-quotas account-quotas slo proxy-logging proxy-server - -[filter:catch_errors] -use = egg:swift#catch_errors - -[filter:healthcheck] -use = egg:swift#healthcheck - -[filter:cache] -use = egg:swift#memcache -{{#swift.proxy-memcache}} -memcache_servers = {{swift.proxy-memcache}} -{{/swift.proxy-memcache}} - -[filter:slo] -use = egg:swift#slo - -[filter:crossdomain] -use = egg:swift#crossdomain - -[filter:tempurl] -use = egg:swift#tempurl - -[filter:formpost] -use = egg:swift#formpost - -[filter:authtoken] -paste.filter_factory = keystonemiddleware.auth_token:filter_factory -admin_tenant_name = service -admin_user = swift -admin_password = {{swift.service-password}} -auth_uri = http://{{keystone.host}}:5000/v2.0 -delay_auth_decision = true -identity_uri=http://{{keystone.host}}:35357 -{{#swift.proxy-memcache}} -cache = swift.cache -{{#swift.encrypt-authtoken}} -memcache_security_strategy = ENCRYPT -memcache_secret_key = {{swift.hash}} -{{/swift.encrypt-authtoken}} -{{/swift.proxy-memcache}} - -[filter:keystoneauth] -use = egg:swift#keystoneauth -operator_roles = admin, swiftoperator, _member_ - -[filter:staticweb] -use = egg:swift#staticweb - -[filter:container-quotas] -use = egg:swift#container_quotas - -[filter:account-quotas] -use = egg:swift#account_quotas - -[filter:proxy-logging] -use = egg:swift#proxy_logging - -[filter:bulk] -use = egg:swift#bulk - -[app:proxy-server] -use = egg:swift#proxy -account_autocreate = true - -{{#swift-proxy-server}} -{{#config}} -[{{{section}}}] -{{#values}} -{{#comment}} -# {{{.}}} -{{/comment}} -{{#option}} -{{{option}}} = {{{value}}} -{{/option}} -{{/values}} - -{{/config}} -{{/swift-proxy-server}} diff --git a/elements/swift-proxy/os-refresh-config/post-configure.d/74-swift-proxy b/elements/swift-proxy/os-refresh-config/post-configure.d/74-swift-proxy deleted file mode 100755 index cb3c77985..000000000 --- a/elements/swift-proxy/os-refresh-config/post-configure.d/74-swift-proxy +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -eu - -os-svc-enable -n swift-proxy - -os-svc-restart -n swift-proxy diff --git a/elements/swift-proxy/os-refresh-config/pre-configure.d/72-swift-proxy-iptables b/elements/swift-proxy/os-refresh-config/pre-configure.d/72-swift-proxy-iptables deleted file mode 100644 index c1a9f3b0e..000000000 --- a/elements/swift-proxy/os-refresh-config/pre-configure.d/72-swift-proxy-iptables +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -set -eux -set -o pipefail - -# port 11211 is used for memcache in swift-proxy clusters -add-rule INPUT -p tcp --dport 11211 -j ACCEPT - diff --git a/elements/swift-ring/README.md b/elements/swift-ring/README.md deleted file mode 100644 index f3c2e12b0..000000000 --- a/elements/swift-ring/README.md +++ /dev/null @@ -1 +0,0 @@ -Element that provides a node with the tools to build a swift ring diff --git a/elements/swift-ring/element-deps b/elements/swift-ring/element-deps deleted file mode 100644 index 0d3d9f27c..000000000 --- a/elements/swift-ring/element-deps +++ /dev/null @@ -1,3 +0,0 @@ -os-svc-install -source-repositories -pkg-map diff --git a/elements/swift-ring/environment.d/10-swift-ring-venv-dir.bash b/elements/swift-ring/environment.d/10-swift-ring-venv-dir.bash deleted file mode 100644 index 4616dec14..000000000 --- a/elements/swift-ring/environment.d/10-swift-ring-venv-dir.bash +++ /dev/null @@ -1,6 +0,0 @@ -if [ -z "${SWIFT_VENV_DIR:-}" ]; then - export SWIFT_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/swift"} -fi -if [ -z "${SWIFT_EXTRA_INSTALL_OPTS:-}" ]; then - export SWIFT_EXTRA_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-""} -fi diff --git a/elements/swift-ring/install.d/swift-package-install/75-swift-ring b/elements/swift-ring/install.d/swift-package-install/75-swift-ring deleted file mode 100755 index 3af997ce7..000000000 --- a/elements/swift-ring/install.d/swift-package-install/75-swift-ring +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -eux -set -o pipefail - -install-packages -m swift-ring swift_package diff --git a/elements/swift-ring/install.d/swift-source-install/75-swift-ring b/elements/swift-ring/install.d/swift-source-install/75-swift-ring deleted file mode 100755 index e150e5618..000000000 --- a/elements/swift-ring/install.d/swift-source-install/75-swift-ring +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -set -eux -set -o pipefail - -install-packages -m swift-ring libffi_dev_package - -os-svc-install $SWIFT_EXTRA_INSTALL_OPTS -i "$SWIFT_VENV_DIR" -u swift -r /opt/stack/swift - -ln -s "$SWIFT_VENV_DIR/bin/swift-ring-builder" /usr/local/bin/swift-ring-builder diff --git a/elements/swift-ring/pkg-map b/elements/swift-ring/pkg-map deleted file mode 100644 index 91e2099fb..000000000 --- a/elements/swift-ring/pkg-map +++ /dev/null @@ -1,12 +0,0 @@ -{ - "family": { - "redhat": { - "libffi_dev_package": "libffi-devel", - "swift_package": "openstack-swift" - } - }, - "default": { - "libffi_dev_package": "libffi-dev", - "swift_package": "openstack-swift" - } -} diff --git a/elements/swift-ring/source-repository-swift b/elements/swift-ring/source-repository-swift deleted file mode 100644 index 913510def..000000000 --- a/elements/swift-ring/source-repository-swift +++ /dev/null @@ -1 +0,0 @@ -swift git /opt/stack/swift https://git.openstack.org/openstack/swift diff --git a/elements/swift-storage/README.md b/elements/swift-storage/README.md deleted file mode 100644 index a34be3aeb..000000000 --- a/elements/swift-storage/README.md +++ /dev/null @@ -1 +0,0 @@ -Swift element for installing a swift storage server diff --git a/elements/swift-storage/element-deps b/elements/swift-storage/element-deps deleted file mode 100644 index 76a4880eb..000000000 --- a/elements/swift-storage/element-deps +++ /dev/null @@ -1,3 +0,0 @@ -package-installs -swift -use-ephemeral diff --git a/elements/swift-storage/install.d/76-swift-storage-common b/elements/swift-storage/install.d/76-swift-storage-common deleted file mode 100755 index f342c0624..000000000 --- a/elements/swift-storage/install.d/76-swift-storage-common +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -set -eux - -cat > /etc/cron.d/swift-recon <-192.0.2.6:%PORT%/d1 - - A comma separated list of swift storage devices to place in the ring - file. - - This MUST be present in order for o-r-c to successfully complete. - zones: - - Servers are divided amongst separate zones if the swift.zones - metadata is greater than the default of 1. Servers are placed in zones - depending on their rank in the scaled-out list of Swift servers in the - yaml template used to build the overcloud stack. The scaleout rank N - is: SwiftStorage|controller. The appropriate zone is calculated as: - zone = N % swift.zones + 1. - - To enable this calculation, the devices data takes the form of: - r1z%%-192.0.2.6:%PORT%/d1 - hash: randomstring - - A hash used to salt paths on storage hosts diff --git a/elements/swift/cleanup.d/50-remove-source-swift b/elements/swift/cleanup.d/50-remove-source-swift deleted file mode 100755 index 634228627..000000000 --- a/elements/swift/cleanup.d/50-remove-source-swift +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eu - -sudo rm -fr "${TMP_MOUNT_PATH}/opt/stack/swift" diff --git a/elements/swift/element-deps b/elements/swift/element-deps deleted file mode 100644 index 919cfbb3b..000000000 --- a/elements/swift/element-deps +++ /dev/null @@ -1,3 +0,0 @@ -os-svc-install -package-installs -selinux diff --git a/elements/swift/environment.d/10-swift-venv-dir.bash b/elements/swift/environment.d/10-swift-venv-dir.bash deleted file mode 100644 index 4616dec14..000000000 --- a/elements/swift/environment.d/10-swift-venv-dir.bash +++ /dev/null @@ -1,6 +0,0 @@ -if [ -z "${SWIFT_VENV_DIR:-}" ]; then - export SWIFT_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/swift"} -fi -if [ -z "${SWIFT_EXTRA_INSTALL_OPTS:-}" ]; then - export SWIFT_EXTRA_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-""} -fi diff --git a/elements/swift/install.d/swift-package-install/package-installs-swift b/elements/swift/install.d/swift-package-install/package-installs-swift deleted file mode 100644 index 46af2af35..000000000 --- a/elements/swift/install.d/swift-package-install/package-installs-swift +++ /dev/null @@ -1 +0,0 @@ -openstack-swift diff --git a/elements/swift/install.d/swift-source-install/75-swift b/elements/swift/install.d/swift-source-install/75-swift deleted file mode 100755 index 3efebd326..000000000 --- a/elements/swift/install.d/swift-source-install/75-swift +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -set -eux - -os-svc-install $SWIFT_EXTRA_INSTALL_OPTS -i "$SWIFT_VENV_DIR" -u swift -r /opt/stack/swift - -ln -s $SWIFT_VENV_DIR/bin/swift-ring-builder /usr/local/bin/swift-ring-builder -ln -s $SWIFT_VENV_DIR/bin/swift-get-nodes /usr/local/bin/swift-get-nodes - -add-selinux-path-substitution /usr/bin $SWIFT_VENV_DIR/bin diff --git a/elements/swift/install.d/swift-source-install/76-swift-cffi b/elements/swift/install.d/swift-source-install/76-swift-cffi deleted file mode 100755 index c4941c057..000000000 --- a/elements/swift/install.d/swift-source-install/76-swift-cffi +++ /dev/null @@ -1,14 +0,0 @@ -#! /bin/bash - -set -eux - -# This is to avoid an issue with version mismatch between the version of cffi installed -# and the version of cffi for which xattr has pre-built support. This mismatch will -# prevent the object-server from running. To fix this problem this module executes the -# simple python command below at install-time to force a build of the correct cffi -# library in the xattr module. By executing at install-time the python command will run -# with the correct permissions to allow the build. See OpenStack Bug #1340776 - -(set +u -source "${SWIFT_VENV_DIR}/bin/activate" -python -c "from xattr import getxattr, setxattr") diff --git a/elements/swift/install.d/swift-source-install/package-installs-swift b/elements/swift/install.d/swift-source-install/package-installs-swift deleted file mode 100644 index f3ea12da9..000000000 --- a/elements/swift/install.d/swift-source-install/package-installs-swift +++ /dev/null @@ -1 +0,0 @@ -libffi-dev diff --git a/elements/swift/os-apply-config/etc/swift/swift.conf b/elements/swift/os-apply-config/etc/swift/swift.conf deleted file mode 100644 index 6396f2cdc..000000000 --- a/elements/swift/os-apply-config/etc/swift/swift.conf +++ /dev/null @@ -1,17 +0,0 @@ -[swift-hash] -swift_hash_path_suffix = {{swift.hash}} - -{{#swift}} -{{#config}} -[{{{section}}}] -{{#values}} -{{#comment}} -# {{{.}}} -{{/comment}} -{{#option}} -{{{option}}} = {{{value}}} -{{/option}} -{{/values}} - -{{/config}} -{{/swift}} diff --git a/elements/swift/os-refresh-config/configure.d/20-swift-selinux b/elements/swift/os-refresh-config/configure.d/20-swift-selinux deleted file mode 100755 index f203ebf29..000000000 --- a/elements/swift/os-refresh-config/configure.d/20-swift-selinux +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -set -eux -set -o pipefail - -# Allow swift access to ephemeral ports -# https://bugs.launchpad.net/tripleo/+bug/1375526 -if [[ -x /usr/sbin/semanage ]]; then - setsebool -P swift_can_network 1 -fi diff --git a/elements/swift/os-refresh-config/configure.d/73-swift b/elements/swift/os-refresh-config/configure.d/73-swift deleted file mode 100755 index e0a9bbb6e..000000000 --- a/elements/swift/os-refresh-config/configure.d/73-swift +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/bash - -set -eux -set -o pipefail - -if [ -e "/etc/swift/object.ring.gz" -a -e "/etc/swift/container.ring.gz" -a \ - -e "/etc/swift/account.ring.gz" ]; then - echo "Won't build rings. Already exist." - exit 0 -fi - -PARTPOWER=$(os-apply-config --key swift.part-power --key-default 10) -REPLICAS=$(os-apply-config --key swift.replicas --key-default 1) -DEVICES=$(os-apply-config --key swift.devices --key-default "" --type raw) -ZONES=$(os-apply-config --key swift.zones --key-default 1) -MIN_PART_HOURS=$(os-apply-config --key swift.min-part-hours --key-default 1) -BUILD_RINGS=$(os-apply-config --key swift.ring-build --key-default "True" | tr '[:upper:]' '[:lower:]') - -if [ "$BUILD_RINGS" == "false" ] || [ "$BUILD_RINGS" == "f" ]; then - echo "Won't build rings" - exit 0 -fi - -get_bind_port () { - # first argument is the config file path - bind_string=$(grep bind_port $1) - if [ "$bind_string" != "" ]; then - equals_index=$(expr index "$bind_string" "=") - port_number=${bind_string:$equals_index} - echo ${port_number/ /} - else - echo "" - fi -} - -OBJECT_PORT=$(get_bind_port /etc/swift/object-server.conf) -CONTAINER_PORT=$(get_bind_port /etc/swift/container-server.conf) -ACCOUNT_PORT=$(get_bind_port /etc/swift/account-server.conf) - -if [ -z "$OBJECT_PORT" -o -z "$CONTAINER_PORT" -o -z "$ACCOUNT_PORT" ] ; then - echo "Not all swift bind_ports are specified:" - echo "/etc/swift/object-server.conf ($OBJECT_PORT)" - echo "/etc/swift/container-server.conf ($CONTAINER_PORT)" - echo "/etc/swift/account-server.conf ($ACCOUNT_PORT)" - exit 1 -fi - -if [ -z "$DEVICES" ] ; then - echo "No swift devices to configure" - exit 1 -fi - -swift-ring-builder /etc/swift/object.builder create $PARTPOWER $REPLICAS $MIN_PART_HOURS -swift-ring-builder /etc/swift/container.builder create $PARTPOWER $REPLICAS $MIN_PART_HOURS -swift-ring-builder /etc/swift/account.builder create $PARTPOWER $REPLICAS $MIN_PART_HOURS - -# Function to place server in its zone. Zone is calculated by -# server number in heat template modulo the number of zones + 1. -function place_in_zone () { - local zone=$(echo $1 | sed -r 's/.*(z%[A-Za-z]+)([0-9]+)(%).*/\2/') - local new_addr=$(echo "$1 $zone" | awk -v zones=$ZONES ' - {gsub(/z%[A-Za-z]+([0-9]+)%/,"z"($2%zones + 1), $1); print $1}') - echo "$new_addr" -} - -for DEVICE in ${DEVICES//,/ } ; do - DEVICE=$(place_in_zone $DEVICE) - swift-ring-builder /etc/swift/object.builder add ${DEVICE/\%PORT\%/$OBJECT_PORT} 100 - swift-ring-builder /etc/swift/container.builder add ${DEVICE/\%PORT\%/$CONTAINER_PORT} 100 - swift-ring-builder /etc/swift/account.builder add ${DEVICE/\%PORT\%/$ACCOUNT_PORT} 100 -done - -swift-ring-builder /etc/swift/object.builder rebalance 999 -swift-ring-builder /etc/swift/container.builder rebalance 999 -swift-ring-builder /etc/swift/account.builder rebalance 999 - -chown root:swift /etc/swift/*.ring.gz -chmod g+r /etc/swift/*.ring.gz diff --git a/elements/swift/source-repository-swift b/elements/swift/source-repository-swift deleted file mode 100644 index 913510def..000000000 --- a/elements/swift/source-repository-swift +++ /dev/null @@ -1 +0,0 @@ -swift git /opt/stack/swift https://git.openstack.org/openstack/swift diff --git a/elements/sysctl/README.md b/elements/sysctl/README.md deleted file mode 100644 index 9277d9f79..000000000 --- a/elements/sysctl/README.md +++ /dev/null @@ -1,38 +0,0 @@ -Manages sysctl settings. - -There are four ways to make use of this element: - -1) Elements can make use of sysctl-set-value directly by requiring -this element and calling /usr/local/bin/sysctl-set-value. This will -help ensure conflicting sysctl values are not in use across elements. -Please note that this script calls sysctl -p, which will set the sysctl -value on the build host while the image is building, which may be -unintended. - -2) Elements can make use of sysctl-write-value directly by requiring -this element and calling /usr/local/bin/sysctl-write-value. This script -does not verify values, or set them on the build host, it only writes the -files into the image, so that the values will be set when the image is -booted. - -3) Elements can make use of sysctl-append-value to set values that -complement values set by other elements, rather than overwriting or -conflicting with them. This script also does not set the sysctl value -on the build host. - -4) Alternately you can make use of the element via Heat by adding -metadata in the configuration example below. sysctl-set-value -will take care of applying these settings during configuration time. - -Configuration example ---------------------- - - sysctl: - net.ipv4.conf.all.arp_filter: 1 - net.ipv4.conf.all.arp_ignore: 2 - net.ipv4.conf.all.arp_announce: 2 - net.ipv4.conf.default.arp_filter: 1 - net.ipv4.conf.default.arp_ignore: 2 - net.ipv4.conf.default.arp_announce: 2 - -** Any valid sysctl key/value may be specified in this configuration format. diff --git a/elements/sysctl/bin/sysctl-append-value b/elements/sysctl/bin/sysctl-append-value deleted file mode 100755 index 9878f05b1..000000000 --- a/elements/sysctl/bin/sysctl-append-value +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -# Append values to a sysctl value. - -# The script is called with name/value pairs which are stored -# in the system default sysctl.d directory. Existing values are -# fetched, and the new value appended using ',' to seperate them. -# Once finished sysctl is used to activate the changes. -set -eu -set -o pipefail - -NAME=${1:-} -NEW_VALUE=${2:-} -# Optional comment used to describe the setting -COMMENT=${3:-"This file is managed via the TripleO sysctl image element."} - -if [ -z "$NAME" -o -z "$NEW_VALUE" ]; then - echo "Usage: sysctl-append-value [comment]" - exit 1 -fi - -FILENAME="/etc/sysctl.d/${NAME}.conf" - -if [ -f "$FILENAME" ]; then - if grep "$NEW_VALUE" $FILENAME; then - echo "Info: $NEW_VALUE already present in $NAME" - fi - VALUE=$(tail -n 1 $FILENAME | awk '{ print $3 }') - VALUE="$VALUE,$NEW_VALUE" -else - VALUE=$NEW_VALUE -fi - -sysctl-write-value $NAME $VALUE $COMMENT diff --git a/elements/sysctl/bin/sysctl-set-value b/elements/sysctl/bin/sysctl-set-value deleted file mode 100755 index d5f8d2a9a..000000000 --- a/elements/sysctl/bin/sysctl-set-value +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -# Validate and manage setting sysctl settings. -# -# The script is called with name/value pairs which are stored -# in the system default sysctl.d directory. Before adding new -# settings a validation is done to ensure that conflicting -# sysctl settings have not been requested. Once finished sysctl -# is used to activate the changes. -set -eu - -NAME=${1:-} -VALUE=${2:-} -# Optional comment used to describe the setting -COMMENT=${3:-"This file is managed via the TripleO sysctl image element."} - -if [ -z "$NAME" -o -z "$VALUE" ]; then - echo "NAME and VALUE are required." - exit 1 -fi - -FILENAME="/etc/sysctl.d/${NAME}.conf" - -if [ -f $FILENAME ]; then - # check to make sure the settings match... otherwise fail - if ! grep -q "^$NAME = $VALUE" $FILENAME; then - echo "Conflicting sysctl.conf setting for $NAME == $VALUE. Found:" - grep "^$NAME" $FILENAME - exit 1 - fi -else - - if ! sysctl -a | grep -q "^$NAME"; then - echo "Invalid sysctl key: $NAME" - exit 1 - fi - - sysctl-write-value $NAME "$VALUE" "$COMMENT" - - sysctl -p $FILENAME - -fi diff --git a/elements/sysctl/bin/sysctl-write-value b/elements/sysctl/bin/sysctl-write-value deleted file mode 100755 index e9a3ba79a..000000000 --- a/elements/sysctl/bin/sysctl-write-value +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -# Validate and manage setting sysctl settings. -# -# The script is called with name/value pairs which are stored -# in the system default sysctl.d directory. This script performs -# no checking, just writing out the file. -set -eu - -NAME=${1:-} -VALUE=${2:-} -# Optional comment used to describe the setting -COMMENT=${3:-"This file is managed via the TripleO sysctl image element."} - -if [ -z "$NAME" -o -z "$VALUE" ]; then - echo "Usage: sysctl-write-value [comment]" - exit 1 -fi - -FILENAME="/etc/sysctl.d/${NAME}.conf" - -cat > $FILENAME < /dev/null ; then - glance image-download ${TEMPEST_IMAGE_NAME} | glance image-create --name ${TEMPEST_IMAGE_NAME}-copy \ - --disk-format $USER_IMAGE_DISK_FORMAT --container-format $USER_IMAGE_CONTAINER_FORMAT --is-public 1 -fi - -USER_IMAGE_ID2=$(nova image-show ${TEMPEST_IMAGE_NAME}-copy | grep id | awk '$2=="id" {print $4}') - -EXTNET=$(neutron net-show ext-net | awk '/ id / {print $4}') - -# tempest requires two distinct flavors to use, but using m1.small would -# increase the amount of memory needed on the compute node. Instead we create -# an alternative m1.tiny, this will allow tests with only 4G of memory on -# compute nodes. -nova flavor-create m1.tiny_alt 99 512 2 1 || true - -LOCK_PATH=`mktemp -d` -trap "rm -rf $LOCK_PATH" EXIT - -# Calculate the keystone v3 from the v2 one -# Assuming the AUTH_URL is http://ip:port/version[/] -OS_V3_AUTH_URL=$(dirname ${OS_AUTH_URL})/v3 - -# TODO : see what other defaults can be used - -# If tempest.conf already exists we are using pass-through, so -# do not override the configuration -if [ ! -f etc/tempest.conf ]; then - # cp the tempest config file and edit the settings - cp etc/tempest.conf.sample etc/tempest.conf -fi - -# We dont want to output passwords -set +x - -# Append settings to tempest.conf. In case of duplicates the last entry wins. -cat - <> etc/tempest.conf - -[DEFAULT] -lock_path = $LOCK_PATH - -[identity] -uri = $OS_AUTH_URL -uri_v3 = $OS_V3_AUTH_URL -admin_username = $OS_USERNAME -admin_tenant_name = $OS_TENANT_NAME -admin_password = $OS_PASSWORD - -[compute] -image_ref = $USER_IMAGE_ID -image_ref_alt = $USER_IMAGE_ID2 -network_for_ssh = $EXTNET - -[compute-admin] -password = $OS_PASSWORD - -[network] -public_network_id = $EXTNET -EOF -set -x - -testr run --parallel --concurrency ${TEMPEST_RUN_CONCURRENCY} $(python tests2skip.py ${TEMPEST_TEST_REGEX_FILE}) diff --git a/elements/tempest/cleanup.d/50-remove-source-tempest b/elements/tempest/cleanup.d/50-remove-source-tempest deleted file mode 100755 index cbc3c5113..000000000 --- a/elements/tempest/cleanup.d/50-remove-source-tempest +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eu - -sudo rm -fr "${TMP_MOUNT_PATH}/opt/stack/tempest" diff --git a/elements/tempest/element-deps b/elements/tempest/element-deps deleted file mode 100644 index 593d05319..000000000 --- a/elements/tempest/element-deps +++ /dev/null @@ -1,3 +0,0 @@ -os-svc-install -package-installs -pkg-map diff --git a/elements/tempest/environment.d/10-tempest-venv-dir.bash b/elements/tempest/environment.d/10-tempest-venv-dir.bash deleted file mode 100644 index 3d8246b83..000000000 --- a/elements/tempest/environment.d/10-tempest-venv-dir.bash +++ /dev/null @@ -1,6 +0,0 @@ -if [ -z "${TEMPEST_VENV_DIR:-}" ]; then - export TEMPEST_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/tempest"} -fi -if [ -z "${TEMPEST_EXTRA_INSTALL_OPTS:-}" ]; then - export TEMPEST_EXTRA_INSTALL_OPTS=${OPENSTACK_EXTRA_INSTALL_OPTS:-""} -fi diff --git a/elements/tempest/install.d/51-tempest b/elements/tempest/install.d/51-tempest deleted file mode 100755 index 521a1d015..000000000 --- a/elements/tempest/install.d/51-tempest +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -set -eux -set -o pipefail - -os-svc-install $TEMPEST_EXTRA_INSTALL_OPTS -i "$TEMPEST_VENV_DIR" -u tempest -r /opt/stack/tempest - -set +u -source $TEMPEST_VENV_DIR/bin/activate -set -u - -cd /opt/stack/tempest -# bug #1293812 : Avoid easy_install triggering on pbr. -pip install -U 'pbr>=0.11,<2.0' - -pip install -r test-requirements.txt - -# Fix for creating and using a pip manifest correctly -name=$(basename $TEMPEST_VENV_DIR) -svc_manifest=$(get-pip-manifest $name) -if [ -n "$svc_manifest" ]; then - use-pip-manifest $svc_manifest -else - write-pip-manifest $name -fi - -testr init - -# Deactivate the virtualenv after use -set +u -deactivate -set -u - -# soft link testr into PATH so we can use it directly in run-tempest -ln -sf $TEMPEST_VENV_DIR/bin/testr /usr/local/bin/testr - -install -m 0664 -o root -g root $(dirname $0)/../tests2skip.txt /opt/stack/tempest/tests2skip.txt -install -m 0775 -o root -g root $(dirname $0)/../tests2skip.py /opt/stack/tempest/tests2skip.py diff --git a/elements/tempest/install.d/package-installs-tempest b/elements/tempest/install.d/package-installs-tempest deleted file mode 100644 index 5f08817f4..000000000 --- a/elements/tempest/install.d/package-installs-tempest +++ /dev/null @@ -1,2 +0,0 @@ -libffi_dev_package -ssl_dev_package diff --git a/elements/tempest/os-apply-config/etc/tempestrunrc b/elements/tempest/os-apply-config/etc/tempestrunrc deleted file mode 100644 index 7ef677761..000000000 --- a/elements/tempest/os-apply-config/etc/tempestrunrc +++ /dev/null @@ -1,24 +0,0 @@ -{{#tempestrun.concurrency}} -# Number of test processes spawned by testr -TEMPEST_RUN_CONCURRENCY={{tempestrun.concurrency}} -{{/tempestrun.concurrency}} -{{^tempestrun.concurrency}} -# Number of test processes spawned by testr -TEMPEST_RUN_CONCURRENCY=0 -{{/tempestrun.concurrency}} -{{#tempestrun.image}} -# Name of the test image to be used -TEMPEST_IMAGE_NAME={{tempestrun.image}} -{{/tempestrun.image}} -{{^tempestrun.image}} -# Name of the test image to be used -TEMPEST_IMAGE_NAME=user -{{/tempestrun.image}} -{{#tempestrun.regexfile}} -# File including the regexs for test filtering -TEMPEST_TEST_REGEX_FILE={{tempestrun.regexfile}} -{{/tempestrun.regexfile}} -{{^tempestrun.regexfile}} -# File including the regexs for test filtering -TEMPEST_TEST_REGEX_FILE=tests2skip.txt -{{/tempestrun.regexfile}} diff --git a/elements/tempest/os-apply-config/opt/stack/tempest/etc/tempest.conf b/elements/tempest/os-apply-config/opt/stack/tempest/etc/tempest.conf deleted file mode 100644 index 4b2649264..000000000 --- a/elements/tempest/os-apply-config/opt/stack/tempest/etc/tempest.conf +++ /dev/null @@ -1,53 +0,0 @@ -# Pass-through enabled configuration file, suitable for use with -# the existing bin/run-tempest script. - -[DEFAULT] -debug = true -use_stderr = false -log_file = tempest.log - -[identity] -region = regionOne -username = demo_t1 -tenant_name = demo_t1 -password = secret -alt_username = demo_t2 -alt_tenant_name = demo_t2 -alt_password = secret - -[compute] -flavor_ref_alt = 99 -fixed_nextwork_name = default-net -allow_tenant_isolation = true - -[compute-feature-enabled] -resize = false - -[service_available] -cinder = false -heat = true -neutron = true -ceilometer = false -horizon = false - -[stress] -max_instances = 4 -default_thread_number_per_action = 2 - -[network] -tenant_network_cidr = 172.16.0.0/16 - -{{#tempest}} -{{#config}} -[{{{section}}}] -{{#values}} -{{#comment}} -# {{{.}}} -{{/comment}} -{{#option}} -{{{option}}}={{{value}}} -{{/option}} -{{/values}} - -{{/config}} -{{/tempest}} diff --git a/elements/tempest/pkg-map b/elements/tempest/pkg-map deleted file mode 100644 index aea94b8b2..000000000 --- a/elements/tempest/pkg-map +++ /dev/null @@ -1,17 +0,0 @@ -{ - "family": { - "redhat": { - "libffi_dev_package": "libffi-devel", - "ssl_dev_package": "openssl-devel" - }, - "debian": { - "libffi_dev_package": "libffi-dev", - "ssl_dev_package": "libssl-dev" - }, - "suse": { - "libffi_dev_package": "libffi-devel", - "ssl_dev_package": "libopenssl-devel" - } - } -} - diff --git a/elements/tempest/source-repository-tempest b/elements/tempest/source-repository-tempest deleted file mode 100644 index 06c03445f..000000000 --- a/elements/tempest/source-repository-tempest +++ /dev/null @@ -1 +0,0 @@ -tempest git /opt/stack/tempest https://git.openstack.org/openstack/tempest diff --git a/elements/tempest/tests2skip.py b/elements/tempest/tests2skip.py deleted file mode 100755 index 35b1ec99a..000000000 --- a/elements/tempest/tests2skip.py +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2013 Red Hat -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -# Reads in a list of exclude regular expressions from a file and outputs a -# regex suitable to be passed into testr - -import sys - -""" -Whitelist is applied first. The blacklist is executed against the set of -tests returned by the whitelist. -If whitelist is empty, all available tests are fed to blacklist. -If blacklist is empty, all tests from whitelist are returned. - -The syntax for white-list and black-list is as follows: -- lines starting with # or empty are ignored -- lines starting with "+" are whitelisted -- lines starting with "-" are blacklisted -- lines not matching any of the above conditions are blacklisted - -The match for each line gets added a "^" in the beginning, -so the regular expression should account for that. - -For example, the following scenario: - - run all the smoke tests and scenario tests, - but exclude the api.volume tests. - -is implemented as: - - +.*smoke - +tempest\.scenario - -tempest\.api\.volume.* -""" - -whitelist = [] -blacklist = [] -with open(sys.argv[1]) as fp: - for line in fp: - line = line.strip() - if not line or line[0] == '#': - continue - if line.startswith("+"): - whitelist.append(line[1:]) - elif line.startswith("-"): - blacklist.append(line[1:]) - else: - blacklist.append(line) - -regex = '^(?=({whitelist}))' -params = dict(whitelist="|".join(whitelist)) -if blacklist: - regex += '(?!({blacklist}))' - params['blacklist'] = "|".join(blacklist) - -print(regex.format(**params)) diff --git a/elements/tempest/tests2skip.txt b/elements/tempest/tests2skip.txt deleted file mode 100644 index b2f63d29f..000000000 --- a/elements/tempest/tests2skip.txt +++ /dev/null @@ -1,43 +0,0 @@ -# we have the v3 endpoint but lots of the tests fail, need to investigate -tempest\.api\.compute\.v3.* -# Can't run https://bugs.launchpad.net/tempest/+bug/1250866 -tempest\.api\.compute\.admin\.test_quotas\.QuotasAdminTest.*\.test_create_server_when.* -tempest\.api\.compute\.servers\.test_list_servers_negative\.ListServersNegativeTest - -# Need to refine these to only exclude the failing ones -tempest\.api\.compute\.servers\.test_create_server.* -tempest\.api\.compute\.servers\.test_server_addresses.* -tempest\.api\.compute\.servers\.test_server_rescue.* -tempest\.api\.compute\.servers\.test_virtual_interfaces.* -# The server rebuild fails during file injection -tempest\.api\.compute\.servers\.test_server_actions\.ServerActionsTestJSON\.test_rebuild_server - -# These network tests fail, do we have them? -tempest\.api\.network\.test_service_type_management.* -tempest\.api\.network\.test_vpnaas_extensions.* -tempest\.api\.network\.test_load_balancer.* -tempest\.api\.network\.test_networks\.BulkNetworkOps.* -tempest\.api\.network\.test_networks\.NetworksTest.* - -# I don't think cinder is currently working in overcloud, enable this once it is -tempest\.api\.volume.* -tempest\.api\.compute\.volumes.* - -# The fedora image doesn't produce a console log -tempest\.api\.compute\.servers\.test_server_actions\.ServerActionsTest.*\.test_get_console_output - -# Once all of the above test filters are removed, these should be enabled -tempest\.scenario.* - -# These tests pass if run standalone but sometimes fail when run with --parallel -tempest\.api\.compute\.servers\.test_list_server_filters\.ListServerFiltersTest.*\.test_list_servers_detailed_filter_by_server_status - -# volume and s3 boto tests failing -tempest\.thirdparty\.boto\.test_ec2_volumes.* -tempest\.thirdparty\.boto\.test_s3_objects\.S3BucketsTest\.test_create_get_delete_object - -## Things we actually want to skip -# We might not be on the same host as nova -tempest\.cli\.simple_read_only\.test_nova_manage.* -# These are the tempest unit tests -tempest\.tests.* diff --git a/elements/tripleo-cd/README.md b/elements/tripleo-cd/README.md deleted file mode 100644 index ee85d2cd2..000000000 --- a/elements/tripleo-cd/README.md +++ /dev/null @@ -1,34 +0,0 @@ -# Continually deploy an overcloud. - -## Configuration - -See configs/ for per-cloud configuration. The \_network.json files there -describe the deployment layer configuration for a cloud. The \_env.json -files are heat environment files for a cloud. - -## Caveats - -Currently, continually deploying an overcloud results in the overcloud being -discarded each deploy. - -## Operation - -The service tripleo-cd runs tripleo-cd which loops deploying and redeploying an -overcloud. - -## Configuration - -There is currently no configuration available: changes are made to -tripleo-cd.sh directly. - -## Generating testenvs -To generate a testenv heat stack the deploy-testenv script can be used along with -the a config file describing the testenv you want to generate. We currently hold -config files for the HP and Red Hat racks along with a test config file that can -be used to deploy a testenv on a devtest undercloud, e.g. to generate a single host -testenv on your devtest undercloud (this may not allow you to run ci tests but will -at the very least allow you to test the environment is setup correctly), it requires -that you have unused barmetal nodes registered on your undercloud. - - . undercloudrc - ./bin/deploy-testenv configs/te\_localrc diff --git a/elements/tripleo-cd/bin/deploy-testenv b/elements/tripleo-cd/bin/deploy-testenv deleted file mode 100755 index 66ca0a7bf..000000000 --- a/elements/tripleo-cd/bin/deploy-testenv +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -# -# This is a helper to get tripleo-cd admins to deploy testenvs repeatably. -set -eux -set -o pipefail - -source $1 - -export ELEMENTS_PATH=$TRIPLEO_ROOT/tripleo-image-elements/elements:$TRIPLEO_ROOT/tripleo-ci/elements -IMG=$TRIPLEO_ROOT/testenv-worker.qcow2 - -ANS=n -if [ -e $IMG ] ; then - read -p "Would you like to generate a new test env image? [n/y] " ANS -fi - -if [ ! -e $IMG -o "${ANS,,}" = "y" ] ; then - $TRIPLEO_ROOT/diskimage-builder/bin/disk-image-create -a amd64 -o $IMG \ - stackuser $TE_DISTRO $TE_EXTRA_ELEMENTS testenv-worker dhcp-all-interfaces hosts baremetal -u -fi - -$TRIPLEO_ROOT/tripleo-incubator/scripts/load-image -d $IMG - -if heat stack-show testenv > /dev/null; then - HEAT_OP=update -else - HEAT_OP=create -fi - -python $TRIPLEO_ROOT/tripleo-heat-templates/tripleo_heat_merge/merge.py \ - --scale testenv=$TE_COUNT --output $TRIPLEO_ROOT/testenv-workers-built.yaml \ - $TRIPLEO_ROOT/tripleo-ci/heat-templates/testenv-workers.yaml - -heat stack-$HEAT_OP \ - -f $TRIPLEO_ROOT/testenv-workers-built.yaml \ - -P AuthUser=tripleo-ci \ - -P AuthTenant=openstack-nodepool \ - -P AuthPassword=$TE_OVERCLOUDPASSWD \ - -P AuthUrl=$TE_AUTHURL \ - -P GearmanHost=$TE_GEARMANHOST \ - -P NetworkName=tripleo-bm-test \ - -P PublicInterface=$TE_PUBLICINTERFACE \ - -P Hosts="$TE_OVERCLOUDIP $TE_OVERCLOUDDNS" \ - -P CPUPerEnv=$TE_CPUPERENV \ - -P DiskPerEnv=$TE_DISKPERENV \ - -P MemPerEnv=$TE_MEMPERENV \ - -P NtpServer=$TE_NTPSERVER \ - testenv diff --git a/elements/tripleo-cd/bin/prepare-ci-overcloud b/elements/tripleo-cd/bin/prepare-ci-overcloud deleted file mode 100755 index 3ca2bced0..000000000 --- a/elements/tripleo-cd/bin/prepare-ci-overcloud +++ /dev/null @@ -1,150 +0,0 @@ -#!/bin/bash -# -# This is a helper to get tripleo-cd admins to prepare a ci-overcloud for CI repeatably. -set -ux -set -o pipefail - -source $1 - -set -e - -# These are only here for local install tests and should be noop if deploy-ci-overcloud was used to create overcloud -$TRIPLEO_ROOT/tripleo-incubator/scripts/assert-admin-users $TRIPLEO_ROOT/tripleo-incubator/tripleo-cloud/tripleo-cd-admins -$TRIPLEO_ROOT/tripleo-incubator/scripts/assert-users $TRIPLEO_ROOT/tripleo-incubator/tripleo-cloud/tripleo-cd-admins -$TRIPLEO_ROOT/tripleo-incubator/scripts/assert-users $TRIPLEO_ROOT/tripleo-incubator/tripleo-cloud/tripleo-cd-users - -# Get the ID of the nodepool tenant -NODEPOOL_TENANT_ID=$(openstack project list | awk '$4=="openstack-nodepool" {print $2}') - -# Each instance uses 3 ports -neutron quota-update --tenant-id $NODEPOOL_TENANT_ID --port 300 -nova quota-update --cores -1 --ram $TE_NP_RAM_QUOTA --instances 100 --floating-ips 100 --fixed-ips -1 $NODEPOOL_TENANT_ID - -# Create the test network and subnet if they don't exist -if ! neutron net-show tripleo-bm-test ; then - neutron net-create tripleo-bm-test --tenant-id $NODEPOOL_TENANT_ID --provider:network_type flat --provider:physical_network $TE_PROVIDER_NET_NAME -fi -TESTNETID=$(neutron net-show tripleo-bm-test | awk '$2=="id" {print $4}') -if [ $(neutron net-show tripleo-bm-test | awk '$2=="subnets" {print $4}') == "|" ] ; then - neutron subnet-create --ip_version 4 --tenant-id $NODEPOOL_TENANT_ID \ - --allocation-pool start=172.16.0.1,end=172.16.3.234 --no-gateway \ - $TESTNETID 172.16.0.0/22 --dns-nameservers list=true 8.8.8.8 -fi - -# update subnet of default-net with some dns -DEFAULTSUBNETID=$(neutron net-show default-net | awk '$2=="subnets" {print $4}') -neutron subnet-update $DEFAULTSUBNETID --dns-nameservers list=true 8.8.8.8 - -# we may already have this so keystone may error -# XXX: we can query this membership. -openstack role add --user tripleo-ci --project openstack-nodepool Member || true - -# Create the flavor nodepool uses -nova flavor-show h1.ci || nova flavor-create h1.ci auto 8192 20 1 - -# Create a flavor for mirrors with more disk space then is normal -nova flavor-show d1.medium || nova flavor-create d1.medium auto 4096 200 2 - -USE_CACHE=${USE_CACHE:-0} -# The the images that nodepool uses to creat templates -F20_IMAGE_FILE=$TRIPLEO_ROOT/fedora-20.x86_64.qcow2 -if [ ! -e $F20_IMAGE_FILE -o "$USE_CACHE" != "1" ] ; then - FEDORA_IMAGE=$(wget -q http://dl.fedoraproject.org/pub/fedora/linux/updates/20/Images/x86_64/ -O - | grep -o -E 'href="([^"#]+qcow2)"' | cut -d'"' -f2) - curl http://dl.fedoraproject.org/pub/fedora/linux/updates/20/Images/x86_64/$FEDORA_IMAGE > $F20_IMAGE_FILE -fi -PRECISE_IMAGE_FILE=$TRIPLEO_ROOT/precise-server-cloudimg-amd64-disk1.img -PRECISE_IMAGE_URL=http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-amd64-disk1.img -if [ ! -e $PRECISE_IMAGE_FILE -o "$USE_CACHE" != "1" ] ; then - curl $PRECISE_IMAGE_URL -o $PRECISE_IMAGE_FILE -fi -if ! glance image-show "Fedora 20 64-bit" ; then - glance image-create --name "Fedora 20 64-bit" --disk-format qcow2 --container-format bare --is-public 1 --file $F20_IMAGE_FILE --progress -fi -if ! glance image-show "Ubuntu Precise 12.04 LTS Server 64-bit" ; then - glance image-create --name "Ubuntu Precise 12.04 LTS Server 64-bit" --disk-format qcow2 --container-format bare --is-public 1 --file $PRECISE_IMAGE_FILE --progress -fi - -NETLIST=$(neutron net-list) -DEFAULT_NET=$(awk '/default-net/ { print $2 }' <<< "$NETLIST") -EXT_NET=$(awk '/ext-net/ { print $2 }' <<< "$NETLIST") - -# Create and boot test env gear broker -BROKER_IMG=$TRIPLEO_ROOT/te-broker.qcow2 -if [ ! -e $BROKER_IMG -o "$USE_CACHE" != "1" ] ; then - $TRIPLEO_ROOT/diskimage-builder/bin/disk-image-create -a amd64 -o $BROKER_IMG \ - $TE_DISTRO vm geard stackuser dhcp-all-interfaces -fi -# XXX(lifeless) make a load-image patch for virt use -if glance image-show te-broker &> /dev/null; then - glance image-delete te-broker -fi -glance image-create --name "te-broker" --disk-format qcow2 --container-format bare --is-public 1 --file $BROKER_IMG --progress - -NP_CREDS="--os-username=openstack-nodepool --os-password=$TE_OVERCLOUDNPPASSWD --os-tenant-name=openstack-nodepool" -if ! nova $NP_CREDS keypair-list | grep -q " default "; then - nova $NP_CREDS keypair-add default > ~/.ssh/tripleo-ci - chmod 0600 ~/.ssh/tripleo-ci -fi -if ! nova $NP_CREDS show te-broker ; then - nova $NP_CREDS boot --image "te-broker" --flavor $TE_BROKER_FLAVOR \ - --nic net-id=$DEFAULT_NET \ - --nic net-id=$TESTNETID,v4-fixed-ip=172.16.3.254 --key-name default \ - te-broker -fi - -# Create and boot squid broker -SQUID_IMG=$TRIPLEO_ROOT/squid.qcow2 -if [ ! -e $SQUID_IMG -o "$USE_CACHE" != "1" ] ; then - $TRIPLEO_ROOT/diskimage-builder/bin/disk-image-create -a amd64 -o $SQUID_IMG \ - $TE_DISTRO vm squid stackuser dhcp-all-interfaces -fi -# XXX(lifeless) make a load-image patch for virt use -if glance image-show squid &> /dev/null; then - glance image-delete squid -fi -glance image-create --name squid --disk-format qcow2 --container-format bare --is-public 1 --file $SQUID_IMG --progress - -if ! nova $NP_CREDS show squid ; then - nova $NP_CREDS boot --image "squid" --flavor $TE_BROKER_FLAVOR \ - --nic net-id=$DEFAULT_NET \ - --nic net-id=$TESTNETID,v4-fixed-ip=172.16.3.253 --key-name default \ - squid -fi - -# Create and boot bandersnatch pypi mirror -BANDERSNATCH_IMG=$TRIPLEO_ROOT/bandersnatch.qcow2 -if [ ! -e $BANDERSNATCH_IMG -o "$USE_CACHE" != "1" ] ; then - $TRIPLEO_ROOT/diskimage-builder/bin/disk-image-create -a amd64 -o $BANDERSNATCH_IMG \ - $TE_DISTRO vm bandersnatch stackuser dhcp-all-interfaces -fi -# XXX(lifeless) make a load-image patch for virt use -if glance image-show bandersnatch &> /dev/null; then - glance image-delete bandersnatch -fi -glance image-create --name bandersnatch --disk-format qcow2 --container-format bare --is-public 1 --file $BANDERSNATCH_IMG --progress - -if ! nova $NP_CREDS show bandersnatch ; then - nova $NP_CREDS boot --image "bandersnatch" --flavor d1.medium \ - --nic net-id=$DEFAULT_NET \ - --nic net-id=$TESTNETID,v4-fixed-ip=172.16.3.252 --key-name default \ - bandersnatch -fi - -# Assign a floting IP to the broker -TE_ID=$(nova $NP_CREDS show te-broker | awk '$2=="id" { print $4 }') -FLOATING_IP=$(nova $NP_CREDS floating-ip-list | awk '$4=="'$TE_ID'" {print $2}') -if [ -z "$FLOATING_IP" ]; then - FLOATING_IP=$(nova $NP_CREDS floating-ip-create | awk '$8=="ext-net" {print $2}') - nova $NP_CREDS add-floating-ip te-broker $FLOATING_IP -fi - -# Ensure the default tripleo security group has ICMP and SSH inbound access - -if ! neutron $NP_CREDS security-group-rule-list | grep -q 'default.*icmp' ; then - neutron $NP_CREDS security-group-rule-create default --protocol icmp \ - --direction ingress --port-range-min 8 -fi -if ! neutron $NP_CREDS security-group-rule-list | grep -q 'default.*tcp' ; then - neutron $NP_CREDS security-group-rule-create default --protocol tcp \ - --direction ingress --port-range-min 22 --port-range-max 22 -fi diff --git a/elements/tripleo-cd/bin/tripleo-cd.sh b/elements/tripleo-cd/bin/tripleo-cd.sh deleted file mode 100755 index 9b524eac1..000000000 --- a/elements/tripleo-cd/bin/tripleo-cd.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -# -# Copyright 2013 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -set -eux - -# To use this, create /opt/stack/testenv.json matching the region it is running -# in. While we only CD the overcloud, only overcloud related keys are needed -# - e.g. {"arch": "amd64"} - -function cleanup(){ - rm -f $THROTTLELOCK -} - -export OVERCLOUD_DIB_EXTRA_ARGS="pypi" -export DIB_COMMON_ELEMENTS="pypi stackuser" -export DIB_DISTRIBUTION_MIRROR=http://10.10.16.169/ubuntu -export PYPI_MIRROR_URL=http://10.10.16.169/pypi/simple -THROTTLELOCK=$(mktemp /tmp/tripleo-cd-throttle-XXXXXX.lock) -trap cleanup EXIT -while true; do - flock -x $THROTTLELOCK sleep 600 & - source /opt/stack/tripleo-incubator/scripts/refresh-env /opt/stack - source /opt/stack/tripleo-incubator/scripts/devtest_variables.sh - source /root/stackrc - set +e - OVERCLOUD_LIBVIRT_TYPE="kvm" \ - devtest_overcloud.sh vlan25 138.35.77.4/25 eth2 138.35.77.1 138.35.77.131 \ - 138.35.77.254 138.35.77.128/25 \ - $TRIPLEO_ROOT/tripleo-incubator/tripleo-cloud/tripleo-cd-admins \ - $TRIPLEO_ROOT/tripleo-incubator/tripleo-cloud/tripleo-cd-users - RESULT=$? - # If possible list heat events - heat event-list overcloud || : - # List relationship between hardware nodes and instance ids. - set +x - for i in $(nova baremetal-node-list | awk '/^\| / {if ($2 != "ID") {print $2}}') ; do - instance_id=$(nova baremetal-node-show $i | awk '/instance_uuid/ {print $4}') - echo "$i,$instance_id" - done - nova list - set -e - MSG=$(echo "************** overcloud complete status=$RESULT ************") - echo "$MSG" - set -x - send-irc tripleo cd-undercloud "$MSG" - flock -x $THROTTLELOCK echo - if [ "0" != "$RESULT" ]; then - exit $RESULT - fi -done diff --git a/elements/tripleo-cd/configs/hp1_ci_env.json b/elements/tripleo-cd/configs/hp1_ci_env.json deleted file mode 100644 index ca5149ba9..000000000 --- a/elements/tripleo-cd/configs/hp1_ci_env.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "NeutronPublicInterface": "eth2", - "HypervisorNeutronPublicInterface": "eth2", - "NtpServer": "10.10.16.134", - "PublicVirtualFixedIPs": "[{\"ip_address\": \"138.35.77.6\"}]", - "PublicVirtualInterface": "int_public", - "PublicVirtualNetwork": "public" -} diff --git a/elements/tripleo-cd/configs/hp1_networks.json b/elements/tripleo-cd/configs/hp1_networks.json deleted file mode 100644 index 36d5b0d1d..000000000 --- a/elements/tripleo-cd/configs/hp1_networks.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "cidr": "10.10.16.128/26", - "gateway-ip": "138.35.77.1", - "seed": { - "ip": "10.10.16.131", - "range-start": "10.10.16.132", - "range-end": "10.10.16.136", - "physical_bridge_route": { - "prefix": "10.10.16.0/25", - "via": "10.10.16.129" - }, - "public_vlan": { - "tag": 25, - "ip": "138.35.77.3/25", - "start": "138.35.77.4", - "finish": "138.35.77.4" - } - }, - "undercloud": { - "range-start": "10.10.16.137", - "range-end": "10.10.16.190", - "public_vlan": { - "start": "138.35.77.5", - "finish": "138.35.77.6" - } - }, - "overcloud": { - "public_vlan": { - "start": "138.35.77.13", - "finish": "138.35.77.126", - "cidr": "138.35.77.0/25" - } - } -} diff --git a/elements/tripleo-cd/configs/hp1_oc_env.json b/elements/tripleo-cd/configs/hp1_oc_env.json deleted file mode 100644 index 3e8b33220..000000000 --- a/elements/tripleo-cd/configs/hp1_oc_env.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "OvercloudHypervisorPublicInterface": "eth2", - "OvercloudName": "ci-overcloud.hp1.tripleo.org", - "OvercloudControlscale": "3", - "OvercloudComputescale": "16", - "OvercloudNodeArch": "amd64" -} diff --git a/elements/tripleo-cd/configs/hp1_uc_env.json b/elements/tripleo-cd/configs/hp1_uc_env.json deleted file mode 100644 index 8b9080f3f..000000000 --- a/elements/tripleo-cd/configs/hp1_uc_env.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parameters": { - "MysqlInnodbBufferPoolSize": 4096, - "NeutronPublicInterface": "vlan25", - "NeutronPublicInterfaceIP": "138.35.77.3/25", - "NeutronPublicInterfaceRawDevice": "eth2", - "NeutronPublicInterfaceDefaultRoute": "138.35.77.1", - "NtpServer": "10.10.16.130", - "SwiftReplicas": 2 - } -} diff --git a/elements/tripleo-cd/configs/hp2_ci_env.json b/elements/tripleo-cd/configs/hp2_ci_env.json deleted file mode 100644 index e422efa55..000000000 --- a/elements/tripleo-cd/configs/hp2_ci_env.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parameters": { - "NeutronPublicInterface": "eth2", - "HypervisorNeutronPublicInterface": "eth2", - "NtpServer": "15.126.48.2", - "PublicVirtualFixedIPs": "[{\"ip_address\": \"15.126.48.6\"}]", - "PublicVirtualInterface": "int_public", - "PublicVirtualNetwork": "public" - } -} diff --git a/elements/tripleo-cd/configs/hp2_networks.json b/elements/tripleo-cd/configs/hp2_networks.json deleted file mode 100644 index 8fb8c4d43..000000000 --- a/elements/tripleo-cd/configs/hp2_networks.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "cidr": "10.23.212.0/25", - "gateway-ip": "15.126.48.1", - "seed": { - "ip": "10.23.212.3", - "range-start": "10.23.212.4", - "range-end": "10.23.212.8", - "physical_bridge_route": { - "prefix": "10.22.27.128/25", - "via": "10.23.212.1" - }, - "public_vlan": { - "tag": 1598, - "ip": "15.126.48.3/24", - "start": "15.126.48.4", - "finish": "15.126.48.4" - } - }, - "undercloud": { - "range-start": "10.23.212.9", - "range-end": "10.23.212.126", - "public_vlan": { - "start": "15.126.48.7", - "finish": "15.126.48.12" - } - }, - "overcloud": { - "public_vlan": { - "start": "15.126.48.13", - "finish": "15.126.48.126", - "cidr": "15.126.48.0/25" - } - } -} diff --git a/elements/tripleo-cd/configs/hp2_oc_env.json b/elements/tripleo-cd/configs/hp2_oc_env.json deleted file mode 100644 index 3ae54a799..000000000 --- a/elements/tripleo-cd/configs/hp2_oc_env.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "OvercloudHypervisorPublicInterface": "eth2", - "OvercloudName": "ci-overcloud.hp2.tripleo.org", - "OvercloudControlscale": "3", - "OvercloudComputescale": "24", - "OvercloudNTPServer": "10.23.212.2" -} diff --git a/elements/tripleo-cd/configs/hp2_uc_env.json b/elements/tripleo-cd/configs/hp2_uc_env.json deleted file mode 100644 index 3da77ddd4..000000000 --- a/elements/tripleo-cd/configs/hp2_uc_env.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parameters": { - "MysqlInnodbBufferPoolSize": 4096, - "NeutronPublicInterface": "vlan25", - "NeutronPublicInterfaceIP": "15.126.48.3/24", - "NeutronPublicInterfaceRawDevice": "eth2", - "NeutronPublicInterfaceDefaultRoute": "15.126.48.1", - "NtpServer": "15.126.48.2" - } -} diff --git a/elements/tripleo-cd/configs/te_commonrc b/elements/tripleo-cd/configs/te_commonrc deleted file mode 100755 index bfb7f663d..000000000 --- a/elements/tripleo-cd/configs/te_commonrc +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -# dib-lint: disable=sete - -source $TRIPLEO_ROOT/tripleo-incubator/scripts/set-os-type -TE_BROKER_USER=ubuntu -if [ $TRIPLEO_OS_DISTRO = "fedora" ] ; then - TRIPLEO_OS_DISTRO="fedora selinux-permissive" - TE_BROKER_USER=fedora -fi - -export TE_DISTRO=$TRIPLEO_OS_DISTRO -export TE_EXTRA_ELEMENTS= -export TE_PROVIDER_NET_NAME=datacentre -export TE_GEARMANHOST=172.16.3.254 - -export TE_OVERCLOUDPASSWD=$(awk '$1=="tripleo-ci" { print $2 }' < /os-asserted-users) -export TE_OVERCLOUDNPPASSWD=$(awk '$1=="openstack-nodepool" { print $2 }' < /os-asserted-users) -export TE_CPUPERENV=3 -export TE_DISKPERENV=150 -# It should 16 here but free -g is reporting 62 instead of 64G -export TE_MEMPERENV=15 - -export TE_BROKER_FLAVOR=m1.medium diff --git a/elements/tripleo-cd/configs/te_hp1rc b/elements/tripleo-cd/configs/te_hp1rc deleted file mode 100755 index 84f8cc0f9..000000000 --- a/elements/tripleo-cd/configs/te_hp1rc +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# dib-lint: disable=sete - -export TRIPLEO_ROOT="$(readlink -f $(dirname $0)/../../../..)" -source $(dirname ${BASH_SOURCE})/te_commonrc - -export TE_OVERCLOUDIP=10.10.16.155 -export TE_OVERCLOUDDNS=ci-overcloud.hp1.tripleo.org -export TE_AUTHURL=http://$TE_OVERCLOUDIP:5000/v2.0 -export TE_PUBLICINTERFACE=eth2 -export TE_COUNT=23 -#export TE_EXTRA_ELEMENTS="stable-interface-names" -# (No local pypi mirror yet...) -#export DIB_DISTRIBUTION_MIRROR=http://10.10.16.169/ubuntu -#export PYPI_MIRROR_URL=http://10.10.16.169/pypi/simple -#export DIB_NO_PYPI_PIP=1 -export TE_NP_RAM_QUOTA=900000 -export TE_NTPSERVER=10.10.16.134 diff --git a/elements/tripleo-cd/configs/te_hp2rc b/elements/tripleo-cd/configs/te_hp2rc deleted file mode 100644 index c407b3aad..000000000 --- a/elements/tripleo-cd/configs/te_hp2rc +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# dib-lint: disable=sete - -export TRIPLEO_ROOT="$(readlink -f $(dirname $0)/../../../..)" -source $(dirname ${BASH_SOURCE})/te_commonrc - -export TE_OVERCLOUDIP=XXX -export TE_OVERCLOUDDNS=ci-overcloud.hp2.tripleo.org -export TE_AUTHURL=http://$TE_OVERCLOUDIP:5000/v2.0 -export TE_PUBLICINTERFACE=XXX -export TE_COUNT=23 -#export TE_EXTRA_ELEMENTS="stable-interface-names" -# (No local pypi mirror yet...) -#export DIB_DISTRIBUTION_MIRROR=http://10.10.16.169/ubuntu -#export PYPI_MIRROR_URL=http://10.10.16.169/pypi/simple -#export DIB_NO_PYPI_PIP=1 -export TE_NP_RAM_QUOTA=900000 diff --git a/elements/tripleo-cd/configs/te_localrc b/elements/tripleo-cd/configs/te_localrc deleted file mode 100755 index ccb800400..000000000 --- a/elements/tripleo-cd/configs/te_localrc +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# dib-lint: disable=sete - -export TRIPLEO_ROOT="$(readlink -f $(dirname $0)/../../../..)" -source $(dirname ${BASH_SOURCE})/te_commonrc - -export TE_OVERCLOUDIP=$(nova list | grep "notCompute0\|controller" | grep -oE '192.0.2.[0-9]+') -export TE_OVERCLOUDDNS=$(nova list | grep "notCompute0\|controller" | grep -oE '192.0.2.[0-9]+') -export TE_OVERCLOUDPASSWD=$(grep OVERCLOUD_ADMIN_PASSWORD $TRIPLEO_ROOT/tripleo-overcloud-passwords | cut -d "=" -f 2) -export TE_GEARMANHOST=127.0.0.1 -export TE_AUTHURL=http://$TE_OVERCLOUDIP:5000/v2.0 -export TE_PUBLICINTERFACE=eth0 -export TE_COUNT=1 - -# These are very different from a real deployment, specifically to allow people to create a testenv -# on a virtual devtest undercloud -export TE_CPUPERENV=1 -export TE_DISKPERENV=1 -export TE_MEMPERENV=1 -export TE_BROKER_FLAVOR=m1.small -export TE_NP_RAM_QUOTA=32000 diff --git a/elements/tripleo-cd/configs/te_rh1rc b/elements/tripleo-cd/configs/te_rh1rc deleted file mode 100755 index 49347d091..000000000 --- a/elements/tripleo-cd/configs/te_rh1rc +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -# dib-lint: disable=sete - -export TRIPLEO_ROOT="$(readlink -f $(dirname $0)/../../../..)" -source $(dirname ${BASH_SOURCE})/te_commonrc - -export TE_OVERCLOUDIP=10.1.8.37 -export TE_OVERCLOUDDNS=ci-overcloud.rh1.tripleo.org -export TE_EXTRA_ELEMENTS="stable-interface-names" -export TE_AUTHURL=http://$TE_OVERCLOUDIP:5000/v2.0 -export TE_PUBLICINTERFACE=em1 -export TE_COUNT=6 -export TE_NP_RAM_QUOTA=180000 -export TE_NTPSERVER= diff --git a/elements/tripleo-cd/deploy-ci-overcloud b/elements/tripleo-cd/deploy-ci-overcloud deleted file mode 100755 index e59dbc25a..000000000 --- a/elements/tripleo-cd/deploy-ci-overcloud +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/bash -# -# Copyright 2014 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -set -eux -set -o pipefail - -function show_options() { - echo "Usage: $SCRIPT_NAME REGION_CODE CONFIG_BASE" - echo - echo "Deploy the CI overcloud for a region." - echo - echo "Options:" - echo " REGION_CODE: short name for the region. Required." - echo " CONFIG_BASE: directory containing the config data for the region." - echo " defaults to \$PWD/configs" - echo - echo " These two values will be combined to find the configs. For" - echo " instance, given '$SCRIPT_NAME hp2 myconfig', networking data" - echo " will be searched for in myconfig/hp2_networks.json" -} - -if [ -z "$1" ]; then - echo "REGION_CODE is required" - echo - show_options - exit 1 -fi - -REGION_CODE="${1}" -CONFIG_DIR="${2:-$PWD/configs}" -FILE_PREFIX=$CONFIG_DIR/$REGION_CODE - -CI_ENV_FILE=${FILE_PREFIX}_ci_env.json -NETWORKS_FILE=${FILE_PREFIX}_networks.json -OC_ENV_FILE=${FILE_PREFIX}_oc_env.json - -if [[ ! -e $CI_ENV_FILE || ! -e $NETWORKS_FILE || ! -e $OC_ENV_FILE ]]; then - echo "Missing config file. Couldn't find one of:" - echo "${CI_ENV_FILE}, ${NETWORKS_FILE}, or ${OC_ENV_FILE}". - echo "Please ensure all three are present then re-run this script" - exit 2 -fi - -cd / - -# We want to map the DC network into the VMs: -export OVERCLOUD_HYPERVISOR_PUBLIC_INTERFACE=$(jq -r .OvercloudHypervisorPublicInterface $OC_ENV_FILE) - -# API endpoint for host file injection -export OVERCLOUD_NAME=$(jq -r .OvercloudName $OC_ENV_FILE) - -# How many machines -export OVERCLOUD_CONTROLSCALE=$(jq -r .OvercloudControlscale $OC_ENV_FILE) -export OVERCLOUD_COMPUTESCALE=$(jq -r .OvercloudComputescale $OC_ENV_FILE) -# Experience shows a 3:2 memory ratio between testenvs and CI slaves is about right - -# And a unique name for the thing we're deploying. -export STACKNAME=ci-overcloud - -#export OVERCLOUD_DIB_EXTRA_ARGS="pypi" -export NODE_ARCH=$(jq -r .OvercloudNodeArch $OC_ENV_FILE) -# We need to inject a static mapping to the API endpoint. -export DIB_COMMON_ELEMENTS="stackuser hosts use-ephemeral" -#export DIB_COMMON_ELEMENTS="pypi-openstack pip-cache stackuser hosts" -#source /opt/stack/tripleo-incubator/scripts/refresh-env /opt/stack -#source /opt/stack/tripleo-incubator/scripts/devtest_variables.sh -#source /root/stackrc - -export OVERCLOUD_PUBLIC_VLAN_START=$(jq -r .overcloud.public_vlan.start $NETWORKS_FILE) -export OVERCLOUD_PUBLIC_VLAN_FINISH=$(jq -r .overcloud.public_vlan.finish $NETWORKS_FILE) -export OVERCLOUD_PUBLIC_VLAN_CIDR=$(jq -r .overcloud.public_vlan.cidr $NETWORKS_FILE) -export OVERCLOUD_PUBLIC_VIRTUAL_INTERFACE=$(jq -r .NeutronPublicInterface $CI_ENV_FILE) -export OVERCLOUD_NTP_SERVER=$(jq -r .NtpServer $CI_ENV_FILE) -export OVERCLOUD_NAME=$(jq -r .OvercloudName $OC_ENV_FILE) -set +e -OVERCLOUD_LIBVIRT_TYPE="kvm" \ - devtest_overcloud.sh "${OVERCLOUD_PUBLIC_VIRTUAL_INTERFACE}" "" "" "" \ - "${OVERCLOUD_PUBLIC_VLAN_START}" "${OVERCLOUD_PUBLIC_VLAN_FINISH}" \ - "${OVERCLOUD_PUBLIC_VLAN_CIDR}" \ - "${TRIPLEO_ROOT}/tripleo-incubator/tripleo-cloud/tripleo-cd-admins" \ - "${TRIPLEO_ROOT}/tripleo-incubator/tripleo-cloud/tripleo-cd-users" \ - "${STACKNAME}" "/home/shared/ssl/${OVERCLOUD_NAME}" "${OVERCLOUD_NAME}" -RESULT=$? -set -e - -if [ $RESULT == 0 ] ; then - set +e - export TE_DATAFILE=$TRIPLEO_ROOT/testenv.json - source $TRIPLEO_ROOT/tripleo-incubator/overcloudrc - $TRIPLEO_ROOT/tripleo-image-elements/elements/tripleo-cd/bin/prepare-ci-overcloud \ - $TRIPLEO_ROOT/tripleo-image-elements/elements/tripleo-cd/configs/te_${REGION_CODE}rc - RESULT=$? - set -e -fi - -MSG=$(echo "************** $STACKNAME $REGION_CODE complete status=$RESULT ************") -echo "$MSG" -set -x -send-irc tripleo $STACKNAME "$MSG" diff --git a/elements/tripleo-cd/element-deps b/elements/tripleo-cd/element-deps deleted file mode 100644 index 62355e90d..000000000 --- a/elements/tripleo-cd/element-deps +++ /dev/null @@ -1,3 +0,0 @@ -pypi-mirror -os-svc-install -source-repositories diff --git a/elements/tripleo-cd/install.d/10-tripleo-cd b/elements/tripleo-cd/install.d/10-tripleo-cd deleted file mode 100755 index c3fd4373d..000000000 --- a/elements/tripleo-cd/install.d/10-tripleo-cd +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -set -eux - -if [ "$DIB_INIT_SYSTEM" = "upstart" ] ; then - cat > /etc/init/tripleo-cd.conf < /lib/systemd/system/tripleo-cd.service <" - echo - echo "Register as a state path." - echo - echo "This will register path as being part of the state of the machine." - echo "If there is content at it will be moved to " - echo "/var/lib/use-ephemeral/." - echo - echo "Paths are recorded in /var/lib/use-ephemeral/stateful-paths." - echo - echo "Options:" - echo " --leave-symlink -- create a symlink from to /mnt/state/." - echo - exit ${1} -} - -LEAVE_SYMLINK="" - -TEMP=`getopt -o h -l help,leave-symlink -n ${SCRIPT_NAME} -- "$@"` -if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi - -# Note the quotes around `${TEMP}': they are essential! -eval set -- "${TEMP}" - -while true ; do - case "${1}" in - --leave-symlink) LEAVE_SYMLINK="true"; shift 1 ;; - -h | --help) show_options 0;; - --) shift ; break ;; - *) echo "Error: unsupported option ${1}." ; exit 1 ;; - esac -done - -STATE_PATH=${1:-""} -EXTRA=${2:-""} - -if [ -z "${STATE_PATH}" -o -n "${EXTRA}" ]; then - show_options 1 -fi - -backup="/var/lib/use-ephemeral" -mkdir -p "${backup}" - -echo "${STATE_PATH};${LEAVE_SYMLINK}" >> "${backup}/stateful-paths" diff --git a/elements/use-ephemeral/element-deps b/elements/use-ephemeral/element-deps deleted file mode 100644 index 33d7e82b2..000000000 --- a/elements/use-ephemeral/element-deps +++ /dev/null @@ -1 +0,0 @@ -os-refresh-config diff --git a/elements/use-ephemeral/finalise.d/00-cleanup-stateful-paths b/elements/use-ephemeral/finalise.d/00-cleanup-stateful-paths deleted file mode 100755 index f59d44f89..000000000 --- a/elements/use-ephemeral/finalise.d/00-cleanup-stateful-paths +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash -# -# Copyright 2013 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -set -eux -set -o pipefail - -backup="/var/lib/use-ephemeral" -paths="${backup}/stateful-paths" -state="/mnt/state" - -[ -e "${paths}" ] || exit 0 - -while read -r line; do - path="${line%;*}" - - if [ -e "${path}" ]; then - backup_dir="${backup}$(dirname "${path}")" - mkdir -p "${backup_dir}" - mv "${path}" "${backup_dir}" - fi - - if [ -n "${line##*;}" ]; then - ln -s "${state}${path}" "${path}" - fi -done < "${paths}" - diff --git a/elements/use-ephemeral/os-refresh-config/pre-configure.d/00-fix-ephemeral-mount b/elements/use-ephemeral/os-refresh-config/pre-configure.d/00-fix-ephemeral-mount deleted file mode 100755 index c34a6a830..000000000 --- a/elements/use-ephemeral/os-refresh-config/pre-configure.d/00-fix-ephemeral-mount +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# Workaround for cloud-init bug https://bugs.launchpad.net/cloud-init/+bug/1263294 - -set -eux - -ephemeraldisk=$(os-apply-config --key block-device-mapping.ephemeral0 --type raw --key-default '') -[ -n "$ephemeraldisk" ] || exit 0 - -if grep -q "^$ephemeraldisk " /proc/mounts ; then - if ! grep -q "^$ephemeraldisk /mnt" /proc/mounts ; then - echo ERROR: ephemeral0 $ephemeraldisk is mounted but not at /mnt - echo ERROR: aborting so state is not stored on the image disk - exit 1 - fi - exit 0 -fi - -mount $ephemeraldisk /mnt diff --git a/elements/use-ephemeral/os-refresh-config/pre-configure.d/01-setup-stateful-paths b/elements/use-ephemeral/os-refresh-config/pre-configure.d/01-setup-stateful-paths deleted file mode 100755 index 4f7f36ae6..000000000 --- a/elements/use-ephemeral/os-refresh-config/pre-configure.d/01-setup-stateful-paths +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash -# -# Copyright 2013 Hewlett-Packard Development Company, L.P. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -set -eux -set -o pipefail - -backup="/var/lib/use-ephemeral" -paths="${backup}/stateful-paths" -state="/mnt/state" - -[ -e "${paths}" ] || exit 0 - -done="$(mktemp)" -while read -r line; do - path="${line%;*}" - dst="${state}${path}" - dst_dir=$(dirname "${dst}") - - # stateful_paths may contain duplicates, don't copy any path twice - src="${backup}${path}" - [ -L "${src}" ] || src="$(readlink -f "${src}")" - grep -qFx "${src}" "${done}" && continue - echo "${src}" >> "${done}" - - mkdir -p "${dst_dir}" - if [ -e "${src}" ]; then - # If src is a symlink and we append /, it gets read-through - [ -d "${src}" -a ! -L "${src}" ] && src="${src}/" - rsync -av "${src}" "${dst}" - fi -done < "${paths}" -rm -f "${done}"