xFix bug 1374282

No need to maintain contrail-keystone-setup.sh in contrail-packaging repo, as it is maintained in contrail-provisioning repo. Change-Id: I86a73f5403a2a73e7c66affae1a37abe23ffb10f
Juniper · Oct 8, 2014 · c451469 · c451469
1 parent 13d7e8f
commit c451469
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 324 deletions.
diff --git a/openstack/centos_64/nova/contrail-keystone-setup.sh b/openstack/centos_64/nova/contrail-keystone-setup.sh
diff --git a/openstack/centos_64/nova/openstack-havana-nova.spec b/openstack/centos_64/nova/openstack-havana-nova.spec
@@ -51,7 +51,6 @@ Source22:         nova-ifc-template
 Source24:         nova-sudoers
 Source30:         openstack-nova-novncproxy.sysconfig
 Source31:         contrail-server-setup.sh
-Source32:         contrail-keystone-setup.sh
 Source33:         contrail-server-cleanup.sh
 Source34:         nova_havana.conf
 
@@ -601,7 +600,6 @@ install -p -D -m 755 %{SOURCE29} %{buildroot}%{_initddir}/openstack-nova-novncpr
 %endif
 # contrail scripts
 install -p -D -m 755 %{SOURCE31} %{buildroot}%{_bindir}/contrail-server-setup.sh
-install -p -D -m 755 %{SOURCE32} %{buildroot}%{_bindir}/contrail-keystone-setup.sh
 install -p -D -m 755 %{SOURCE33} %{buildroot}%{_bindir}/contrail-server-cleanup.sh
 
 # Install sudoers
@@ -853,7 +851,6 @@ fi
 %doc nova/LICENSE
 %{_bindir}/nova-all
 %{_bindir}/contrail-server-setup.sh
-%{_bindir}/contrail-keystone-setup.sh
 %{_bindir}/contrail-server-cleanup.sh
 
 %files common

diff --git a/openstack/centos_64/nova/openstack-nova.spec b/openstack/centos_64/nova/openstack-nova.spec
@@ -49,7 +49,6 @@ Source23:         nova-polkit.rules
 Source22:         nova-ifc-template
 Source24:         nova-sudoers
 Source30:	  contrail-server-setup.sh
-Source31:	  contrail-keystone-setup.sh
 Source32:	  contrail-server-cleanup.sh
 
 #
@@ -507,7 +506,6 @@ install -p -D -m 755 %{SOURCE26} %{buildroot}%{_initddir}/openstack-nova-conduct
 %endif
 # contrail scripts
 install -p -D -m 755 %{SOURCE30} %{buildroot}%{_bindir}/contrail-server-setup.sh
-install -p -D -m 755 %{SOURCE31} %{buildroot}%{_bindir}/contrail-keystone-setup.sh
 install -p -D -m 755 %{SOURCE32} %{buildroot}%{_bindir}/contrail-server-cleanup.sh
 
 # Install sudoers
@@ -749,7 +747,6 @@ fi
 %doc nova/LICENSE
 %{_bindir}/nova-all
 %{_bindir}/contrail-server-setup.sh
-%{_bindir}/contrail-keystone-setup.sh
 %{_bindir}/contrail-server-cleanup.sh
 
 %files common