summaryrefslogtreecommitdiff
path: root/openstack
diff options
context:
space:
mode:
Diffstat (limited to 'openstack')
-rw-r--r--openstack/manifest4
-rw-r--r--openstack/usr/lib/systemd/system/iscsi-setup.service (renamed from openstack/usr/lib/systemd/system/openstack-cinder-iscsi-setup.service)4
-rw-r--r--openstack/usr/share/openstack/iscsi.yml (renamed from openstack/usr/share/openstack/cinder-iscsi.yml)0
3 files changed, 4 insertions, 4 deletions
diff --git a/openstack/manifest b/openstack/manifest
index 78b030bb..4812c6c3 100644
--- a/openstack/manifest
+++ b/openstack/manifest
@@ -11,7 +11,6 @@ template 0100644 0 0 /etc/tempest/tempest.conf
0040755 0 0 /usr/share/openstack/cinder
0100644 0 0 /usr/share/openstack/cinder-config.yml
0100644 0 0 /usr/share/openstack/cinder-db.yml
-0100644 0 0 /usr/share/openstack/cinder-iscsi.yml
0100644 0 0 /usr/share/openstack/cinder-lvs.yml
0100644 0 0 /usr/share/openstack/cinder/cinder.conf
0100644 0 0 /usr/share/openstack/cinder/api-paste.ini
@@ -35,6 +34,7 @@ template 0100644 0 0 /etc/tempest/tempest.conf
0100644 0 0 /usr/share/openstack/ironic.yml
0100644 0 0 /usr/share/openstack/ironic/ironic.conf
0100644 0 0 /usr/share/openstack/ironic/policy.json
+0100644 0 0 /usr/share/openstack/iscsi.yml
0100644 0 0 /usr/share/openstack/keystone.yml
0040755 0 0 /usr/share/openstack/keystone
0100644 0 0 /usr/share/openstack/keystone/logging.conf
@@ -128,6 +128,7 @@ template 0100644 0 0 /etc/tempest/tempest.conf
0040755 0 0 /usr/lib/sysctl.d
0100644 0 0 /usr/lib/sysctl.d/neutron.conf
0100644 0 0 /usr/lib/systemd/system/apache-httpd.service
+0100644 0 0 /usr/lib/systemd/system/iscsi-setup.service
0100644 0 0 /usr/lib/systemd/system/openstack-keystone.service
0100644 0 0 /usr/lib/systemd/system/openstack-keystone-setup.service
0100644 0 0 /usr/lib/systemd/system/openstack-glance-setup.service
@@ -159,7 +160,6 @@ template 0100644 0 0 /etc/tempest/tempest.conf
0100644 0 0 /usr/lib/systemd/system/rabbitmq-server.service
0100644 0 0 /usr/lib/systemd/system/openstack-cinder-config-setup.service
0100644 0 0 /usr/lib/systemd/system/openstack-cinder-db-setup.service
-0100644 0 0 /usr/lib/systemd/system/openstack-cinder-iscsi-setup.service
0100644 0 0 /usr/lib/systemd/system/openstack-cinder-lv-setup.service
0100644 0 0 /usr/lib/systemd/system/openstack-cinder-api.service
0100644 0 0 /usr/lib/systemd/system/openstack-cinder-scheduler.service
diff --git a/openstack/usr/lib/systemd/system/openstack-cinder-iscsi-setup.service b/openstack/usr/lib/systemd/system/iscsi-setup.service
index 157f30fc..c9e5ee59 100644
--- a/openstack/usr/lib/systemd/system/openstack-cinder-iscsi-setup.service
+++ b/openstack/usr/lib/systemd/system/iscsi-setup.service
@@ -1,12 +1,12 @@
[Unit]
-Description=Run cinder-iscsi-setup Ansible scripts
+Description=Run iscsi-setup Ansible scripts
Before=iscsid.service target.service
Wants= iscsid.service target.service
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/cinder-iscsi.yml
+ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/iscsi.yml
[Install]
WantedBy=multi-user.target
diff --git a/openstack/usr/share/openstack/cinder-iscsi.yml b/openstack/usr/share/openstack/iscsi.yml
index b80377ae..b80377ae 100644
--- a/openstack/usr/share/openstack/cinder-iscsi.yml
+++ b/openstack/usr/share/openstack/iscsi.yml