Merge branch 'development'

GoogleCloudPlatform · May 4, 2018 · 3328e79 · 3328e79
2 parents 3aee33f + f6f9610
commit 3328e79
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 5 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+google-compute-image-packages (2.8.1-1) stable; urgency=low
+
+  * Improve OS Login disablement.
+
+ -- Google Cloud Team <gc-team@google.com>  Fri, 04 May 2018 12:00:00 -0700
+
 google-compute-image-packages (2.8.0-1) stable; urgency=low
 
   * Create a new network daemon.

diff --git a/google_compute_engine/accounts/tests/oslogin_utils_test.py b/google_compute_engine/accounts/tests/oslogin_utils_test.py
@@ -27,7 +27,7 @@ class OsLoginUtilsTest(unittest.TestCase):
   def setUp(self):
     self.mock_logger = mock.Mock()
     self.oslogin_control_script = 'google_oslogin_control'
-    self.oslogin_nss_cache = '/etc/passwd.cache'
+    self.oslogin_nss_cache = '/etc/oslogin_passwd.cache'
     self.oslogin_nss_cache_script = 'google_oslogin_nss_cache'
 
     self.mock_oslogin = mock.create_autospec(oslogin_utils.OsLoginUtils)

diff --git a/google_compute_engine/constants.py b/google_compute_engine/constants.py
@@ -18,7 +18,7 @@
 import platform
 
 OSLOGIN_CONTROL_SCRIPT = 'google_oslogin_control'
-OSLOGIN_NSS_CACHE = '/etc/passwd.cache'
+OSLOGIN_NSS_CACHE = '/etc/oslogin_passwd.cache'
 OSLOGIN_NSS_CACHE_SCRIPT = 'google_oslogin_nss_cache'
 
 if platform.system() == 'FreeBSD':

diff --git a/google_compute_engine_oslogin/packaging/rpmbuild/SPECS/google-compute-engine-oslogin.spec b/google_compute_engine_oslogin/packaging/rpmbuild/SPECS/google-compute-engine-oslogin.spec
@@ -12,6 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Force the dist to be el7 to avoid el7.centos.
+%if 0%{?rhel} == 7
+  %define dist .el7
+%endif
+
 Name:           google-compute-engine-oslogin
 Version:        1.3.0
 Release:        1%{?dist}

diff --git a/setup.py b/setup.py
@@ -36,7 +36,7 @@
     packages=setuptools.find_packages(),
     scripts=glob.glob('scripts/*'),
     url='https://github.com/GoogleCloudPlatform/compute-image-packages',
-    version='2.8.0',
+    version='2.8.1',
     # Entry points create scripts in /usr/bin that call a function.
     entry_points={
         'console_scripts': [

diff --git a/specs/google-compute-engine.spec b/specs/google-compute-engine.spec
@@ -18,7 +18,7 @@
 %endif
 
 Name: google-compute-engine
-Version: 2.8.0
+Version: 2.8.1
 Release: 1%{?dist}
 Summary: Google Compute Engine guest environment.
 License: ASL 2.0

diff --git a/specs/python-google-compute-engine.spec b/specs/python-google-compute-engine.spec
@@ -18,7 +18,7 @@
 %endif
 
 Name: python-google-compute-engine
-Version: 2.8.0
+Version: 2.8.1
 Release: 1%{?dist}
 Summary: Google Compute Engine python library
 License: ASL 2.0