Skip to content

Commit b57ad46

Browse files
committed
Add k8s inventory plugin for usage as conductor container
Fixes #16
1 parent 66dc56e commit b57ad46

File tree

7 files changed

+28
-16
lines changed

7 files changed

+28
-16
lines changed

Diff for: Dockerfile-canary

-5
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ RUN git clone https://github.com/ansible/ansible-kubernetes-modules.git /etc/ans
4242

4343
RUN git clone https://github.com/ansibleplaybookbundle/ansible-asb-modules.git /etc/ansible/roles/ansibleplaybookbundle.asb-modules
4444

45-
RUN echo "localhost ansible_connection=local" > /etc/ansible/hosts \
46-
&& echo '[defaults]' > /etc/ansible/ansible.cfg \
47-
&& echo 'roles_path = /opt/ansible/roles' >> /etc/ansible/ansible.cfg \
48-
&& echo 'library = /usr/share/ansible/openshift' >> /etc/ansible/ansible.cfg
49-
5045
COPY files/etc/ansible/* /etc/ansible/
5146
COPY files/usr/bin/* /usr/bin/
5247
COPY files/opt/apb/.kube/config /opt/apb/.kube/config

Diff for: Dockerfile-latest

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ RUN yum -y install epel-release centos-release-openshift-origin \
1212
&& yum -y install --setopt=tsflags=nodocs origin-clients python-openshift ansible ansible-kubernetes-modules ansible-asb-modules apb-base-scripts \
1313
&& yum clean all
1414

15+
COPY files/etc/ansible/* /etc/ansible/
16+
1517
RUN mkdir -p /usr/share/ansible/openshift \
1618
/etc/ansible /opt/ansible \
1719
${BASE_DIR}/{etc,.kube,.ansible/tmp} \

Diff for: Dockerfile-nightly

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ RUN yum -y install epel-release centos-release-openshift-origin \
1212
&& yum -y install --setopt=tsflags=nodocs origin-clients python-openshift ansible ansible-kubernetes-modules ansible-asb-modules apb-base-scripts \
1313
&& yum clean all
1414

15+
COPY files/etc/ansible/* /etc/ansible/
16+
1517
RUN mkdir -p /usr/share/ansible/openshift \
1618
/etc/ansible /opt/ansible \
1719
${BASE_DIR}/{etc,.kube,.ansible/tmp} \

Diff for: Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CONTEXT = ansibleplaybookbundle
1+
CONTEXT = lorbus
22
VERSION = v2.3
33
IMAGE_NAME = apb-base
44
TARGET = centos7
@@ -10,7 +10,7 @@ OC_PASS = developer
1010
ifeq ($(TARGET),rhel7)
1111
DFILE := Dockerfile-latest.${TARGET}
1212
else
13-
DFILE := Dockerfile-latest
13+
DFILE := Dockerfile-canary
1414
endif
1515

1616
all: build

Diff for: apb-base-scripts.spec

+14-9
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
%define build_timestamp %{nil}
55
%endif
66

7-
Name: apb-base-scripts
8-
Version: 1.1.5
9-
Release: 1%{build_timestamp}%{?dist}
10-
Summary: Scripts for the apb-base container image
11-
12-
License: ASL 2.0
13-
URL: https://github.com/fusor/apb-examples
14-
Source0: https://github.com/fusor/apb-examples/archive/%{name}-%{version}.tar.gz
7+
Name: apb-base-scripts
8+
Version: 1.1.5
9+
Release: 1%{build_timestamp}%{?dist}
10+
Summary: Scripts for the apb-base container image
11+
12+
License: ASL 2.0
13+
URL: https://github.com/ansibleplaybookbundle/apb-base
14+
Source0: https://github.com/ansibleplaybookbundle/apb-base/archive/%{name}-%{version}.tar.gz
1515
BuildArch: noarch
1616

1717
%description
@@ -28,6 +28,9 @@ install -m 755 files/usr/bin/test-retrieval-init %{buildroot}%{_bindir}
2828
install -m 755 files/usr/bin/test-retrieval %{buildroot}%{_bindir}
2929
install -m 755 files/usr/bin/entrypoint.sh %{buildroot}%{_bindir}
3030
install -m 755 files/opt/apb/.kube/config %{buildroot}/opt/apb/.kube/config
31+
install -m 755 files/etc/ansible/ansible.cfg %{buildroot}/etc/ansible/ansible.cfg
32+
install -m 755 files/etc/ansible/hosts %{buildroot}/etc/ansible/hosts
33+
install -m 755 files/etc/ansible/k8s.yml %{buildroot}/etc/ansible/k8s.yml
3134

3235
%files
3336
%doc
@@ -36,6 +39,9 @@ install -m 755 files/opt/apb/.kube/config %{buildroot}/opt/apb/.kube/config
3639
%{_bindir}/entrypoint.sh
3740
%dir %{_sysconfdir}/apb-secrets
3841
/opt/apb/.kube/config
42+
%{_sysconfdir}/ansible/ansible.cfg
43+
%{_sysconfdir}/ansible/hosts
44+
%{_sysconfdir}/ansible/k8s.yml
3945

4046
%changelog
4147
* Fri Feb 02 2018 David Zager <[email protected]> 1.1.5-1
@@ -81,4 +87,3 @@ install -m 755 files/opt/apb/.kube/config %{buildroot}/opt/apb/.kube/config
8187

8288
* Fri Aug 18 2017 Jason Montleon <[email protected]> 1.0.1-1
8389
- new package built with tito
84-

Diff for: files/etc/ansible/ansible.cfg

+4
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
[defaults]
22
roles_path = /etc/ansible/roles:/opt/ansible/roles
3+
inventory = /etc/ansible/hosts:/etc/ansible/k8s.yml
4+
5+
[inventory]
6+
enable_plugins = k8s

Diff for: files/etc/ansible/k8s.yml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
plugin: k8s
2+
connections:
3+
namespaces:
4+
- {{ namespace }}

0 commit comments

Comments
 (0)