Skip to content
This repository has been archived by the owner. It is now read-only.

Commit 8b5146f

Browse files
authored
Merge pull request #298 from hubblestack/develop
Merge to master (prep v2017.1.0 release)
2 parents 5ffb7a2 + a16e14e commit 8b5146f

21 files changed

+195184
-28
lines changed

FORMULA

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: hubblestack_nova
22
os: RedHat, CentOS, Debian, Ubuntu
33
os_family: RedHat, Debian
4-
version: 2016.10.1
4+
version: 2016.10.2
55
release: 1
66
summary: HubbleStack Nova
77
description: HubbleStack Nova

README.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ iterate policy changes separate from the code.
5656

5757
.. code-block:: shell
5858
59-
wget https://spm.hubblestack.io/nova/hubblestack_nova-2016.9.2-1.spm
60-
spm local install hubblestack_nova-2016.9.2-1.spm
59+
wget https://spm.hubblestack.io/nova/hubblestack_nova-2016.10.2-1.spm
60+
spm local install hubblestack_nova-2016.10.2-1.spm
6161
6262
**Nova Profiles**
6363

6464
.. code-block:: shell
6565
66-
wget https://spm.hubblestack.io/nova/hubblestack_nova_profiles-20160914-1.spm
67-
spm local install hubblestack_nova_profiles-20160914-1.spm
66+
wget https://spm.hubblestack.io/nova/hubblestack_nova_profiles-20161101-1.spm
67+
spm local install hubblestack_nova_profiles-20161101-1.spm
6868
6969
You should now be able to sync the new modules to your minion(s) using the
7070
``sync_modules`` Salt utility:
@@ -114,7 +114,7 @@ Requirements: GitFS support on your Salt Master.
114114
115115
gitfs_remotes:
116116
- https://github.com/hubblestack/nova:
117-
- base: v2016.9.1
117+
- base: v2017.1.0
118118
119119
.. tip:: Remember to restart the Salt Master after applying this change.
120120

_modules/hubble.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Loader and primary interface for nova modules
44
55
:maintainer: HubbleStack / basepi
6-
:maturity: 2016.7.0
6+
:maturity: 2016.10.2
77
:platform: All
88
:requires: SaltStack
99
@@ -35,7 +35,7 @@
3535
from salt.loader import LazyLoader
3636

3737
__nova__ = {}
38-
__version__ = 'v2016.10.1'
38+
__version__ = 'v2017.1.0'
3939

4040

4141
def audit(configs=None,
@@ -84,7 +84,7 @@ def audit(configs=None,
8484
8585
show_profile
8686
Whether to add the profile path to the verbose output for audits.
87-
Defaults to False. Configurable via `hubblestack:nova:show_profile`
87+
Defaults to True. Configurable via `hubblestack:nova:show_profile`
8888
in minion config/pillar.
8989
9090
called_from_top
@@ -123,7 +123,7 @@ def audit(configs=None,
123123
if show_compliance is None:
124124
show_compliance = __salt__['config.get']('hubblestack:nova:show_compliance', True)
125125
if show_profile is None:
126-
show_profile = __salt__['config.get']('hubblestack:nova:show_profile', False)
126+
show_profile = __salt__['config.get']('hubblestack:nova:show_profile', True)
127127
if debug is None:
128128
debug = __salt__['config.get']('hubblestack:nova:debug', False)
129129

@@ -322,7 +322,7 @@ def top(topfile='top.nova',
322322
323323
show_profile
324324
Whether to add the profile path to the verbose output for audits.
325-
Defaults to False. Configurable via `hubblestack:nova:show_profile`
325+
Defaults to True. Configurable via `hubblestack:nova:show_profile`
326326
in minion config/pillar.
327327
328328
debug
@@ -350,7 +350,7 @@ def top(topfile='top.nova',
350350
if show_compliance is None:
351351
show_compliance = __salt__['config.get']('hubblestack:nova:show_compliance', True)
352352
if show_profile is None:
353-
show_profile = __salt__['config.get']('hubblestack:nova:show_profile', False)
353+
show_profile = __salt__['config.get']('hubblestack:nova:show_profile', True)
354354
if debug is None:
355355
debug = __salt__['config.get']('hubblestack:nova:debug', False)
356356

0 commit comments

Comments
 (0)