diff options
| -rw-r--r-- | compass-cobbler/Dockerfile | 3 | ||||
| -rw-r--r-- | compass-deck/db/api/cluster.py | 2 | ||||
| -rw-r--r-- | compass-tasks-base/db/api/cluster.py | 2 | ||||
| -rw-r--r-- | compass-tasks-base/deployment/installers/config_manager.py | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/compass-cobbler/Dockerfile b/compass-cobbler/Dockerfile index d963e49..e5c1459 100644 --- a/compass-cobbler/Dockerfile +++ b/compass-cobbler/Dockerfile @@ -6,7 +6,8 @@ ARG BRANCH=master # pkgs and services... RUN yum -y update && \ yum -y install epel-release && \ - yum -y install wget dhcp bind syslinux pykickstart file initscripts net-tools tcpdump xinetd vim avahi avahi-tools ntp && \ + yum -y install wget dhcp bind syslinux pykickstart file initscripts net-tools tcpdump xinetd vim \ + avahi avahi-tools ntp fence_agents && \ wget http://artifacts.opnfv.org/compass4nfv/package/cobbler/cobbler-2.6.10-1.fc22.noarch.rpm && \ wget http://artifacts.opnfv.org/compass4nfv/package/cobbler/cobbler-web-2.6.10-1.fc22.noarch.rpm && \ yum -y localinstall cobbler-2.6.10-1.fc22.noarch.rpm cobbler-web-2.6.10-1.fc22.noarch.rpm && \ diff --git a/compass-deck/db/api/cluster.py b/compass-deck/db/api/cluster.py index 7a7022c..9a0b8f0 100644 --- a/compass-deck/db/api/cluster.py +++ b/compass-deck/db/api/cluster.py @@ -50,7 +50,7 @@ RESP_CLUSTERHOST_FIELDS = [ 'os_installed', 'distributed_system_installed', 'os_name', 'os_id', 'ip', 'reinstall_os', 'reinstall_distributed_system', - 'owner', 'cluster_id', + 'owner', 'cluster_id', 'ipmi_credentials', 'created_at', 'updated_at', 'patched_roles' ] diff --git a/compass-tasks-base/db/api/cluster.py b/compass-tasks-base/db/api/cluster.py index 7a7022c..9a0b8f0 100644 --- a/compass-tasks-base/db/api/cluster.py +++ b/compass-tasks-base/db/api/cluster.py @@ -50,7 +50,7 @@ RESP_CLUSTERHOST_FIELDS = [ 'os_installed', 'distributed_system_installed', 'os_name', 'os_id', 'ip', 'reinstall_os', 'reinstall_distributed_system', - 'owner', 'cluster_id', + 'owner', 'cluster_id', 'ipmi_credentials', 'created_at', 'updated_at', 'patched_roles' ] diff --git a/compass-tasks-base/deployment/installers/config_manager.py b/compass-tasks-base/deployment/installers/config_manager.py index 597c3a6..d3b28e0 100644 --- a/compass-tasks-base/deployment/installers/config_manager.py +++ b/compass-tasks-base/deployment/installers/config_manager.py @@ -170,6 +170,7 @@ class HostInfo(object): self.roles = self.host_info.setdefault(const.ROLES, []) self.patched_roles = self.host_info.setdefault(const.PATCHED_ROLES, []) self.ipmi = deepcopy(self.host_info.setdefault(const.IPMI, {})) + self.ipmi_credentials = deepcopy(self.host_info.setdefault(const.IPMI_CREDS, {})) self.reinstall_os_flag = self.host_info.get(const.REINSTALL_OS_FLAG) self.deployed_os_config = self.host_info.setdefault( const.DEPLOYED_OS_CONFIG, {} @@ -275,6 +276,7 @@ class HostInfo(object): def baseinfo(self): return { const.REINSTALL_OS_FLAG: self.reinstall_os_flag, + const.IPMI_CREDS: self.ipmi_credentials, const.MAC_ADDR: self.mac, const.NAME: self.name, const.HOSTNAME: self.hostname, |