New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only the first git repository is initialized and working using git_pillar #9932

Closed
ruimarinho opened this Issue Jan 24, 2014 · 3 comments

Comments

Projects
None yet
3 participants
@ruimarinho

ruimarinho commented Jan 24, 2014

When setting up git_pillar, only the first repository is correctly initialized and the branch fetched when the salt-master is started.

In order to have the second repository initialized, it is necessary to refresh the pillar data manually. However, that branch (staging) is not fetched (only git init, git remote add and git config are called).

ext_pillar:
  - git: master git://server.com/pillar.git
  - git: staging git://server.com/pillar.git
salt --versions-report
           Salt: 2014.1.0-669-g0f62785
         Python: 2.7.3 (default, Jan  2 2013, 13:56:14)
         Jinja2: 2.6
       M2Crypto: 0.21.1
 msgpack-python: 0.1.10
   msgpack-pure: Not Installed
       pycrypto: 2.6
         PyYAML: 3.10
          PyZMQ: 13.1.0
            ZMQ: 3.2.3
@pakdel

This comment has been minimized.

Show comment
Hide comment
@pakdel

pakdel Jan 28, 2014

Contributor

Thanks for the details.
Apparently, GitPillar.update is only called for master branch!

Contributor

pakdel commented Jan 28, 2014

Thanks for the details.
Apparently, GitPillar.update is only called for master branch!

@pakdel

This comment has been minimized.

Show comment
Hide comment
@pakdel

pakdel Jan 28, 2014

Contributor

This should be fixed by pull request #9992

Contributor

pakdel commented Jan 28, 2014

This should be fixed by pull request #9992

thatch45 added a commit that referenced this issue Jan 31, 2014

Merge pull request #9992 from pakdel/issue-9932
Fixed Issue #9932: Only the first git repository is initialized and working using git_pillar

cro added a commit to cro/salt that referenced this issue Jan 31, 2014

Issue saltstack#9932: GitPillar.update called on 1st branch
GitPillar.update was only called for first entry
in ext_pillar, which usually is the master branch.

cro added a commit to cro/salt that referenced this issue Jan 31, 2014

Issue saltstack#9932: Update git pillar after init
Update GitPillar by calling update() after initializing the repo.
Also, pass the branch to Pillar class constructor.

cro added a commit to cro/salt that referenced this issue Jan 31, 2014

Fixed issue saltstack#9932
If an ext_pillar item is not loaded and its branch
is not present in pillar_roots, the corresponding
salt environment will not be available. However,
this is not an issue, since it will be available
when all of ext_pillar items are parsed; therefore,
when trying to get the SLS from that non-present
salt environment, we should merely log a debug
message and continue on.

tedski added a commit to tedski/salt that referenced this issue Feb 1, 2014

Issue saltstack#9932: GitPillar.update called on 1st branch
GitPillar.update was only called for first entry
in ext_pillar, which usually is the master branch.

tedski added a commit to tedski/salt that referenced this issue Feb 1, 2014

Issue saltstack#9932: Update git pillar after init
Update GitPillar by calling update() after initializing the repo.
Also, pass the branch to Pillar class constructor.

tedski added a commit to tedski/salt that referenced this issue Feb 1, 2014

Fixed issue saltstack#9932
If an ext_pillar item is not loaded and its branch
is not present in pillar_roots, the corresponding
salt environment will not be available. However,
this is not an issue, since it will be available
when all of ext_pillar items are parsed; therefore,
when trying to get the SLS from that non-present
salt environment, we should merely log a debug
message and continue on.

basepi added a commit that referenced this issue Feb 3, 2014

Issue #9932: GitPillar.update called on 1st branch
GitPillar.update was only called for first entry
in ext_pillar, which usually is the master branch.

basepi added a commit that referenced this issue Feb 3, 2014

Issue #9932: Update git pillar after init
Update GitPillar by calling update() after initializing the repo.
Also, pass the branch to Pillar class constructor.

basepi added a commit that referenced this issue Feb 3, 2014

Fixed issue #9932
If an ext_pillar item is not loaded and its branch
is not present in pillar_roots, the corresponding
salt environment will not be available. However,
this is not an issue, since it will be available
when all of ext_pillar items are parsed; therefore,
when trying to get the SLS from that non-present
salt environment, we should merely log a debug
message and continue on.
@basepi

This comment has been minimized.

Show comment
Hide comment
@basepi

basepi Feb 4, 2014

Collaborator

Closing as fixed. Please keep us posted if you run into the behavior again!

Collaborator

basepi commented Feb 4, 2014

Closing as fixed. Please keep us posted if you run into the behavior again!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment