Merge "No need to maintain contrail-keystone-setup.sh in contrail-pac…

…kaging repo, as it is maintained in contrail-provisioning repo." into R2.0
Juniper · Dec 7, 2014 · 505188a · 505188a
2 parents 591d4b9 + 77feaa1
commit 505188a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 321 deletions.
diff --git a/openstack/centos_64/nova/havana/contrail-keystone-setup.sh b/openstack/centos_64/nova/havana/contrail-keystone-setup.sh
diff --git a/openstack/centos_64/nova/havana/openstack-nova.spec b/openstack/centos_64/nova/havana/openstack-nova.spec
@@ -47,7 +47,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
 
@@ -597,7 +596,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
@@ -849,7 +847,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